Changeset 131 for trunk/lib

Timestamp:

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

Author:

tim

Message:

minor annoyances

File:

• trunk/lib/bletchley/ssltls.py (modified) (1 diff)

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()