only pass keyfile and certfile to legacy wrap_socket if they are actu…

…ally set git-svn-id: https://xpra.org/svn/Xpra/trunk@13160 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Aug 1, 2016 · 6eba1de · 6eba1de
1 parent 9e12aa0
commit 6eba1de
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py
@@ -1652,8 +1652,8 @@ def ssl_wrap_socket_fn(opts, server_side=True):
                        "cert_reqs"      : ssl_cert_reqs,
                        "ssl_version"    : ssl_protocol,
                        "ca_certs"       : ssl_ca_certs,
-                       "keyfile"        : opts.ssl_key,
-                       "certfile"       : opts.ssl_cert,
+                       "keyfile"        : opts.ssl_key or None,
+                       "certfile"       : opts.ssl_cert or None,
                        })
         wrap_socket = ssl.wrap_socket
     del opts