Change how ssl_wrap_socket handles certfiles and keyfiles to match the regular python ssl library

Tye Wang · Tye Wang · commit afd554d2cf80 · 2014-10-23T15:49:29.000-04:00
diff --git a/urllib3/contrib/pyopenssl.py b/urllib3/contrib/pyopenssl.py
@@ -261,6 +261,7 @@ def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
                     ssl_version=None):
     ctx = OpenSSL.SSL.Context(_openssl_versions[ssl_version])
     if certfile:
+        keyfile = keyfile or certfile  # Match behaviour of the normal python ssl library
         ctx.use_certificate_file(certfile)
     if keyfile:
         ctx.use_privatekey_file(keyfile)
