Changeset 126 for trunk

Timestamp:

03/01/17 20:43:55 (7 years ago)

Author:

tim

Message:

.

File:

• trunk/lib/bletchley/ssltls.py (modified) (3 diffs)

trunk/lib/bletchley/ssltls.py

@@ -55 +55 @@
 
 
-def startSSLTLS(sock, mode='client', protocol=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None):
+def startSSLTLS(sock, mode='client', protocol=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None, timeout=None):
     '''
     cipher_list names drawn from:
@@ -64 +64 @@
     if cipher_list:
         context.set_cipher_list(cipher_list)
+    if timeout:
+        context.set_timeout(timeout)
+        
     #if not key and mode == 'server':
     #context.set_options(OpenSSL.SSL.OP_SINGLE_DH_USE)
@@ -109 +112 @@
             
         try:
-            conn = startSSLTLS(serverSock, mode='client', protocol=p, cipher_list=cl)
+            conn = startSSLTLS(serverSock, mode='client', protocol=p, cipher_list=cl, timeout=timeout)
             break
         except ValueError as e: