Changeset 120

Timestamp:

03/01/17 19:03:44 (7 years ago)

Author:

tim

Message:

hooks and extensions

File:

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

trunk/lib/bletchley/ssltls.py

@@ -55 +55 @@
 
 
-def startSSLTLS(sock, mode='client', handshake=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None):
+def startSSLTLS(sock, mode='client', protocol=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None):
     '''
     cipher_list example:  b'DH-DSS-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:DH-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DH-RSA-AES256-SHA256:DH-DSS-AES256-SHA256:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DH-RSA-AES256-SHA:DH-DSS-AES256-SHA:DHE-RSA-CAMELLIA256-SHA:DHE-DSS-CAMELLIA256-SHA:DH-RSA-CAMELLIA256-SHA:DH-DSS-CAMELLIA256-SHA:ADH-AES256-GCM-SHA384:ADH-AES256-SHA256:ADH-AES256-SHA:ADH-CAMELLIA256-SHA:DH-DSS-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DH-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-DSS-AES128-SHA256:DH-RSA-AES128-SHA256:DH-DSS-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:DH-RSA-AES128-SHA:DH-DSS-AES128-SHA:DHE-RSA-SEED-SHA:DHE-DSS-SEED-SHA:DH-RSA-SEED-SHA:DH-DSS-SEED-SHA:DHE-RSA-CAMELLIA128-SHA:DHE-DSS-CAMELLIA128-SHA:DH-RSA-CAMELLIA128-SHA:DH-DSS-CAMELLIA128-SHA:ADH-AES128-GCM-SHA256:ADH-AES128-SHA256:ADH-AES128-SHA:ADH-SEED-SHA:ADH-CAMELLIA128-SHA:ADH-RC4-MD5:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DH-RSA-DES-CBC3-SHA:DH-DSS-DES-CBC3-SHA:ADH-DES-CBC3-SHA'
     '''
     
-    context = createContext(handshake, key=key, certChain=certChain)
+    context = createContext(protocol, key=key, certChain=certChain)
     if cipher_list:
         context.set_cipher_list(cipher_list)
@@ -66 +66 @@
     #context.set_options(OpenSSL.SSL.OP_SINGLE_DH_USE)
     #context.set_options(OpenSSL.SSL.OP_EPHEMERAL_RSA)
-        
+    
     conn = SSL.Connection(context, sock)
     if mode == 'client':
@@ -77 +77 @@
 
 
-def ConnectSSLTLS(host, port):
+def ConnectSSLTLS(host, port, cipher_list=None, handshake_callback=None):
     protocols = [("SSL 2/3", SSL.SSLv23_METHOD),
                  ("TLS 1.0", SSL.TLSv1_METHOD), 
@@ -91 +91 @@
         
         try:
-            conn = startSSLTLS(serverSock, mode='client', handshake=p)
+            if handshake_callback:
+                if not handshake_callback(serverSock):
+                    return None
+        except Exception as e:
+            traceback.print_exc(file=sys.stderr)
+            return None
+            
+        try:
+            conn = startSSLTLS(serverSock, mode='client', protocol=p, cipher_list=cipher_list)
             break
         except ValueError as e:
-            sys.stderr.write("%s handshake not supported by your openssl library, trying others...\n" % pname)
+            sys.stderr.write("%s protocol not supported by your openssl library, trying others...\n" % pname)
         except SSL.Error as e:
             sys.stderr.write("Exception during %s handshake with server." % pname)