- Timestamp:
- 03/01/17 20:43:55 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/bletchley/ssltls.py
r125 r126 55 55 56 56 57 def startSSLTLS(sock, mode='client', protocol=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None ):57 def startSSLTLS(sock, mode='client', protocol=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None, timeout=None): 58 58 ''' 59 59 cipher_list names drawn from: … … 64 64 if cipher_list: 65 65 context.set_cipher_list(cipher_list) 66 if timeout: 67 context.set_timeout(timeout) 68 66 69 #if not key and mode == 'server': 67 70 #context.set_options(OpenSSL.SSL.OP_SINGLE_DH_USE) … … 109 112 110 113 try: 111 conn = startSSLTLS(serverSock, mode='client', protocol=p, cipher_list=cl )114 conn = startSSLTLS(serverSock, mode='client', protocol=p, cipher_list=cl, timeout=timeout) 112 115 break 113 116 except ValueError as e:
Note: See TracChangeset
for help on using the changeset viewer.