Update Token Binding code to match latest draft draft-ietf-tokbind-protocol-04

third_party/tlslite/tlslite/messages.py

 # Authors: 
 #   Trevor Perrin
 #   Google - handling CertificateRequest.certificate_types
 #   Google (adapted by Sam Rushing and Marcelo Fernandez) - NPN support
 #   Dimitris Moraitis - Anon ciphersuites
 #   Yngve Pettersen (ported by Paul Sokolovsky) - TLS 1.2
 #
 # See the LICENSE file for legal information regarding use of this file.
 
 """Classes representing TLS messages."""
@@ skipping 176 matching lines @@
                                 break
                     elif extType == ExtensionType.channel_id:
                         self.channel_id = True
                     elif extType == ExtensionType.extended_master_secret:
                         self.extended_master_secret = True
                     elif extType == ExtensionType.token_binding:
                         tokenBindingBytes = p.getFixBytes(extLength)
                         p2 = Parser(tokenBindingBytes)
                         ver_minor = p2.get(1)
                         ver_major = p2.get(1)
-                        if (ver_major, ver_minor) >= (0, 2):
+                        if (ver_major, ver_minor) >= (0, 3):
                             p2.startLengthCheck(1)
                             while not p2.atLengthCheck():
                                 self.tb_client_params.append(p2.get(1))
                     elif extType == ExtensionType.signed_cert_timestamps:
                         if extLength:
                             raise SyntaxError()
                         self.support_signed_cert_timestamps = True
                     elif extType == ExtensionType.status_request:
                         # Extension contents are currently ignored.
                         # According to RFC 6066, this is not strictly forbidden
@@ skipping 167 matching lines @@
             w2.add(0, 2)
         if self.extended_master_secret:
             w2.add(ExtensionType.extended_master_secret, 2)
             w2.add(0, 2)
         if self.tb_params:
             w2.add(ExtensionType.token_binding, 2)
             # length of extension
             w2.add(4, 2)
             # version
             w2.add(0, 1)
-            w2.add(2, 1)
+            w2.add(4, 1)
             # length of params (defined as variable length <1..2^8-1>, but in
             # this context the server can only send a single value.
             w2.add(1, 1)
             w2.add(self.tb_params, 1)
         if self.signed_cert_timestamps:
             w2.add(ExtensionType.signed_cert_timestamps, 2)
             w2.addVarSeq(bytearray(self.signed_cert_timestamps), 1, 2)
         if self.status_request:
             w2.add(ExtensionType.status_request, 2)
             w2.add(0, 2)
@@ skipping 429 matching lines @@
         newMsg = ApplicationData().create(self.bytes[:1])
         self.bytes = self.bytes[1:]
         return newMsg
 
     def parse(self, p):
         self.bytes = p.bytes
         return self
 
     def write(self):
         return self.bytes