Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions test/scapy/layers/tls/tlsclientserver.uts
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,17 @@ def run_tls_native_test_server(post_handshake_auth=False,
context.verify_mode = ssl.CERT_REQUIRED
context.load_cert_chain(certfile=certfile, keyfile=keyfile)

port = [None]
lock = threading.Lock()
lock.acquire()

def ssl_server():
server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
server.settimeout(1)
server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
server.bind(("0.0.0.0", 59000))
server.bind(("0.0.0.0", 0))
server.listen(5)
port[0] = server.getsockname()[1]
# Sync
lock.release()
# Accept socket
Expand Down Expand Up @@ -498,20 +500,20 @@ def run_tls_native_test_server(post_handshake_auth=False,
server = threading.Thread(target=ssl_server)
server.start()
assert lock.acquire(timeout=5), "Server failed to start in time !"
return server
return server, port[0]


def test_tls_client_native(post_handshake_auth=False,
with_hello_retry=False):
server = run_tls_native_test_server(
server, port = run_tls_native_test_server(
post_handshake_auth=post_handshake_auth,
with_hello_retry=with_hello_retry,
)

a = TLSClientAutomaton.tlslink(
HTTP,
server="127.0.0.1",
dport=59000,
dport=port,
version="tls13",
mycert=certfile,
mykey=keyfile,
Expand Down