test: run ML-KEM tests for both default and FIPS providers

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Hugo Landau <hlandau@devever.net>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26338)

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 10b593541df3ea463e209f8edfdb1b4cac93b67f..ecb0b421aa4381dc351d7b8236aca9861530cd57 100644 (file)
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -93,6 +93,17 @@ push @files, qw(
                 evppkey_kas.txt
                 evppkey_mismatch.txt
                ) unless $no_ec;
+push @files, qw(
+                evppkey_ml_kem_512_keygen.txt
+                evppkey_ml_kem_512_encap.txt
+                evppkey_ml_kem_512_decap.txt
+                evppkey_ml_kem_768_keygen.txt
+                evppkey_ml_kem_768_encap.txt
+                evppkey_ml_kem_768_decap.txt
+                evppkey_ml_kem_1024_keygen.txt
+                evppkey_ml_kem_1024_encap.txt
+                evppkey_ml_kem_1024_decap.txt
+               ) unless $no_ml_kem;
 
 # A list of tests that only run with the default provider
 # (i.e. The algorithms are not present in the fips provider)
@@ -145,17 +156,6 @@ push @defltfiles, qw(
                      evppkey_ml_dsa_siggen.txt
                      evppkey_ml_dsa_sigver.txt
                     ) unless $no_ml_dsa;
-push @defltfiles, qw(
-                     evppkey_ml_kem_512_keygen.txt
-                     evppkey_ml_kem_512_encap.txt
-                     evppkey_ml_kem_512_decap.txt
-                     evppkey_ml_kem_768_keygen.txt
-                     evppkey_ml_kem_768_encap.txt
-                     evppkey_ml_kem_768_decap.txt
-                     evppkey_ml_kem_1024_keygen.txt
-                     evppkey_ml_kem_1024_encap.txt
-                     evppkey_ml_kem_1024_decap.txt
-                    ) unless $no_ml_kem;
 
 plan tests =>
     + (scalar(@configs) * scalar(@files))