| Index: third_party/tlslite/patches/tls_intolerant.patch
|
| diff --git a/third_party/tlslite/patches/tls_intolerant.patch b/third_party/tlslite/patches/tls_intolerant.patch
|
| index 23723342de6df576b9471a37218f22ad160c8e7b..f9c826768b855b942cb277c1808eacad6886c525 100644
|
| --- a/third_party/tlslite/patches/tls_intolerant.patch
|
| +++ b/third_party/tlslite/patches/tls_intolerant.patch
|
| @@ -1,8 +1,8 @@
|
| diff --git a/third_party/tlslite/tlslite/tlsconnection.py b/third_party/tlslite/tlslite/tlsconnection.py
|
| -index e8dd859..8415592 100755
|
| +index e7c6834..0e78753 100644
|
| --- a/third_party/tlslite/tlslite/tlsconnection.py
|
| +++ b/third_party/tlslite/tlslite/tlsconnection.py
|
| -@@ -965,7 +965,8 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -968,7 +968,8 @@ class TLSConnection(TLSRecordLayer):
|
| sessionCache=None, settings=None, checker=None,
|
| reqCAs = None,
|
| tacks=None, activationFlags=0,
|
| @@ -12,7 +12,7 @@ index e8dd859..8415592 100755
|
| """Perform a handshake in the role of server.
|
|
|
| This function performs an SSL or TLS handshake. Depending on
|
| -@@ -1034,6 +1035,11 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1037,6 +1038,11 @@ class TLSConnection(TLSRecordLayer):
|
| clients through the Next-Protocol Negotiation Extension,
|
| if they support it.
|
|
|
| @@ -24,7 +24,7 @@ index e8dd859..8415592 100755
|
| @raise socket.error: If a socket error occurs.
|
| @raise tlslite.errors.TLSAbruptCloseError: If the socket is closed
|
| without a preceding alert.
|
| -@@ -1045,7 +1051,7 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1048,7 +1054,7 @@ class TLSConnection(TLSRecordLayer):
|
| certChain, privateKey, reqCert, sessionCache, settings,
|
| checker, reqCAs,
|
| tacks=tacks, activationFlags=activationFlags,
|
| @@ -33,7 +33,7 @@ index e8dd859..8415592 100755
|
| pass
|
|
|
|
|
| -@@ -1054,7 +1060,8 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1057,7 +1063,8 @@ class TLSConnection(TLSRecordLayer):
|
| sessionCache=None, settings=None, checker=None,
|
| reqCAs=None,
|
| tacks=None, activationFlags=0,
|
| @@ -43,7 +43,7 @@ index e8dd859..8415592 100755
|
| ):
|
| """Start a server handshake operation on the TLS connection.
|
|
|
| -@@ -1073,7 +1080,8 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1076,7 +1083,8 @@ class TLSConnection(TLSRecordLayer):
|
| sessionCache=sessionCache, settings=settings,
|
| reqCAs=reqCAs,
|
| tacks=tacks, activationFlags=activationFlags,
|
| @@ -53,7 +53,7 @@ index e8dd859..8415592 100755
|
| for result in self._handshakeWrapperAsync(handshaker, checker):
|
| yield result
|
|
|
| -@@ -1082,7 +1090,8 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1085,7 +1093,8 @@ class TLSConnection(TLSRecordLayer):
|
| certChain, privateKey, reqCert, sessionCache,
|
| settings, reqCAs,
|
| tacks, activationFlags,
|
| @@ -63,7 +63,7 @@ index e8dd859..8415592 100755
|
|
|
| self._handshakeStart(client=False)
|
|
|
| -@@ -1114,7 +1123,7 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1117,7 +1126,7 @@ class TLSConnection(TLSRecordLayer):
|
| # Handle ClientHello and resumption
|
| for result in self._serverGetClientHello(settings, certChain,\
|
| verifierDB, sessionCache,
|
| @@ -72,7 +72,7 @@ index e8dd859..8415592 100755
|
| if result in (0,1): yield result
|
| elif result == None:
|
| self._handshakeDone(resumed=True)
|
| -@@ -1211,7 +1220,7 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1214,7 +1223,7 @@ class TLSConnection(TLSRecordLayer):
|
|
|
|
|
| def _serverGetClientHello(self, settings, certChain, verifierDB,
|
| @@ -81,7 +81,7 @@ index e8dd859..8415592 100755
|
| #Initialize acceptable cipher suites
|
| cipherSuites = []
|
| if verifierDB:
|
| -@@ -1246,6 +1255,13 @@ class TLSConnection(TLSRecordLayer):
|
| +@@ -1249,6 +1258,13 @@ class TLSConnection(TLSRecordLayer):
|
| "Too old version: %s" % str(clientHello.client_version)):
|
| yield result
|
|
|
|
|