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

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

Issue 2205433002: Implement ALPN in tlslite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; update alpn.patch. Created 4 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
Index: third_party/tlslite/tlslite/session.py
diff --git a/third_party/tlslite/tlslite/session.py b/third_party/tlslite/tlslite/session.py
index 6aadf58e0541ecfb87d71c838d110bdb504f14b6..7758b7c7d7a8268cb213d726a70e6a2d822ed080 100644
--- a/third_party/tlslite/tlslite/session.py
+++ b/third_party/tlslite/tlslite/session.py
@@ -54,11 +54,13 @@ class Session(object):
self.tackExt = None
self.tackInHelloExt = False
self.serverName = ""
+ self.alpn_proto_selected = None
davidben 2016/08/04 22:29:26 ALPN protocols are not remembered across session r
Bence 2016/08/05 14:27:55 Done.
self.resumable = False
def create(self, masterSecret, sessionID, cipherSuite,
srpUsername, clientCertChain, serverCertChain,
- tackExt, tackInHelloExt, serverName, resumable=True):
+ tackExt, tackInHelloExt, alpn_proto_selected, serverName,
+ resumable=True):
self.masterSecret = masterSecret
self.sessionID = sessionID
self.cipherSuite = cipherSuite
@@ -68,6 +70,7 @@ class Session(object):
self.tackExt = tackExt
self.tackInHelloExt = tackInHelloExt
self.serverName = serverName
+ self.alpn_proto_selected = alpn_proto_selected
self.resumable = resumable
def _clone(self):
@@ -81,6 +84,7 @@ class Session(object):
other.tackExt = self.tackExt
other.tackInHelloExt = self.tackInHelloExt
other.serverName = self.serverName
+ other.alpn_proto_selected = self.alpn_proto_selected
other.resumable = self.resumable
return other

Powered by Google App Engine
This is Rietveld 408576698