wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ecc_def_curve_test test changes.

Browse Source
This commit is contained in:
David Garske
2021-11-03 15:10:29 -07:00
parent b84edb5c67
commit d8faa22194
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wolfcrypt/test/test.c
View File

@ -22692,9 +22692,7 @@ static int ecc_sig_test(WC_RNG* rng, ecc_key* key)
} }
#endif #endif
#if defined(HAVE_ECC_KEY_IMPORT) && defined(HAVE_ECC_KEY_EXPORT) && \ #if defined(HAVE_ECC_KEY_IMPORT) && defined(HAVE_ECC_KEY_EXPORT)
!defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
!defined(WOLFSSL_QNX_CAAM)
static int ecc_exp_imp_test(ecc_key* key) static int ecc_exp_imp_test(ecc_key* key)
{ {
@ -22824,8 +22822,6 @@ done:
} }
#endif /* HAVE_ECC_KEY_IMPORT && HAVE_ECC_KEY_EXPORT */ #endif /* HAVE_ECC_KEY_IMPORT && HAVE_ECC_KEY_EXPORT */
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
!defined(WOLFSSL_CRYPTOCELL) && !defined(WOLFSSL_QNX_CAAM)
#if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT) #if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT)
static int ecc_mulmod_test(ecc_key* key1) static int ecc_mulmod_test(ecc_key* key1)
{ {
@ -22937,7 +22933,6 @@ static int ecc_ssh_test(ecc_key* key, WC_RNG* rng)
return 0; return 0;
} }
#endif /* HAVE_ECC_DHE && !WC_NO_RNG */ #endif /* HAVE_ECC_DHE && !WC_NO_RNG */
#endif
static int ecc_def_curve_test(WC_RNG *rng) static int ecc_def_curve_test(WC_RNG *rng)
{ {
@ -22991,11 +22986,14 @@ static int ecc_def_curve_test(WC_RNG *rng)
if (ret < 0) if (ret < 0)
goto done; goto done;
#endif #endif
wc_ecc_free(key);
#else #else
(void)rng; (void)rng;
#endif /* !WC_NO_RNG */ #endif /* !WC_NO_RNG */
#if defined(HAVE_ECC_KEY_IMPORT) && defined(HAVE_ECC_KEY_EXPORT) #if (defined(HAVE_ECC_KEY_IMPORT) && defined(HAVE_ECC_KEY_EXPORT)) || \
(defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT))
/* Use test ECC key - ensure real private "d" exists */ /* Use test ECC key - ensure real private "d" exists */
#ifdef USE_CERT_BUFFERS_256 #ifdef USE_CERT_BUFFERS_256
ret = wc_EccPrivateKeyDecode(ecc_key_der_256, &idx, key, ret = wc_EccPrivateKeyDecode(ecc_key_der_256, &idx, key,
@ -23017,24 +23015,27 @@ static int ecc_def_curve_test(WC_RNG *rng)
goto done; goto done;
} }
#if defined(HAVE_ECC_KEY_IMPORT) && defined(HAVE_ECC_KEY_EXPORT)
ret = ecc_exp_imp_test(key); ret = ecc_exp_imp_test(key);
if (ret < 0) if (ret < 0)
goto done; goto done;
#endif
#if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT)
ret = ecc_mulmod_test(key); ret = ecc_mulmod_test(key);
if (ret < 0) if (ret < 0)
goto done; goto done;
#endif #endif
#endif
done: done:
wc_ecc_free(key);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (key != NULL) { if (key != NULL) {
wc_ecc_free(key);
XFREE(key, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(key, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
} }
#else
wc_ecc_free(key);
#endif #endif
return ret; return ret;
} }
#endif /* !NO_ECC256 || HAVE_ALL_CURVES */ #endif /* !NO_ECC256 || HAVE_ALL_CURVES */