Changeset 131

Timestamp:

09/18/17 18:53:24 (7 years ago)

Author:

tim

Message:

minor annoyances

Location:

trunk

Files:

• bin/bletchley-http2py (modified) (5 diffs)
• lib/bletchley/ssltls.py (modified) (1 diff)

trunk/bin/bletchley-http2py

@@ -19 +19 @@
 
 Copyright (C) 2011-2013 Virtual Security Research, LLC
-Copyright (C) 2014-2016 Blindspot Security LLC
+Copyright (C) 2014-2017 Blindspot Security LLC
 Author: Timothy D. Morgan
 
@@ -149 +149 @@
 from bletchley import chosenct
 from bletchley.CBC import *
+import urllib3
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 # TODO: ensure the host, port, and protocol settings are correct.
@@ -217 +219 @@
     # These are useful for debugging, but once your response processing is working,
     # remove them so it isn't so verbose.
-    print(response.status_code)
-    print(response.headers)
-    print(repr(response.content))
-
+    print(response.status_code, file=sys.stderr)
+    print(response.headers, file=sys.stderr)
+    print(repr(response.content), file=sys.stderr)
+
+    # You may need to return either true/false or a string/bytes object here 
+    # (which is derived from the response) depending on your test
     return ret_val
 ''')
@@ -274 +278 @@
     # These are useful for debugging, but once your response processing is working,
     # remove them so it isn't so verbose.
-    print(response.status)
-    print(response.getheaders())
-    print(repr(response.read()))
+    print(response.status, file=sys.stderr)
+    print(response.getheaders(), file=sys.stderr)
+    print(repr(response.read()), file=sys.stderr)
 
     connection.close()
+    # You may need to return either true/false or a string/bytes object here 
+    # (which is derived from the response) depending on your test
     return ret_val
 ''')
@@ -289 +295 @@
 # TODO: Use this to verify you get the response you expect.  
 #       Once everything is working, use the commented code below to conduct specific attacks.
-processResponse(ciphertext)
+print(processResponse(ciphertext), file=sys.stderr)
 
 

trunk/lib/bletchley/ssltls.py

@@ -75 +75 @@
     if mode == 'client':
         conn.set_connect_state()
-        # This hokey crap is required because OpenSSL wants you to poll rather than just block
-        # XXX: tie this sleep time into the timeout parameter
-        for tries in range(0,10):
-            try:
-                conn.do_handshake()
-                break
-            except OpenSSL.SSL.WantReadError as e:
-                time.sleep(0.1)
+        if timeout:
+            # This polling is needed because the socket timeouts have put the
+            # socket in non-blocking mode
+            start = time.time()+timeout
+            while time.time() < start:
+                try:
+                    conn.do_handshake()
+                    break
+                except (OpenSSL.SSL.WantReadError,OpenSSL.SSL.WantWriteError) as e:
+                    time.sleep(0.00001)
+        else:
+            conn.do_handshake()
+
     else:
         conn.set_accept_state()