aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-07 01:31:31 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-07 01:31:31 +0100
commitd5eff70b6e7acb3bd60a5e6f8233cf4936a5d606 (patch)
tree14d6a9e1bff97ee2a27e90798e6ccb4f5b555327 /netlib/tcp.py
parentdbadc1b61327d06bb176d0465ad5831a619126be (diff)
downloadmitmproxy-d5eff70b6e7acb3bd60a5e6f8233cf4936a5d606.tar.gz
mitmproxy-d5eff70b6e7acb3bd60a5e6f8233cf4936a5d606.tar.bz2
mitmproxy-d5eff70b6e7acb3bd60a5e6f8233cf4936a5d606.zip
fix tests on Windows
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index ba4f008c..b2f11851 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -7,6 +7,7 @@ import threading
import time
import traceback
from OpenSSL import SSL
+import OpenSSL
from . import certutils
@@ -301,6 +302,10 @@ class _Connection(object):
self.connection.shutdown()
except SSL.Error:
pass
+ except KeyError as e:
+ # Workaround for https://github.com/pyca/pyopenssl/pull/183
+ if OpenSSL.__version__ != "0.14":
+ raise e
"""
Creates an SSL Context.