From 599f29bb91b38e6d89441ceeeaf5d3db4b4e6679 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 10 Feb 2016 12:15:46 +0100 Subject: replay-tcp-as-ssl.py: pass cipherlist to server too Avoids handshake failure when a cipher suite is used which is disabled by default (e.g. NULL-SHA). --- crafted-pkt/replay-tcp-as-ssl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crafted-pkt') diff --git a/crafted-pkt/replay-tcp-as-ssl.py b/crafted-pkt/replay-tcp-as-ssl.py index fa173ef..6fd1b64 100755 --- a/crafted-pkt/replay-tcp-as-ssl.py +++ b/crafted-pkt/replay-tcp-as-ssl.py @@ -36,7 +36,7 @@ parser.add_argument("--ciphers", parser.add_argument("pcap_file", help="Pcap file with single TCP stream") parser.add_argument("pcap_srvport", type=int, help="Server port in pcap") -def get_server_sock(q, c, key, cert): +def get_server_sock(q, c, key, cert, ciphers): c.acquire() try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -52,7 +52,7 @@ def get_server_sock(q, c, key, cert): try: conn, addr = sock.accept() print("Client: %r" % (addr,)) - conn = ssl.wrap_socket(conn, key, cert, True) + conn = ssl.wrap_socket(conn, key, cert, True, ciphers=ciphers) q.put(conn) except: q.put(None) @@ -77,7 +77,7 @@ def main(): client_queue = Queue() cond = Condition() server_thread = Thread(target=get_server_sock, name='Server', - args=(server_queue, cond, args.key, args.cert)) + args=(server_queue, cond, args.key, args.cert, args.ciphers)) client_thread = Thread(target=get_client_sock, name='Client', args=(client_queue, args.ciphers)) cond.acquire() -- cgit v1.2.1