]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
tests: testcompat-openssl-tls13: explicitly allow CCM8 ciphersuites
authorDaiki Ueno <ueno@gnu.org>
Wed, 5 Jun 2024 07:33:16 +0000 (16:33 +0900)
committerDaiki Ueno <ueno@gnu.org>
Wed, 5 Jun 2024 07:33:16 +0000 (16:33 +0900)
Since OpenSSL 3.2, CCM8 is only allowed in security level 0. This
tweaks test scripts to explicitly enable this level but only enable
TLS 1.3 to exclude any TLS 1.2 ciphersuites.

Signed-off-by: Daiki Ueno <ueno@gnu.org>
tests/suite/testcompat-openssl-tls13-cli.sh
tests/suite/testcompat-openssl-tls13-serv.sh

index 4c0af67c19737e2c1be2f8f3e13ebfdc55db2e3f..717d2a9439014ab1efe22039e7610fa6541d7826 100755 (executable)
@@ -86,11 +86,10 @@ fi
 
 
 eval "${GETPORT}"
-launch_bare_server "$OPENSSL" s_server -ciphersuites ${OCIPHERSUITES} -groups 'X25519:P-256:X448:P-521:P-384' -quiet -www -accept "${PORT}" -keyform pem -certform pem ${OPENSSL_DH_PARAMS_OPT} -key "${RSA_KEY}" -cert "${RSA_CERT}" -CAfile "${CA_CERT}"
+launch_bare_server "$OPENSSL" s_server -cipher ALL:@SECLEVEL=0 -min_protocol TLSv1.3 -ciphersuites ${OCIPHERSUITES} -groups 'X25519:P-256:X448:P-521:P-384' -quiet -www -accept "${PORT}" -keyform pem -certform pem ${OPENSSL_DH_PARAMS_OPT} -key "${RSA_KEY}" -cert "${RSA_CERT}" -CAfile "${CA_CERT}"
 PID=$!
 wait_server ${PID}
 
-#AES-128-CCM
 for i in AES-128-GCM AES-256-GCM CHACHA20-POLY1305 AES-128-CCM AES-128-CCM-8;do
        echo_cmd "${PREFIX}Checking TLS 1.3 with ${i}..."
        ${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+${i}${ADD}" --insecure </dev/null >>${OUTPUT} || \
index 0f8953fd8d18cfca9c7a7967742ff34be3f0ade2..9e137d729b761b09ce78c6c4363fedf19eedd272 100755 (executable)
@@ -86,7 +86,6 @@ if ! test -z "${ADD}"; then
        PREFIX="$(echo $ADD|sed 's/://g'): "
 fi
 
-#AES-128-CCM
 for i in AES-128-GCM AES-256-GCM CHACHA20-POLY1305 AES-128-CCM AES-128-CCM-8;do
        echo_cmd "${PREFIX}Checking TLS 1.3 with cipher ${i}..."
 
@@ -95,7 +94,7 @@ for i in AES-128-GCM AES-256-GCM CHACHA20-POLY1305 AES-128-CCM AES-128-CCM-8;do
        PID=$!
        wait_server ${PID}
 
-       ${OPENSSL} s_client -ciphersuites ${OCIPHERSUITES} -host localhost -port "${PORT}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
+       ${OPENSSL} s_client -cipher ALL:@SECLEVEL=0 -min_protocol TLSv1.3 -ciphersuites ${OCIPHERSUITES} -host localhost -port "${PORT}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
                fail ${PID} "Failed"
 
        kill ${PID}