Updates for testserver to liboqs-0.12.0 & oqs-provider-0.8.0

curl/Dockerfile

@@ -7,10 +7,10 @@ ARG ALPINE_VERSION=3.20
 ARG OPENSSL_TAG=openssl-3.3.2
 
 # define the liboqs tag to be used
-ARG LIBOQS_TAG=0.11.0
+ARG LIBOQS_TAG=0.12.0
 
 # define the oqsprovider tag to be used
-ARG OQSPROVIDER_TAG=0.7.0
+ARG OQSPROVIDER_TAG=0.8.0
 
 # define the Curl version to be baked in
 ARG CURL_VERSION=8.10.0

nginx/Dockerfile

@@ -6,13 +6,13 @@
 ARG ALPINE_VERSION=3.20
 
 # define the openssl tag to be used
-ARG OPENSSL_TAG=openssl-3.3.2
+ARG OPENSSL_TAG=openssl-3.4.0
 
 # define the liboqs tag to be used
-ARG LIBOQS_TAG=0.11.0
+ARG LIBOQS_TAG=0.12.0
 
 # define the oqsprovider tag to be used
-ARG OQSPROVIDER_TAG=0.7.0
+ARG OQSPROVIDER_TAG=0.8.0
 
 # liboqs build type variant; maximum portability of image:
 ARG LIBOQS_BUILD_DEFINES="-DOQS_DIST_BUILD=ON"
@@ -24,10 +24,10 @@ ARG BASEDIR="/opt"
 ARG INSTALLDIR=${BASEDIR}/nginx
 
 # defines the QSC signature algorithm used for the certificates:
-ARG SIG_ALG="dilithium3"
+ARG SIG_ALG="mldsa65"
 
 # defines the list of default groups to be activated in nginx-openssl config:
-ARG DEFAULT_GROUPS=x25519:x448:kyber512:p256_kyber512:kyber768:p384_kyber768:kyber1024:p521_kyber1024
+ARG DEFAULT_GROUPS=x25519:x448:prime256v1:secp384r1:secp521r1:mlkem512:mlkem768:mlkem1024:X25519MLKEM768:SecP256r1MLKEM768
 
 # define the nginx version to include
 ARG NGINX_VERSION=1.27.2

nginx/fulltest/Dockerfile

@@ -3,11 +3,11 @@
 # First: global build arguments:
 
 # liboqs build type variant; maximum portability of image:
-ARG LIBOQS_TAG=0.11.0
+ARG LIBOQS_TAG=0.12.0
 
-ARG OPENSSL_TAG=openssl-3.3.2
+ARG OPENSSL_TAG=openssl-3.4.0
 
-ARG OQSPROVIDER_TAG=0.6.1
+ARG OQSPROVIDER_TAG=0.8.0
 
 ARG LIBOQS_BUILD_DEFINES="-DOQS_DIST_BUILD=ON"
 
@@ -19,14 +19,11 @@ ARG INSTALLDIR=${BASEDIR}/nginx
 
 ARG CONFIGDIR="/"
 
-# defines the QSC signature algorithm used for the certificates:
-ARG SIG_ALG="dilithium3"
-
 # defines the list of default groups to be activated in nginx-openssl config:
-ARG DEFAULT_GROUPS=x25519:x448:prime256v1:secp384r1:secp521r1:kyber512:x25519_kyber768:p256_kyber512:kyber768:p384_kyber768:kyber1024:p521_kyber1024
+ARG DEFAULT_GROUPS=x25519:x448:prime256v1:secp384r1:secp521r1:mlkem512:mlkem768:mlkem1024:X25519MLKEM768:SecP256r1MLKEM768
 
 # define the nginx version to include
-ARG NGINX_VERSION=1.27.2
+ARG NGINX_VERSION=1.27.3
 
 # Define the degree of parallelism when building the image; leave the number away only if you know what you are doing
 ARG MAKE_DEFINES="-j"
@@ -44,7 +41,6 @@ ARG OPENSSL_TAG
 ARG OQSPROVIDER_TAG
 ARG LIBOQS_BUILD_DEFINES
 ARG INSTALLDIR
-ARG SIG_ALG
 ARG NGINX_VERSION
 ARG MAKE_DEFINES
 ARG DEFAULT_GROUPS
@@ -137,7 +133,6 @@ ARG LIBOQS_BUILD_DEFINES
 ARG LIBOQS_VERSION
 ARG INSTALLDIR
 ARG CAROOTDIR
-ARG SIG_ALG
 ARG BASEDIR
 ARG OSSLDIR=${BASEDIR}/openssl/.openssl
 

nginx/fulltest/build_ubuntu.sh

@@ -9,7 +9,7 @@
 docker build --no-cache -t oqs-nginx-fulltest-provider .
 
 # Copy deployment tar from image
-docker cp $(docker create oqs-nginx-fulltest-provider:latest):oqs-nginx-0.10.1.tgz .
+docker cp $(docker create oqs-nginx-fulltest-provider:latest):oqs-nginx-0.12.0.tgz .
 
 # Copy root ca tar from image
-docker cp $(docker create oqs-nginx-fulltest-provider:latest):oqs-testserver-rootca-0.10.1.tgz .
+docker cp $(docker create oqs-nginx-fulltest-provider:latest):oqs-testserver-rootca-0.12.0.tgz .

nginx/fulltest/index-template

@@ -83,7 +83,7 @@ tr:nth-child(even) {
 
 <p>For automated testing, a JSON file encoding all available SIG/KEM combinations and the respective ports where they can be found is <a href="assignments.json">available for download here</a>. <i>We explicitly want to warn that algorithm/port combinations are subject to change. Be sure to download the most current JSON file before testing.</i></p>
 
-<p>Note: The designator "*" below for key exchange algorithms should not be understood that the port referenced supports any possible KEM, but only all those KEMs configured into the underlying nginx server as default groups. This can be set when building the server via the <a href="https://github.com/open-quantum-safe/oqs-demos/blob/main/nginx/fulltest/Dockerfile#L25-L26">DEFAULT_GROUPS</a> configuration option. The default algorithm list is: <pre>x25519:x448:prime256v1:secp384r1:secp521r1:kyber512:x25519_kyber768:p256_kyber512:kyber768:p384_kyber768:kyber1024:p521_kyber1024.</pre></p>
+<p>Note: The designator "*" below for key exchange algorithms should not be understood that the port referenced supports any possible KEM, but only all those KEMs configured into the underlying nginx server as default groups. This can be set when building the server via the <a href="https://github.com/open-quantum-safe/oqs-demos/blob/main/nginx/fulltest/Dockerfile#L25-L26">DEFAULT_GROUPS</a> configuration option. The default algorithm list is: <pre>x25519:x448:prime256v1:secp384r1:secp521r1:mlkem512:mlkem768:mlkem1024:X25519MLKEM768:SecP256r1MLKEM768.</pre></p>
 
 <table>
   <tr>