diff options
author | drebs <drebs@leap.se> | 2013-05-16 09:50:27 -0300 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-05-16 09:50:27 -0300 |
commit | b8da398b0ab4f7df3fb37785a1f9f3777053bb53 (patch) | |
tree | a079cc20ce06d360329d6751aa2915a1fe576268 | |
parent | f216391f92ac0a52e11e9b13c149c8d40b446aeb (diff) | |
parent | e5098575632e9c5eaf4aba4a17cc4506196662df (diff) |
Merge branch 'bug/ssl_hostname_check' of git://github.com/chiiph/soledad into develop
-rw-r--r-- | src/leap/soledad/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index 4e1fbd6f..8bdb82a0 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -998,8 +998,7 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection): self.sock = ssl.wrap_socket(sock, ca_certs=SOLEDAD_CERT, cert_reqs=ssl.CERT_REQUIRED) - # TODO: enable this when the certificate is fixed - #match_hostname(self.sock.getpeercert(), self.host) + match_hostname(self.sock.getpeercert(), self.host) old__VerifiedHTTPSConnection = http_client._VerifiedHTTPSConnection |