From c8b050eef15f7007adf8dd5cacb72920f1605f45 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 24 Sep 2024 04:31:47 -0400 Subject: [PATCH] Update quic interop docker container for chacha20 Need to update the docker interop container to use the quic-hq-interop client so that the right alpn is negotiated for chacha20 testing Reviewed-by: Viktor Dukhovni Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25528) --- test/quic-openssl-docker/run_endpoint.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/quic-openssl-docker/run_endpoint.sh b/test/quic-openssl-docker/run_endpoint.sh index 1c4d7c1d5b0..db26e7c426f 100644 --- a/test/quic-openssl-docker/run_endpoint.sh +++ b/test/quic-openssl-docker/run_endpoint.sh @@ -69,8 +69,14 @@ if [ "$ROLE" == "client" ]; then exit 0 ;; "chacha20") - OUTFILE=$(basename $REQUESTS) - SSL_CERT_FILE=/certs/ca.pem curl --verbose --tlsv1.3 --tls13-ciphers TLS_CHACHA20_POLY1305_SHA256 --http3 -o /downloads/$OUTFILE $REQUESTS || exit 1 + for req in $REQUESTS + do + OUTFILE=$(basename $req) + echo -n "$OUTFILE " > ./reqfile.txt + HOSTNAME=$(printf "%s\n" "$req" | sed -ne 's,^https://\([^/:]*\).*,\1,p') + HOSTPORT=$(printf "%s\n" "$req" | sed -ne 's,^https://[^:/]*:\([^/]*\).*,\1,p') + done + SSL_CIPHER_SUITES=TLS_CHACHA20_POLY1305_SHA256 SSL_SESSION_FILE=./session.db SSLKEYLOGFILE=/logs/keys.log SSL_CERT_FILE=/certs/ca.pem SSL_CERT_DIR=/certs quic-hq-interop $HOSTNAME $HOSTPORT ./reqfile.txt || exit 1 exit 0 ;; *) -- 2.47.2