]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
ssl_test: correctly handle ML-DSA being disabled
authorPauli <ppzgs1@gmail.com>
Tue, 18 Feb 2025 01:45:58 +0000 (12:45 +1100)
committerPauli <ppzgs1@gmail.com>
Wed, 19 Feb 2025 02:38:41 +0000 (13:38 +1100)
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26806)

test/recipes/80-test_ssl_new.t

index c581f34b58a9f882274809a38f80e23c20d321cf..3b69775972024a7c5996acbc4787a2670fc26b5c 100644 (file)
@@ -72,6 +72,7 @@ my $no_dh = disabled("dh");
 my $no_dsa = disabled("dsa");
 my $no_ec2m = disabled("ec2m");
 my $no_ocsp = disabled("ocsp");
+my $no_ml_dsa = disabled("ml-dsa");
 
 # Add your test here if the test conf.in generates test cases and/or
 # expectations dynamically based on the OpenSSL compile-time config.
@@ -87,7 +88,7 @@ my %conf_dependent_tests = (
   "17-renegotiate.cnf" => disabled("tls1_2"),
   "18-dtls-renegotiate.cnf" => disabled("dtls1_2") || !disabled("sctp"),
   "19-mac-then-encrypt.cnf" => !$is_default_tls,
-  "20-cert-select.cnf" => !$is_default_tls || $no_dh || $no_dsa,
+  "20-cert-select.cnf" => !$is_default_tls || $no_dh || $no_dsa || $no_ml_dsa,
   "22-compression.cnf" => !$is_default_tls,
   "25-cipher.cnf" => disabled("poly1305") || disabled("chacha"),
   "27-ticket-appdata.cnf" => !$is_default_tls,