Commit ae29d83c authored by Levin Zimmermann's avatar Levin Zimmermann

Revert "."

This reverts commit a2f192cb. This has
been merged upstream with nexedi/neoppod@17af7f27.
We should rather cherry-pick upstream commit.
parent 3e673c80
......@@ -72,7 +72,6 @@ class BaseApplication(object):
" provided: the CA certificate, and the certificate"
" of this node with its private key.")
ca, cert, key = ssl
self.ssl_credentials = ssl # remember ca/cert/key, so that zstor_2zurl could retrive them
import ssl
version, version_name = max((getattr(ssl, k), k)
for k in dir(ssl) if k.startswith("PROTOCOL_TLSv"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment