Merge pull request #336 from simo5/fixtls13tlsfuzzer

Fix bug when returning errors for _tryDecrypt
tlsfuzzer · Jan 10, 2019 · 58f3e2c · 58f3e2c
2 parents 2a1e00a + 95a5729
commit 58f3e2c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tlslite/tlsconnection.py b/tlslite/tlsconnection.py
@@ -2186,11 +2186,11 @@ def _serverSendTickets(self, settings):
 
     def _tryDecrypt(self, settings, identity):
         if not settings.ticketKeys:
-            return
+            return None, None
 
         if len(identity.identity) < 13:
             # too small for an encrypted ticket
-            return
+            return None, None
 
         iv, encrypted_ticket = identity.identity[:12], identity.identity[12:]
         for key in settings.ticketKeys:
@@ -2222,6 +2222,9 @@ def _tryDecrypt(self, settings, identity):
 
             return ((identity.identity, psk, prf), ticket)
 
+        # no keys
+        return None, None
+
     def _serverTLS13Handshake(self, settings, clientHello, cipherSuite,
                               privateKey, serverCertChain, version, scheme,
                               srv_alpns, reqCert):