Merge cfe112c into 403539b

tlsfuzzer · Apr 23, 2018 · d1c74f5 · d1c74f5
2 parents 403539b + cfe112c
commit d1c74f5
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/tlslite/tlsconnection.py b/tlslite/tlsconnection.py
@@ -2523,10 +2523,18 @@ def _serverGetClientHello(self, settings, certChain, verifierDB,
         # TODO when TLS 1.3 is final, check the client hello random for
         # downgrade too
 
-        scheme = self._pickServerKeyExchangeSig(settings,
-                                                clientHello,
-                                                certChain,
-                                                version)
+        scheme = None
+        if version >= (3, 4):
+            try:
+                scheme = self._pickServerKeyExchangeSig(settings,
+                                                        clientHello,
+                                                        certChain,
+                                                        version)
+            except TLSHandshakeFailure as alert:
+                for result in self._sendError(
+                        AlertDescription.handshake_failure,
+                        str(alert)):
+                    yield result
 
         #Check if there's intersection between supported curves by client and
         #server