Commit 5b2abf8f9c for openssl.org

commit 5b2abf8f9c4083478e7e1ae6832d9ddfbdaf98b2
Author: Tomas Mraz <tomas@openssl.foundation>
Date:   Wed May 13 10:39:14 2026 +0200

    test/ffc_internal_test.c: The ffc_params_copy_mfail test needs DSA enabled

    Instead of having disabled with no-dh, we need to disable it
    with no-dsa.

    Fixes: df53ee4fa00b "Add mfail test for ossl_ffc_params_copy"

    Reviewed-by: Matt Caswell <matt@openssl.foundation>
    Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
    Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
    MergeDate: Wed May 13 09:46:34 2026
    (Merged from https://github.com/openssl/openssl/pull/31168)

diff --git a/test/ffc_internal_test.c b/test/ffc_internal_test.c
index 499a889978..d08f3b244d 100644
--- a/test/ffc_internal_test.c
+++ b/test/ffc_internal_test.c
@@ -690,7 +690,9 @@ err:
     DH_free(dh);
     return ret;
 }
+#endif /* OPENSSSL_NO_DH */

+#ifndef OPENSSL_NO_DSA
 static int ffc_params_copy_mfail(void)
 {
     int ret = 0;
@@ -731,13 +733,14 @@ err:
     BN_free(g);
     return ret;
 }
-#endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DSA */

 int setup_tests(void)
 {
 #ifndef OPENSSL_NO_DSA
     ADD_TEST(ffc_params_validate_pq_test);
     ADD_TEST(ffc_params_validate_g_unverified_test);
+    ADD_MFAIL_TEST(ffc_params_copy_mfail);
 #endif /* OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DH
     ADD_TEST(ffc_params_gen_test);
@@ -747,7 +750,6 @@ int setup_tests(void)
     ADD_TEST(ffc_private_validate_test);
     ADD_ALL_TESTS(ffc_private_gen_test, 10);
     ADD_TEST(ffc_params_copy_test);
-    ADD_MFAIL_TEST(ffc_params_copy_mfail);
 #endif /* OPENSSL_NO_DH */
     return 1;
 }