diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-18 10:56:20 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-18 10:56:20 -0400 |
| commit | e30e06d9062578e1932b5a6a4c4124a1663e18c2 (patch) | |
| tree | 7c81bef2afd8d32d0179cc0192239271252bc311 /src/leap/common/zmq_utils.py | |
| parent | e5796bf55e3db177ee567118519136fd96ada3c4 (diff) | |
| parent | cef15c04610ee188052af78ead8cfe7ea29d81c6 (diff) | |
Merge tag '0.5.1'
Tag leap.bitmask version 0.5.1
# gpg: Signature made Mon 18 Apr 2016 10:52:44 AM BOT
# gpg: using RSA key 1CAF6C5B9F720808
# gpg: Good signature from "Kaliyuga <kaliyuga@riseup.net>" [ultimate]
# gpg: aka "Kali Kaneko (leap communications) <kali@leap.se>" [ultimate]
Diffstat (limited to 'src/leap/common/zmq_utils.py')
| -rw-r--r-- | src/leap/common/zmq_utils.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/leap/common/zmq_utils.py b/src/leap/common/zmq_utils.py index 0a781de..39a49c7 100644 --- a/src/leap/common/zmq_utils.py +++ b/src/leap/common/zmq_utils.py @@ -19,6 +19,7 @@ Utilities to handle ZMQ certificates. """ import os import logging +import platform import stat import shutil @@ -52,6 +53,10 @@ def zmq_has_curve(): `zmq.auth` module is new in version 14.1 `zmq.has()` is new in version 14.1, new in version libzmq-4.1. """ + if platform.system() == "Windows": + # TODO: curve is not working on windows #7919 + return False + zmq_version = zmq.zmq_version_info() pyzmq_version = zmq.pyzmq_version_info() |