Chromium Code Reviews| 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 |