Commit e1386ecb2d for openssl.org

commit e1386ecb2dc1c0e1ca80069c0c9b6af9f6bffab4
Author: Jakub Zelenka <jakub.zelenka@openssl.foundation>
Date:   Mon Jun 29 22:46:22 2026 +0200

    test: drop no-cached-fetch mfail guards

    Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
    Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
    MergeDate: Mon Jul 13 09:43:51 2026
    (Merged from https://github.com/openssl/openssl/pull/31780)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 7c8059350a..c767114f39 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -9050,12 +9050,7 @@ int setup_tests(void)
     ADD_TEST(test_EVP_SM2_verify);
 #endif
     ADD_ALL_TESTS(test_set_get_raw_keys, OSSL_NELEM(keys));
-#if defined(_MSC_VER) || defined(OPENSSL_NO_CACHED_FETCH)
-    ADD_MFAIL_ALL_NO_CHECK_TESTS(test_set_get_raw_keys_mfail,
-        OSSL_NELEM(keys));
-#else
     ADD_MFAIL_ALL_TESTS(test_set_get_raw_keys_mfail, OSSL_NELEM(keys));
-#endif
     ADD_ALL_TESTS(test_EVP_PKEY_check, OSSL_NELEM(keycheckdata));
 #ifndef OPENSSL_NO_CMAC
     ADD_TEST(test_CMAC_keygen);
diff --git a/test/quic_srt_gen_test.c b/test/quic_srt_gen_test.c
index d4a8f66896..cfcee4a953 100644
--- a/test/quic_srt_gen_test.c
+++ b/test/quic_srt_gen_test.c
@@ -90,10 +90,6 @@ static int test_srt_gen_new_mfail(int idx)
 int setup_tests(void)
 {
     ADD_ALL_TESTS(test_srt_gen, OSSL_NELEM(tests));
-#ifdef OPENSSL_NO_CACHED_FETCH
-    ADD_MFAIL_ALL_NO_CHECK_TESTS(test_srt_gen_new_mfail, OSSL_NELEM(tests));
-#else
     ADD_MFAIL_ALL_TESTS(test_srt_gen_new_mfail, OSSL_NELEM(tests));
-#endif
     return 1;
 }
diff --git a/test/quic_srtm_test.c b/test/quic_srtm_test.c
index db29198918..6a1d6f3618 100644
--- a/test/quic_srtm_test.c
+++ b/test/quic_srtm_test.c
@@ -119,11 +119,7 @@ err:
 int setup_tests(void)
 {
     ADD_TEST(test_srtm);
-#ifdef OPENSSL_NO_CACHED_FETCH
-    ADD_MFAIL_NO_CHECK_TEST(test_srtm_new_mfail);
-#else
     ADD_MFAIL_TEST(test_srtm_new_mfail);
-#endif
     ADD_MFAIL_TEST(test_srtm_ops_mfail);
     return 1;
 }
diff --git a/test/quicapitest.c b/test/quicapitest.c
index dd574b56fc..a8de8f9670 100644
--- a/test/quicapitest.c
+++ b/test/quicapitest.c
@@ -218,7 +218,6 @@ end:
     return ret;
 }

-#ifndef OPENSSL_NO_CACHED_FETCH
 static int test_ssl_read_key_update_mfail(void)
 {
     SSL_CTX *cctx = NULL, *sctx = NULL;
@@ -302,7 +301,6 @@ err:

     return ret;
 }
-#endif

 /*
  * Test that sending FIN with no data to a client blocking in SSL_read_ex() will
@@ -3520,7 +3518,6 @@ static int test_quic_peer_addr_v6(void)
 }
 #endif

-#ifndef OPENSSL_NO_CACHED_FETCH
 /*
  * Advance the fake clock to the next QUIC timer event when both endpoints are
  * idle, consuming no real time.
@@ -3660,7 +3657,6 @@ err:

     return ret;
 }
-#endif

 /* Test ECH with quic */
 static int test_ech(void)
@@ -3913,9 +3909,7 @@ int setup_tests(void)
         goto err;

     ADD_ALL_TESTS(test_quic_write_read, 3);
-#ifndef OPENSSL_NO_CACHED_FETCH
     ADD_MFAIL_NO_CHECK_TEST(test_ssl_read_key_update_mfail);
-#endif
     ADD_TEST(test_fin_only_blocking);
     ADD_TEST(test_ciphersuites);
     ADD_TEST(test_cipher_find);
@@ -3957,16 +3951,10 @@ int setup_tests(void)
     ADD_TEST(test_quic_peer_addr_v6);
 #endif
     ADD_TEST(test_quic_peer_addr_v4);
-#ifndef OPENSSL_NO_CACHED_FETCH
     ADD_MFAIL_NO_CHECK_TEST(test_quic_handshake_multipkt_mfail);
-#endif
     ADD_TEST(test_ech);
     ADD_TEST(test_quic_resize_txe);
-#ifdef OPENSSL_NO_CACHED_FETCH
-    ADD_MFAIL_NO_CHECK_TEST(test_ssl_new_mfail);
-#else
     ADD_MFAIL_TEST(test_ssl_new_mfail);
-#endif

     return 1;
 err:
diff --git a/test/rsa_test.c b/test/rsa_test.c
index 2150a3cb6d..de2966b2a2 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -757,13 +757,8 @@ int setup_tests(void)
 {
     ADD_ALL_TESTS(test_rsa_pkcs1, 3);
     ADD_ALL_TESTS(test_rsa_oaep, 3);
-#if defined(_MSC_VER) || defined(OPENSSL_NO_CACHED_FETCH)
-    ADD_MFAIL_ALL_NO_CHECK_TESTS(test_rsa_pkcs1_mfail, 3);
-    ADD_MFAIL_ALL_NO_CHECK_TESTS(test_rsa_oaep_mfail, 3);
-#else
     ADD_MFAIL_ALL_TESTS(test_rsa_pkcs1_mfail, 3);
     ADD_MFAIL_ALL_TESTS(test_rsa_oaep_mfail, 3);
-#endif
     ADD_ALL_TESTS(test_rsa_security_bit, OSSL_NELEM(rsa_security_bits_cases));
     ADD_TEST(test_rsa_saos);
     ADD_TEST(test_EVP_rsa_legacy_key);
diff --git a/test/statem_clnt_construct_test.c b/test/statem_clnt_construct_test.c
index 459c8ac6d4..459c7ffe3e 100644
--- a/test/statem_clnt_construct_test.c
+++ b/test/statem_clnt_construct_test.c
@@ -558,7 +558,7 @@ err:
 }
 #endif

-#if !defined(OSSL_NO_USABLE_TLS1_3) && !defined(OPENSSL_NO_CACHED_FETCH)
+#ifndef OSSL_NO_USABLE_TLS1_3
 static int mfail_construct_ch_tls13(void)
 {
     CH_CONFIG cfg = { 0, TLS1_3_VERSION, TLS1_3_VERSION, 0 };
@@ -670,14 +670,12 @@ static int test_construct_ch_ech_tls12(void)
 }
 #endif /* OPENSSL_NO_TLS1_2 */

-#ifndef OPENSSL_NO_CACHED_FETCH
 static int mfail_construct_ch_ech(void)
 {
     CH_CONFIG cfg = { 0, TLS1_3_VERSION, TLS1_3_VERSION, 0 };

     return mfail_construct_ch_common(&cfg, prep_ech);
 }
-#endif /* OPENSSL_NO_CACHED_FETCH */
 #endif /* OSSL_NO_USABLE_ECH */

 int setup_tests(void)
@@ -695,7 +693,6 @@ int setup_tests(void)
     ADD_TEST(test_construct_ch_tls13);
     ADD_TEST(test_construct_ch_tls13_no_middlebox);
     ADD_TEST(test_construct_ch_hrr);
-#ifndef OPENSSL_NO_CACHED_FETCH
     /*
      * The non-cached mfail run takes too long and does not test too much extra
      * so better to skip it.
@@ -712,7 +709,6 @@ int setup_tests(void)
 #else
     ADD_MFAIL_TEST(mfail_construct_ch_tls13);
 #endif /* OPENSSL_NO_ECX */
-#endif /* OPENSSL_NO_CACHED_FETCH */
 #endif /* OSSL_NO_USABLE_TLS1_3 */

 #if !defined(OPENSSL_NO_DTLS) && !defined(OPENSSL_NO_DTLS1_2)
@@ -726,9 +722,7 @@ int setup_tests(void)
 #ifndef OPENSSL_NO_TLS1_2
     ADD_TEST(test_construct_ch_ech_tls12);
 #endif
-#ifndef OPENSSL_NO_CACHED_FETCH
     ADD_MFAIL_TEST(mfail_construct_ch_ech);
-#endif /* OPENSSL_NO_CACHED_FETCH */
 #endif /* OSSL_NO_USABLE_ECH */
     return 1;
 }