third_party/tlslite/tlslite/tlsconnection.py - Issue 1339193002: Add flag to tlslite's HandshakeSettings to disable channel ID on the test server

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1339193002: Add flag to tlslite's HandshakeSettings to disable channel ID on the test server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use correct diffbase Created 5 years, 3 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/tlsconnection.py

diff --git a/third_party/tlslite/tlslite/tlsconnection.py b/third_party/tlslite/tlslite/tlsconnection.py

index 06404fed10c2544cbd8d2ebb06809966559c12ca..7363a309d24d9fa16bd09ebba10ca8edd55a7a75 100644

--- a/third_party/tlslite/tlslite/tlsconnection.py

+++ b/third_party/tlslite/tlslite/tlsconnection.py

@@ -1326,7 +1326,8 @@ class TLSConnection(TLSRecordLayer):

serverHello.create(self.version, getRandomBytes(32), sessionID, \

cipherSuite, CertificateType.x509, tackExt,

nextProtos)

- serverHello.channel_id = clientHello.channel_id

+ serverHello.channel_id = \

+ clientHello.channel_id and settings.enableChannelID

serverHello.extended_master_secret = \

clientHello.extended_master_secret and \

settings.enableExtendedMasterSecret

@@ -1391,7 +1392,7 @@ class TLSConnection(TLSRecordLayer):

for result in self._serverFinished(premasterSecret,

clientHello.random, serverHello.random,

cipherSuite, settings.cipherImplementations,

- nextProtos, clientHello.channel_id,

+ nextProtos, serverHello.channel_id,

serverHello.extended_master_secret):

if result in (0,1): yield result

else: break

« third_party/tlslite/patches/disable_channel_id.patch ('K') | « third_party/tlslite/tlslite/handshakesettings.py ('k') | no next file » | no next file with comments »