Revert of Require ECDHE for False Start.

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 491 matching lines @@
 
 class ServerKeyExchange(HandshakeMsg):
     def __init__(self, cipherSuite, version):
         HandshakeMsg.__init__(self, HandshakeType.server_key_exchange)
         self.cipherSuite = cipherSuite
         self.version = version
         self.srp_N = 0
         self.srp_g = 0
         self.srp_s = bytearray(0)
         self.srp_B = 0
-        # DH params:
+        # Anon DH params:
         self.dh_p = 0
         self.dh_g = 0
         self.dh_Ys = 0
-        # ECDH params:
-        self.ecdhCurve = 0
-        self.ecdhPublic = bytearray(0)
         self.signature = bytearray(0)
 
     def createSRP(self, srp_N, srp_g, srp_s, srp_B):
         self.srp_N = srp_N
         self.srp_g = srp_g
         self.srp_s = srp_s
         self.srp_B = srp_B
         return self
     
     def createDH(self, dh_p, dh_g, dh_Ys):
         self.dh_p = dh_p
         self.dh_g = dh_g
         self.dh_Ys = dh_Ys
         return self
 
-    def createECDH(self, ecdhCurve, ecdhPublic):
-        self.ecdhCurve = ecdhCurve
-        self.ecdhPublic = ecdhPublic
-        return self
-
     def parse(self, p):
         p.startLengthCheck(3)
         if self.cipherSuite in CipherSuite.srpAllSuites:
             self.srp_N = bytesToNumber(p.getVarBytes(2))
             self.srp_g = bytesToNumber(p.getVarBytes(2))
             self.srp_s = p.getVarBytes(1)
             self.srp_B = bytesToNumber(p.getVarBytes(2))
             if self.cipherSuite in CipherSuite.srpCertSuites:
                 self.signature = p.getVarBytes(2)
         elif self.cipherSuite in CipherSuite.anonSuites:
             self.dh_p = bytesToNumber(p.getVarBytes(2))
             self.dh_g = bytesToNumber(p.getVarBytes(2))
             self.dh_Ys = bytesToNumber(p.getVarBytes(2))
         p.stopLengthCheck()
         return self
 
     def write_params(self):
         w = Writer()
         if self.cipherSuite in CipherSuite.srpAllSuites:
             w.addVarSeq(numberToByteArray(self.srp_N), 1, 2)
             w.addVarSeq(numberToByteArray(self.srp_g), 1, 2)
             w.addVarSeq(self.srp_s, 1, 1)
             w.addVarSeq(numberToByteArray(self.srp_B), 1, 2)
         elif self.cipherSuite in CipherSuite.dhAllSuites:
             w.addVarSeq(numberToByteArray(self.dh_p), 1, 2)
             w.addVarSeq(numberToByteArray(self.dh_g), 1, 2)
             w.addVarSeq(numberToByteArray(self.dh_Ys), 1, 2)
-        elif self.cipherSuite in CipherSuite.ecdhAllSuites:
-            w.add(ECCurveType.named_curve, 1)
-            w.add(self.ecdhCurve, 2)
-            w.addVarSeq(self.ecdhPublic, 1, 1)
         else:
             assert(False)
         return w.bytes
 
     def write(self):
         w = Writer()
         w.bytes += self.write_params()
         if self.cipherSuite in CipherSuite.certAllSuites:
             if self.version >= (3,3):
                 # TODO: Signature algorithm negotiation not supported.
@@ skipping 51 matching lines @@
             self.srp_A = bytesToNumber(p.getVarBytes(2))
         elif self.cipherSuite in CipherSuite.certSuites:
             if self.version in ((3,1), (3,2), (3,3)):
                 self.encryptedPreMasterSecret = p.getVarBytes(2)
             elif self.version == (3,0):
                 self.encryptedPreMasterSecret = \
                     p.getFixBytes(len(p.bytes)-p.index)
             else:
                 raise AssertionError()
         elif self.cipherSuite in CipherSuite.dhAllSuites:
-            self.dh_Yc = bytesToNumber(p.getVarBytes(2))
-        elif self.cipherSuite in CipherSuite.ecdhAllSuites:
-            self.ecdh_Yc = p.getVarBytes(1)
+            self.dh_Yc = bytesToNumber(p.getVarBytes(2))            
         else:
             raise AssertionError()
         p.stopLengthCheck()
         return self
 
     def write(self):
         w = Writer()
         if self.cipherSuite in CipherSuite.srpAllSuites:
             w.addVarSeq(numberToByteArray(self.srp_A), 1, 2)
         elif self.cipherSuite in CipherSuite.certSuites:
@@ skipping 142 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