wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfSSL ABI

Browse Source 
Hide the RNG and ecc_key allocators from FIPS mode builds.
This commit is contained in:
John Safranek
2019-11-11 15:15:04 -08:00
parent 5a21cec030
commit 682cf6deac
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wolfcrypt/test/test.c
View File

@@ -8794,7 +8794,6 @@ exit:
static int random_rng_test(void) static int random_rng_test(void)
{ {
byte nonce[8] = { 0 };
WC_RNG localRng; WC_RNG localRng;
WC_RNG* rng; WC_RNG* rng;
int ret; int ret;
@@ -8815,13 +8814,18 @@ static int random_rng_test(void)
if (ret != 0) return ret; if (ret != 0) return ret;
/* Test dynamic RNG. */ #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
rng = wc_rng_new(nonce, (word32)sizeof(nonce), HEAP_HINT); {
if (rng == NULL) return -6310; byte nonce[8] = { 0 };
/* Test dynamic RNG. */
rng = wc_rng_new(nonce, (word32)sizeof(nonce), HEAP_HINT);
if (rng == NULL) return -6310;
ret = _rng_test(rng, -6310); ret = _rng_test(rng, -6310);
wc_rng_free(rng); wc_rng_free(rng);
}
#endif
return ret; return ret;
} }
@@ -18402,11 +18406,12 @@ exit:
} }
#endif /* WOLFSSL_CERT_GEN */ #endif /* WOLFSSL_CERT_GEN */
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
/* Test for the wc_ecc_key_new() and wc_ecc_key_free() functions. */ /* Test for the wc_ecc_key_new() and wc_ecc_key_free() functions. */
static int ecc_test_allocator(WC_RNG* rng) static int ecc_test_allocator(WC_RNG* rng)
{ {
int ret = 0;
ecc_key* key; ecc_key* key;
int ret;
key = wc_ecc_key_new(HEAP_HINT); key = wc_ecc_key_new(HEAP_HINT);
if (key == NULL) { if (key == NULL) {
@@ -18422,6 +18427,7 @@ exit:
wc_ecc_key_free(key); wc_ecc_key_free(key);
return ret; return ret;
} }
#endif
int ecc_test(void) int ecc_test(void)
{ {
@@ -18550,11 +18556,12 @@ int ecc_test(void)
goto done; goto done;
} }
#endif #endif
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
ret = ecc_test_allocator(&rng); ret = ecc_test_allocator(&rng);
if (ret != 0) { if (ret != 0) {
printf("ecc_test_allocator failed!: %d\n", ret); printf("ecc_test_allocator failed!: %d\n", ret);
} }
#endif
done: done:
wc_FreeRng(&rng); wc_FreeRng(&rng);