diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2020-04-03 17:10:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 17:10:32 +0200 |
| commit | 3c09e1a5166bc8f976722d9cbee3817ee9504920 (patch) | |
| tree | e04b4c9b60238130a48f5262c24efe4d3ba5aeda /mitmproxy/proxy | |
| parent | 0b76afdf5759d229f5657d447866691c433caf45 (diff) | |
| parent | 4bfb81c0089d0e0c1c24739f01fca41a3f055f3a (diff) | |
| download | mitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.tar.gz mitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.tar.bz2 mitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.zip | |
Merge pull request #3692 from mhils/tls13
Update cryptography, enable TLS 1.3
Diffstat (limited to 'mitmproxy/proxy')
| -rw-r--r-- | mitmproxy/proxy/protocol/rawtcp.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mitmproxy/proxy/protocol/rawtcp.py b/mitmproxy/proxy/protocol/rawtcp.py index 0ec50594..00bba04c 100644 --- a/mitmproxy/proxy/protocol/rawtcp.py +++ b/mitmproxy/proxy/protocol/rawtcp.py @@ -29,13 +29,20 @@ class RawTCPLayer(base.Layer): server = self.server_conn.connection conns = [client, server] + # https://github.com/openssl/openssl/issues/6234 + for conn in conns: + if isinstance(conn, SSL.Connection) and hasattr(SSL._lib, "SSL_clear_mode"): + SSL._lib.SSL_clear_mode(conn._ssl, SSL._lib.SSL_MODE_AUTO_RETRY) + try: while not self.channel.should_exit.is_set(): r = mitmproxy.net.tcp.ssl_read_select(conns, 10) for conn in r: dst = server if conn == client else client - - size = conn.recv_into(buf, self.chunk_size) + try: + size = conn.recv_into(buf, self.chunk_size) + except (SSL.WantReadError, SSL.WantWriteError): + continue if not size: conns.remove(conn) # Shutdown connection to the other peer |