Skip to content

Commit 07353cc

Browse files
committed
Ed25519 tests: Fix to pass regression testing
1 parent c1ee61c commit 07353cc

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ HSM_KEY_TYPE_HMAC_512
334334
HSM_OP_KEY_GENERATION_FLAGS_CREATE
335335
HSM_OP_KEY_GENERATION_FLAGS_UPDATE
336336
HSM_SVC_KEY_STORE_FLAGS_UPDATE
337-
HWCAP_ASIMDRDM
338337
HWCAP2_SME
338+
HWCAP_ASIMDRDM
339339
HWCAP_SVE
340340
IDIRECT_DEV_RANDOM
341341
IDIRECT_DEV_TIME
@@ -939,6 +939,7 @@ WOLFSSL_NRF51_AES
939939
WOLFSSL_NXP_CASPER_ECC_MUL2ADD
940940
WOLFSSL_NXP_CASPER_ECC_MULMOD
941941
WOLFSSL_NXP_LPC55S6X
942+
WOLFSSL_OCSP_SCREEN_RESPONDER
942943
WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
943944
WOLFSSL_OLD_SET_CURVES_LIST
944945
WOLFSSL_OLD_TIMINGPADVERIFY

tests/api/test_ed25519.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ int test_wc_Ed25519PublicKeyToDer(void)
554554
{
555555
EXPECT_DECLS;
556556
#if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
557+
defined(HAVE_ED25519_MAKE_KEY) && \
557558
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
558559
ed25519_key key;
559560
byte derBuf[1024];
@@ -611,6 +612,7 @@ int test_wc_Ed25519KeyToDer(void)
611612
{
612613
EXPECT_DECLS;
613614
#if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
615+
defined(HAVE_ED25519_MAKE_KEY) && \
614616
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
615617
byte output[ONEK_BUF];
616618
ed25519_key ed25519Key;
@@ -651,6 +653,7 @@ int test_wc_Ed25519PrivateKeyToDer(void)
651653
{
652654
EXPECT_DECLS;
653655
#if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
656+
defined(HAVE_ED25519_MAKE_KEY) && \
654657
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN))
655658
byte output[ONEK_BUF];
656659
ed25519_key ed25519PrivKey;
@@ -690,7 +693,8 @@ int test_wc_Ed25519KeyToDer_oneasymkey_version(void)
690693
{
691694
EXPECT_DECLS;
692695
#if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_EXPORT) && \
693-
defined(HAVE_ED25519_KEY_IMPORT) && defined(WOLFSSL_KEY_GEN)
696+
defined(HAVE_ED25519_KEY_IMPORT) && defined(HAVE_ED25519_MAKE_KEY) && \
697+
defined(WOLFSSL_KEY_GEN)
694698
ed25519_key key;
695699
ed25519_key key2;
696700
WC_RNG rng;
@@ -1300,7 +1304,7 @@ int test_wc_ed25519_import_variants(void)
13001304
wc_ed25519_free(&privKey);
13011305
}
13021306

1303-
#ifdef HAVE_ED25519_KEY_EXPORT
1307+
#if defined(HAVE_ED25519_KEY_EXPORT) && defined(HAVE_ED25519_MAKE_KEY)
13041308
/* wc_ed25519_import_private_key_ex: pub==NULL branch. */
13051309
{
13061310
WC_RNG rng;

0 commit comments

Comments
 (0)