Changeset 121

Timestamp:

03/01/17 19:18:02 (8 years ago)

Author:

tim

Message:

.

File:

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

trunk/lib/bletchley/ssltls.py

@@ -77 +77 @@
 
 
-def ConnectSSLTLS(host, port, cipher_list=None, handshake_callback=None):
+def ConnectSSLTLS(host, port, cipher_list=None, handshake_callback=None, verbose=True):
     protocols = [("SSL 2/3", SSL.SSLv23_METHOD),
                  ("TLS 1.0", SSL.TLSv1_METHOD), 
@@ -102 +102 @@
             break
         except ValueError as e:
-            sys.stderr.write("%s protocol not supported by your openssl library, trying others...\n" % pname)
+            if verbose:
+                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)
-            sys.stderr.write("\nThis could happen because the server requires "
-                             "certain SSL/TLS versions or a client certificiate."
-                             "  Have no fear, we'll keep trying...\n")            
+            if verbose:
+                sys.stderr.write("Exception during %s handshake with server." % pname)
+                sys.stderr.write("\nThis could happen because the server requires "
+                                 "certain SSL/TLS versions or a client certificiate."
+                                 "  Have no fear, we'll keep trying...\n")            
         except Exception as e:
-            sys.stderr.write("Unknown exception during handshake with server: \n")
+            sys.stderr.write("Unknown exception during %s handshake with server: \n" % pname)
             traceback.print_exc(file=sys.stderr)