Skip to content

random: add wc_InitRngFixedSeed() for FIPS known-answer tests #11452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaleb-himes wants to merge 1 commit into
base: master
Choose a base branch
from
+55 −5
Open

random: add wc_InitRngFixedSeed() for FIPS known-answer tests #11452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 48 additions & 5 deletions wolfcrypt/src/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,6 +1904,7 @@ int wc_Sha512Drbg_IsDisabled(void)


static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
const byte* fixedSeed, word32 fixedSeedSz,
void* heap, int devId)
{
int ret = 0;
Expand All @@ -1921,6 +1922,8 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,

(void)nonce;
(void)nonceSz;
(void)fixedSeed;
(void)fixedSeedSz;

if (rng == NULL)
return BAD_FUNC_ARG;
Expand Down Expand Up @@ -2189,6 +2192,14 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
#endif
}
else {
#if FIPS_VERSION3_GE(7,0,0)
/* Fixed seed from wc_InitRngFixedSeed(), which checks its size. */
if (fixedSeed != NULL) {
XMEMCPY(seed, fixedSeed, fixedSeedSz);
seedSz = fixedSeedSz;
}
else
#endif /* FIPS_VERSION3_GE(7,0,0) */
#ifdef WC_RNG_SEED_CB
if (seedCb == NULL) {
ret = DRBG_NO_SEED_CB;
Expand Down Expand Up @@ -2384,7 +2395,7 @@ int wc_rng_new_ex(WC_RNG **rng, byte* nonce, word32 nonceSz,
return MEMORY_E;
}

ret = _InitRng(*rng, nonce, nonceSz, heap, devId);
ret = _InitRng(*rng, nonce, nonceSz, NULL, 0, heap, devId);
if (ret != 0) {
XFREE(*rng, heap, DYNAMIC_TYPE_RNG);
*rng = NULL;
Expand All @@ -2407,29 +2418,61 @@ void wc_rng_free(WC_RNG* rng)
}
}

#if FIPS_VERSION3_GE(7,0,0) && defined(HAVE_HASHDRBG)
/* Start a WC_RNG from a fixed seed so a known answer test gets the same answer
* every time. Library internal; the FIPS self tests are the only caller. */
int wc_InitRngFixedSeed(WC_RNG* rng, const byte* seed, word32 seedSz)
{
int ret;

/* The first SEED_BLOCK_SZ bytes are the seed test block, not DRBG input. */
if ((rng == NULL) || (seed == NULL) || (seedSz <= SEED_BLOCK_SZ) ||
(seedSz > MAX_SEED_SZ)) {
return BAD_FUNC_ARG;
}

ret = _InitRng(rng, NULL, 0, seed, seedSz, NULL, INVALID_DEVID);
if (ret != 0)
return ret;

/* Some builds, RDRAND for one, return 0 with no DRBG and would then
* generate without the seed. */
#ifndef NO_SHA256
if ((rng->drbgType == WC_DRBG_SHA256) && (rng->drbg != NULL))
return 0;
#endif
#ifdef WOLFSSL_DRBG_SHA512
if ((rng->drbgType == WC_DRBG_SHA512) && (rng->drbg512 != NULL))
return 0;
#endif
(void)wc_FreeRng(rng);
return BAD_STATE_E;
}
#endif /* FIPS_VERSION3_GE(7,0,0) && HAVE_HASHDRBG */

WOLFSSL_ABI
int wc_InitRng(WC_RNG* rng)
{
return _InitRng(rng, NULL, 0, NULL, INVALID_DEVID);
return _InitRng(rng, NULL, 0, NULL, 0, NULL, INVALID_DEVID);
}


int wc_InitRng_ex(WC_RNG* rng, void* heap, int devId)
{
return _InitRng(rng, NULL, 0, heap, devId);
return _InitRng(rng, NULL, 0, NULL, 0, heap, devId);
}


int wc_InitRngNonce(WC_RNG* rng, byte* nonce, word32 nonceSz)
{
return _InitRng(rng, nonce, nonceSz, NULL, INVALID_DEVID);
return _InitRng(rng, nonce, nonceSz, NULL, 0, NULL, INVALID_DEVID);
}


int wc_InitRngNonce_ex(WC_RNG* rng, byte* nonce, word32 nonceSz,
void* heap, int devId)
{
return _InitRng(rng, nonce, nonceSz, heap, devId);
return _InitRng(rng, nonce, nonceSz, NULL, 0, heap, devId);
}

#if defined(HAVE_HASHDRBG) && !defined(CUSTOM_RAND_GENERATE_BLOCK)
Expand Down
7 changes: 7 additions & 0 deletions wolfssl/wolfcrypt/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,13 @@ WOLFSSL_ABI WOLFSSL_API void wc_rng_free(WC_RNG* rng);
#ifndef WC_NO_RNG
WOLFSSL_ABI WOLFSSL_API int wc_InitRng(WC_RNG* rng);
WOLFSSL_API int wc_InitRng_ex(WC_RNG* rng, void* heap, int devId);
#if FIPS_VERSION3_GE(7,0,0) && defined(HAVE_HASHDRBG) && \
defined(BUILDING_WOLFSSL)
/* Fixed seed start for the module's own known answer tests. seedSz must be
* over SEED_BLOCK_SZ and no more than WC_DRBG_MAX_SEED_SZ. */
WOLFSSL_LOCAL int wc_InitRngFixedSeed(WC_RNG* rng, const byte* seed,
word32 seedSz);
#endif
WOLFSSL_API int wc_InitRngNonce(WC_RNG* rng, byte* nonce, word32 nonceSz);
WOLFSSL_API int wc_InitRngNonce_ex(WC_RNG* rng, byte* nonce, word32 nonceSz,
void* heap, int devId);
Expand Down
Loading