generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check for unset entropy and nonce callbacks

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-11-06 13:08:54 +00:00
parent 8a794abd9d
commit 79f2c9d1cd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fips/rand/fips_drbg_lib.c
View File

@ -154,6 +154,8 @@ static size_t fips_get_entropy(DRBG_CTX *dctx, unsigned char **pout,
{ {
unsigned char *tout, *p; unsigned char *tout, *p;
size_t bl = dctx->entropy_blocklen, rv; size_t bl = dctx->entropy_blocklen, rv;
if (!dctx->get_entropy)
return 0;
if (dctx->xflags & DRBG_FLAG_TEST || !bl) if (dctx->xflags & DRBG_FLAG_TEST || !bl)
return dctx->get_entropy(dctx, pout, entropy, min_len, max_len); return dctx->get_entropy(dctx, pout, entropy, min_len, max_len);
rv = dctx->get_entropy(dctx, &tout, entropy + bl, rv = dctx->get_entropy(dctx, &tout, entropy + bl,
@ -241,7 +243,7 @@ int FIPS_drbg_instantiate(DRBG_CTX *dctx,
goto end; goto end;
} }
if (dctx->max_nonce > 0) if (dctx->max_nonce > 0 && dctx->get_nonce)
{ {
noncelen = dctx->get_nonce(dctx, &nonce, noncelen = dctx->get_nonce(dctx, &nonce,
dctx->strength / 2, dctx->strength / 2,