From 07353cc6e8a4cebe3b9baaaaeb2e9ae8d9a8ac36 Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sean@wolfssl.com>
Date: Mon, 20 Jul 2026 10:46:55 +1000
Subject: [PATCH] Ed25519 tests: Fix to pass regression testing

---
 .wolfssl_known_macro_extras | 3 ++-
 tests/api/test_ed25519.c    | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 3f60ca60f04..b506fe1987e 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -334,8 +334,8 @@ HSM_KEY_TYPE_HMAC_512
 HSM_OP_KEY_GENERATION_FLAGS_CREATE
 HSM_OP_KEY_GENERATION_FLAGS_UPDATE
 HSM_SVC_KEY_STORE_FLAGS_UPDATE
-HWCAP_ASIMDRDM
 HWCAP2_SME
+HWCAP_ASIMDRDM
 HWCAP_SVE
 IDIRECT_DEV_RANDOM
 IDIRECT_DEV_TIME
@@ -939,6 +939,7 @@ WOLFSSL_NRF51_AES
 WOLFSSL_NXP_CASPER_ECC_MUL2ADD
 WOLFSSL_NXP_CASPER_ECC_MULMOD
 WOLFSSL_NXP_LPC55S6X
+WOLFSSL_OCSP_SCREEN_RESPONDER
 WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
 WOLFSSL_OLD_SET_CURVES_LIST
 WOLFSSL_OLD_TIMINGPADVERIFY
diff --git a/tests/api/test_ed25519.c b/tests/api/test_ed25519.c
index d9ff72b18e5..843b1177ae2 100644
--- a/tests/api/test_ed25519.c
+++ b/tests/api/test_ed25519.c
@@ -554,6 +554,7 @@ int test_wc_Ed25519PublicKeyToDer(void)
 {
     EXPECT_DECLS;
 #if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
+    defined(HAVE_ED25519_MAKE_KEY) && \
     (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
     ed25519_key key;
     byte        derBuf[1024];
@@ -611,6 +612,7 @@ int test_wc_Ed25519KeyToDer(void)
 {
     EXPECT_DECLS;
 #if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
+    defined(HAVE_ED25519_MAKE_KEY) && \
     (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
     byte        output[ONEK_BUF];
     ed25519_key ed25519Key;
@@ -651,6 +653,7 @@ int test_wc_Ed25519PrivateKeyToDer(void)
 {
     EXPECT_DECLS;
 #if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
+    defined(HAVE_ED25519_MAKE_KEY) && \
     (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
     byte        output[ONEK_BUF];
     ed25519_key ed25519PrivKey;
@@ -690,7 +693,8 @@ int test_wc_Ed25519KeyToDer_oneasymkey_version(void)
 {
     EXPECT_DECLS;
 #if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
-    defined(HAVE_ED25519_KEY_IMPORT) && defined(WOLFSSL_KEY_GEN)
+    defined(HAVE_ED25519_KEY_IMPORT) && defined(HAVE_ED25519_MAKE_KEY) && \
+    defined(WOLFSSL_KEY_GEN)
     ed25519_key key;
     ed25519_key key2;
     WC_RNG rng;
@@ -1300,7 +1304,7 @@ int test_wc_ed25519_import_variants(void)
         wc_ed25519_free(&privKey);
     }
 
-#ifdef HAVE_ED25519_KEY_EXPORT
+#if defined(HAVE_ED25519_KEY_EXPORT) && defined(HAVE_ED25519_MAKE_KEY)
     /* wc_ed25519_import_private_key_ex: pub==NULL branch. */
     {
         WC_RNG      rng;