Commit 4a35f52ad3 for openssl.org

commit 4a35f52ad31dac49dea226596ed0169d6fb85a1d
Author: Daniel Kubec <kubec@openssl.foundation>
Date:   Tue Aug 25 19:12:35 2026 +0200

    Fix CVE-2026-63072 test

    Fixes the build/test failure when OpenSSL is configured with
    no-x963kdf.

    Reviewed-by: Neil Horman <nhorman@openssl.org>
    Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
    Merge-date: Wed Aug 26 09:33:00 2026
    Merged-from: https://github.com/openssl/openssl/pull/32496

diff --git a/test/cmsapitest.c b/test/cmsapitest.c
index 5131b61b70..c91f777f1f 100644
--- a/test/cmsapitest.c
+++ b/test/cmsapitest.c
@@ -855,7 +855,7 @@ end:
     return ret;
 }

-#ifndef OPENSSL_NO_EC
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_X963KDF)
 /*
  * Regression test for CVE-2026-63072: an 8-byte out-of-bounds heap write
  * reachable through CMS_decrypt() when a KeyAgreeRecipientInfo names an
@@ -1013,7 +1013,8 @@ int setup_tests(void)
         ADD_TEST(test_CMS_add1_signer_ed448_signed_attrs_md);
         ADD_TEST(test_CMS_add1_signer_ed448_noattr);
     }
-#ifndef OPENSSL_NO_EC
+
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_X963KDF)
     ADD_TEST(test_kari_wrap_pad_unwrap_overflow);
 #endif
     return 1;