Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove outdated workarounds

This commit is contained in:
Thomas Kriechbaumer 2015-05-27 10:21:50 +02:00
parent 1967a49cd9
commit d6a68e1394
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netlib/tcp.py
View File

@ -307,10 +307,10 @@ class _Connection(object):
def get_current_cipher(self): def get_current_cipher(self):
if not self.ssl_established: if not self.ssl_established:
return None return None
c = SSL._lib.SSL_get_current_cipher(self.connection._ssl)
name = SSL._native(SSL._ffi.string(SSL._lib.SSL_CIPHER_get_name(c))) name = self.connection.get_cipher_name()
bits = SSL._lib.SSL_CIPHER_get_bits(c, SSL._ffi.NULL) bits = self.connection.get_cipher_bits()
version = SSL._native(SSL._ffi.string(SSL._lib.SSL_CIPHER_get_version(c))) version = self.connection.get_cipher_version()
return name, bits, version return name, bits, version
def finish(self): def finish(self):
@ -333,10 +333,6 @@ class _Connection(object):
self.connection.shutdown() self.connection.shutdown()
except SSL.Error: except SSL.Error:
pass pass
except KeyError as e: # pragma: no cover
# Workaround for https://github.com/pyca/pyopenssl/pull/183
if OpenSSL.__version__ != "0.14":
raise e
""" """
Creates an SSL Context. Creates an SSL Context.