summaryrefslogtreecommitdiff
path: root/crafted-pkt
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-02-10 12:15:46 +0100
committerPeter Wu <peter@lekensteyn.nl>2016-02-10 12:15:46 +0100
commit599f29bb91b38e6d89441ceeeaf5d3db4b4e6679 (patch)
tree441345de4ec6ed2d30a6a19ee242c75fc198ac35 /crafted-pkt
parentdd57194c52939697c4a39eefaf782708474ec9d8 (diff)
downloadwireshark-notes-599f29bb91b38e6d89441ceeeaf5d3db4b4e6679.tar.gz
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).
Diffstat (limited to 'crafted-pkt')
-rwxr-xr-xcrafted-pkt/replay-tcp-as-ssl.py6
1 files changed, 3 insertions, 3 deletions
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()