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

Unified Diff: third_party/tlslite/patches/extended_master_secret.patch

Issue 1301403002: Fix extended master secret implementation in tlslite (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | third_party/tlslite/tlslite/handshakesettings.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tlslite/patches/extended_master_secret.patch
diff --git a/third_party/tlslite/patches/extended_master_secret.patch b/third_party/tlslite/patches/extended_master_secret.patch
index 19bf4072c6a05494a6779ad1e431e8e9ad76dbbf..b6ad58ddfd5e17cc98ed4c75786fc4128d41946a 100644
--- a/third_party/tlslite/patches/extended_master_secret.patch
+++ b/third_party/tlslite/patches/extended_master_secret.patch
@@ -11,7 +11,7 @@ index 6d78a20..f9c8676 100644
supports_npn = 13172
channel_id = 30032
diff --git a/third_party/tlslite/tlslite/handshakesettings.py b/third_party/tlslite/tlslite/handshakesettings.py
-index 605ed42..7679823 100644
+index 605ed42..a7b6ab9 100644
--- a/third_party/tlslite/tlslite/handshakesettings.py
+++ b/third_party/tlslite/tlslite/handshakesettings.py
@@ -111,6 +111,10 @@ class HandshakeSettings(object):
@@ -33,6 +33,14 @@ index 605ed42..7679823 100644
# Validates the min/max fields, and certificateTypes
# Filters out unsupported cipherNames and cipherImplementations
+@@ -146,6 +151,7 @@ class HandshakeSettings(object):
+ other.tlsIntolerant = self.tlsIntolerant
+ other.tlsIntoleranceType = self.tlsIntoleranceType
+ other.alertAfterHandshake = self.alertAfterHandshake
++ other.enableExtendedMasterSecret = self.enableExtendedMasterSecret
+
+ if not cipherfactory.tripleDESPresent:
+ other.cipherNames = [e for e in self.cipherNames if e != "3des"]
diff --git a/third_party/tlslite/tlslite/mathtls.py b/third_party/tlslite/tlslite/mathtls.py
index 60a331a..0a23fe1 100644
--- a/third_party/tlslite/tlslite/mathtls.py
« no previous file with comments | « no previous file | third_party/tlslite/tlslite/handshakesettings.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698