Changeset 74

Timestamp:

11/13/14 19:39:07 (10 years ago)

Author:

tim

Message:

fixed script in cases where server rejects client handshake due to lack of client cert or other problems

File:

• trunk/bin/bletchley-clonecertchain (modified) (3 diffs)

trunk/bin/bletchley-clonecertchain

@@ -64 +64 @@
     serverSock.connect((host,port))
     
+    chain = None
     try:
         server = SSL.Connection(createClientContext(), serverSock)
@@ -69 +70 @@
         server.do_handshake()
     except Exception as e:
-        print("Exception during handshake with server: ")
-        traceback.print_exc(e)
-        return None
+        sys.stderr.write("Exception during handshake with server: \n")
+        traceback.print_exc(file=sys.stderr)
+        sys.stderr.write("\nThis typically occurs when server rejects our "
+                         "connection due to lack of a client certificate or"
+                         " for similar reasons.\nAttempting to continue...\n\n")
         
     return server.get_peer_cert_chain()
@@ -221 +224 @@
 
 #print("FAKE KEY AND CHAIN:")
+if not chain:
+    sys.stderr.write("ERROR: Could not retrieve server certificate\n\n")
+    sys.exit(2)
+
 fake_key, fake_chain = genFakeCertificateChain(chain)
 print(OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, fake_key).decode('utf-8'))