Changeset 125 for trunk

Timestamp:

03/01/17 20:40:24 (7 years ago)

Author:

tim

Message:

.

File:

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

trunk/lib/bletchley/ssltls.py

@@ -78 +78 @@
 
 
-def ConnectSSLTLS(host, port, cipher_list=None, handshake_callback=None, verbose=True):
+def ConnectSSLTLS(host, port, cipher_list=None, timeout=None, handshake_callback=None, verbose=True):
     backup_cipher_list = b'DES-CBC3-SHA:RC4-MD5:RC4-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ADH-AES256-GCM-SHA384'
     protocols = [("SSL 2/3", SSL.SSLv23_METHOD, None),
@@ -97 +97 @@
         serverSock = socket.socket()
         serverSock.connect((host,port))
-        
+        if timeout:
+            serverSock.settimeout(timeout)
+
         try:
             if handshake_callback: