diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-23 14:45:48 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-23 14:45:48 -0400 |
| commit | 1f4e0c32f49337e216eaaac83a8eeca9674370a4 (patch) | |
| tree | c20f0ff4a6e177667f3a2233f2ef6eb7e2ee9233 /src/leap/bitmask/backend_app.py | |
| parent | 4bad7062364c72215da9fd2256451c7a3d0a356f (diff) | |
| parent | 04be045242b0fd0c669610f54db7a9fdeb3b77f3 (diff) | |
Merge remote-tracking branch 'leapcode/pr/826' into release/0.8.x
Diffstat (limited to 'src/leap/bitmask/backend_app.py')
| -rw-r--r-- | src/leap/bitmask/backend_app.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py index 286b04f7..3e88a95a 100644 --- a/src/leap/bitmask/backend_app.py +++ b/src/leap/bitmask/backend_app.py @@ -23,6 +23,7 @@ import signal from leap.bitmask.backend.leapbackend import LeapBackend from leap.bitmask.backend.utils import generate_zmq_certificates +from leap.bitmask.config import flags from leap.bitmask.logs.utils import create_logger from leap.bitmask.util import dict_to_flags @@ -57,7 +58,8 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None): """ # The backend is the one who always creates the certificates. Either if it # is run separately or in a process in the same app as the frontend. - generate_zmq_certificates() + if flags.ZMQ_HAS_CURVE: + generate_zmq_certificates() # ignore SIGINT since app.py takes care of signaling SIGTERM to us. signal.signal(signal.SIGINT, signal.SIG_IGN) |