Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: third_party/tlslite/tlslite/handshakesettings.py

Issue 280853002: Preserve transport errors for OpenSSL sockets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: USE_NSS -> USE_OPENSSL for Windows and Mac Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tlslite/tlslite/handshakesettings.py
diff --git a/third_party/tlslite/tlslite/handshakesettings.py b/third_party/tlslite/tlslite/handshakesettings.py
index e0bc0e661c5712a3d28e49ef8539510b1f91f27e..5a493bab6269d2e793cd64745a35257858842037 100644
--- a/third_party/tlslite/tlslite/handshakesettings.py
+++ b/third_party/tlslite/tlslite/handshakesettings.py
@@ -92,6 +92,20 @@ class HandshakeSettings(object):
The default is (3,2). (WARNING: Some servers may (improperly)
reject clients which offer support for TLS 1.1. In this case,
try lowering maxVersion to (3,1)).
+
+ @type tlsIntolerant: tuple
+ @ivar tlsIntolerant: TLS version intolerance for servers.
+
+ If tlsIntolerant is not None, the server will simulate TLS version
+ intolerance by returning a fatal handshake_failure alert or a TCP reset to
+ all TLS versions tlsIntolerant or higher.
+
+ @type resetOnIntolerance: bool
+ @ivar resetOnIntolerance: Whether to send a TCP reset on TLS intolerance.
+
+ If resetOnIntolerance is True, the server will simulate TLS version
+ intolerance with a TCP reset rather than with a fatal handshake_failuer
+ alert.
@type useExperimentalTackExtension: bool
@ivar useExperimentalTackExtension: Whether to enabled TACK support.
@@ -109,6 +123,8 @@ class HandshakeSettings(object):
self.certificateTypes = CERTIFICATE_TYPES
self.minVersion = (3,0)
self.maxVersion = (3,2)
+ self.tlsIntolerant = None
+ self.resetOnIntolerance = False
self.useExperimentalTackExtension = False
# Validates the min/max fields, and certificateTypes
@@ -124,6 +140,8 @@ class HandshakeSettings(object):
other.certificateTypes = self.certificateTypes
other.minVersion = self.minVersion
other.maxVersion = self.maxVersion
+ other.tlsIntolerant = self.tlsIntolerant
+ other.resetOnIntolerance = self.resetOnIntolerance
if not cipherfactory.tripleDESPresent:
other.cipherNames = [e for e in self.cipherNames if e != "3des"]

Powered by Google App Engine
This is Rietveld 408576698