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

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

Issue 1378613004: Set Token-Binding HTTP header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tb-tls-ext-new
Patch Set: Add UMA logging of Token Binding support and NetLog event for Token Binding key lookup Created 5 years, 1 month 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/tlsconnection.py
diff --git a/third_party/tlslite/tlslite/tlsconnection.py b/third_party/tlslite/tlslite/tlsconnection.py
index 7363a309d24d9fa16bd09ebba10ca8edd55a7a75..6e26fdd7508234722e1d56a76459dc99e32af788 100644
--- a/third_party/tlslite/tlslite/tlsconnection.py
+++ b/third_party/tlslite/tlslite/tlsconnection.py
@@ -609,8 +609,8 @@ class TLSConnection(TLSRecordLayer):
# Create the session object which is used for resumptions
self.session = Session()
self.session.create(masterSecret, serverHello.session_id, cipherSuite,
- srpUsername, clientCertChain, serverCertChain,
- tackExt, serverHello.tackExt!=None, serverName)
+ srpUsername, clientCertChain, serverCertChain, clientHello.random,
+ serverHello.random, tackExt, serverHello.tackExt!=None, serverName)
self._handshakeDone(resumed=False)
@@ -1411,8 +1411,8 @@ class TLSConnection(TLSRecordLayer):
if clientHello.server_name:
serverName = clientHello.server_name.decode("utf-8")
self.session.create(masterSecret, serverHello.session_id, cipherSuite,
- srpUsername, clientCertChain, serverCertChain,
- tackExt, serverHello.tackExt!=None, serverName)
+ srpUsername, clientCertChain, serverCertChain, clientHello.random,
+ serverHello.random, tackExt, serverHello.tackExt!=None, serverName)
#Add the session object to the session cache
if sessionCache and sessionID:
@@ -1536,6 +1536,10 @@ class TLSConnection(TLSRecordLayer):
serverHello.extended_master_secret = \
clientHello.extended_master_secret and \
settings.enableExtendedMasterSecret
+ for param in clientHello.tb_client_params:
+ if param in settings.supportedTokenBindingParams:
+ serverHello.tb_params = param
+ break
for result in self._sendMsg(serverHello):
yield result

Powered by Google App Engine
This is Rietveld 408576698