Move channel id tests up from OpenSSL and update channelid version.

third_party/tlslite/patches/channel_id.patch

 diff --git a/third_party/tlslite/tlslite/constants.py b/third_party/tlslite/tlslite/constants.py
 index d52e596..79ad145 100755
 --- a/third_party/tlslite/tlslite/constants.py
 +++ b/third_party/tlslite/tlslite/constants.py
 @@ -31,6 +31,7 @@ class HandshakeType:
      client_key_exchange = 16
      finished = 20
      next_protocol = 67
 +    encrypted_extensions = 203
  
  class ContentType:
      change_cipher_spec = 20
 @@ -45,6 +46,7 @@ class ExtensionType:    # RFC 6066 / 4366
      cert_type = 9       # RFC 6091
      tack = 0xF300
      supports_npn = 13172
-+    channel_id = 30031
++    channel_id = 30032
      
  class NameType:
      host_name = 0
 diff --git a/third_party/tlslite/tlslite/messages.py b/third_party/tlslite/tlslite/messages.py
 index 7ef4e3f..246082e 100755
 --- a/third_party/tlslite/tlslite/messages.py
 +++ b/third_party/tlslite/tlslite/messages.py
 @@ -112,6 +112,7 @@ class ClientHello(HandshakeMsg):
          self.tack = False
          self.supports_npn = False
@@ skipping 116 matching lines @@
 +        #Server Finish - Are we waiting for a EncryptedExtensions?
 +        if expect_channel_id:
 +            for result in self._getMsg(ContentType.handshake, HandshakeType.encrypted_extensions):
 +                if result in (0,1):
 +                    yield result
 +            if result is None:
 +                for result in self._sendError(AlertDescription.unexpected_message,
 +                                             "Didn't get EncryptedExtensions message"):
 +                    yield result
 +            encrypted_extensions = result
 +            self.channel_id = result.channel_id_key

[wtc, 2014/05/06 17:56:24]

Haavard: you're right. We only record result.channel_id_key but don't do
anything with result.channel_id_proof.

 +        else:
 +            self.channel_id = None
 +
          #Calculate verification data
          verifyData = self._calcFinished(masterSecret, False)
  
 diff --git a/third_party/tlslite/tlslite/tlsrecordlayer.py b/third_party/tlslite/tlslite/tlsrecordlayer.py
 index b0833fe..ff08cbf 100755
 --- a/third_party/tlslite/tlslite/tlsrecordlayer.py
 +++ b/third_party/tlslite/tlslite/tlsrecordlayer.py
 @@ -800,6 +800,8 @@ class TLSRecordLayer(object):
                      yield Finished(self.version).parse(p)
                  elif subType == HandshakeType.next_protocol:
                      yield NextProtocol().parse(p)
 +                elif subType == HandshakeType.encrypted_extensions:
 +                    yield EncryptedExtensions().parse(p)
                  else:
                      raise AssertionError()