diff options
| author | Kali Kaneko <kali@leap.se> | 2014-12-11 13:01:19 -0600 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-12-11 13:01:19 -0600 |
| commit | 8ec6af48d91ce83e60d2e42e48c6c6d61a3ea312 (patch) | |
| tree | 83c6df234c63fb6270508772f7e38ff0d072fb39 /client/src/leap | |
| parent | 5fd9f1630e6e8b257e50fb3271bbd3931ff7ad45 (diff) | |
| parent | 969851741dfd23981a74da07dbb565299e55815f (diff) | |
Merge tag '0.6.2' into deb-0.6.1
Tag soledad version 0.6.2.
Diffstat (limited to 'client/src/leap')
| -rw-r--r-- | client/src/leap/soledad/client/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index c350d021..c5832249 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -1343,10 +1343,9 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection): ctx.options |= ssl.OP_NO_SSLv2 ctx.options |= ssl.OP_NO_SSLv3 - ctx.load_cert_chain(certfile=SOLEDAD_CERT) + ctx.load_verify_locations(cafile=SOLEDAD_CERT) ctx.verify_mode = ssl.CERT_REQUIRED - self.sock = ctx.wrap_socket( - sock, server_side=True, server_hostname=self.host) + self.sock = ctx.wrap_socket(sock) except AttributeError: self.sock = ssl.wrap_socket( |