From: Neil Horman <nhorman@openssl.org>
Date: Wed, 4 Dec 2024 20:27:00 +0000 (-0500)
Subject: Add http3 test to the interop container
X-Git-Tag: openssl-3.5.0-alpha1~283
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9570ecfc69a59fdcd7a760360ecb1a10c4a8a931;p=thirdparty%2Fopenssl.git

Add http3 test to the interop container

Set fileprefix for interop container on http3 server test

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26180)
---

diff --git a/test/quic-openssl-docker/Dockerfile b/test/quic-openssl-docker/Dockerfile
index 7f3609e84bc..dbdffc78843 100644
--- a/test/quic-openssl-docker/Dockerfile
+++ b/test/quic-openssl-docker/Dockerfile
@@ -28,9 +28,10 @@ RUN git clone --depth 1 https://github.com/ngtcp2/nghttp3.git && \
 # download and build openssl 
 RUN git clone --depth 1 -b $OPENSSL_BRANCH $OPENSSL_URL && \
     cd openssl && \
-    ./Configure enable-sslkeylog enable-fips enable-demos disable-docs --prefix=/usr --openssldir=/etc/pki/tls && \
+    ./Configure enable-sslkeylog enable-fips enable-demos enable-h3demo disable-docs --prefix=/usr --openssldir=/etc/pki/tls && \
     make -j 4 && make install && cp demos/guide/quic-hq-interop /usr/local/bin && \
     cp demos/guide/quic-hq-interop-server /usr/local/bin && \
+    cp demos/http3/ossl-nghttp3-demo-server /usr/local/bin && \
     rm -rf /openssl
 
 # Build curl
diff --git a/test/quic-openssl-docker/run_endpoint.sh b/test/quic-openssl-docker/run_endpoint.sh
index 24fde515780..0de96a8ef50 100644
--- a/test/quic-openssl-docker/run_endpoint.sh
+++ b/test/quic-openssl-docker/run_endpoint.sh
@@ -97,6 +97,9 @@ elif [ "$ROLE" == "server" ]; then
     "retry"|"resumption")
      	SSLKEYLOGFILE=/logs/keys.log FILEPREFIX=/www quic-hq-interop-server 443 /certs/cert.pem /certs/priv.key
         ;;
+    "http3")
+        FILEPREFIX=/www/ SSLKEYLOGFILE=/logs/keys.log ossl-nghttp3-demo-server 443 /certs/cert.pem /certs/priv.key
+        ;;
     "chacha20")
         SSL_CIPHER_SUITES=TLS_CHACHA20_POLY1305_SHA256 SSLKEYLOGFILE=/logs/keys.log FILEPREFIX=/www quic-hq-interop-server 443 /certs/cert.pem /certs/priv.key
         ;;