wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for uninitialised DRBG_CTX and don't free up default DRBG_CTX.

Browse source
This commit is contained in:
Dr. Stephen Henson 2011-10-21 00:12:53 +00:00
parent 3b5930442d
commit af4bfa151c
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fips/rand/fips_drbg_lib.c
View file

@ -135,8 +135,18 @@ void FIPS_drbg_free(DRBG_CTX *dctx)
{
if (dctx->uninstantiate)
dctx->uninstantiate(dctx);
OPENSSL_cleanse(&dctx->d, sizeof(dctx->d));
OPENSSL_free(dctx);
/* Don't free up default DRBG */
if (dctx == FIPS_get_default_drbg())
{
memset(dctx, 0, sizeof(DRBG_CTX));
dctx->type = 0;
dctx->status = DRBG_STATUS_UNINITIALISED;
}
else
{
OPENSSL_cleanse(&dctx->d, sizeof(dctx->d));
OPENSSL_free(dctx);
}
}
static size_t fips_get_entropy(DRBG_CTX *dctx, unsigned char **pout,
@ -194,6 +204,7 @@ int FIPS_drbg_instantiate(DRBG_CTX *dctx,
FIPSerr(FIPS_F_FIPS_DRBG_INSTANTIATE, FIPS_R_ERROR_RETRIEVING_ENTROPY);
FIPSerr(FIPS_F_FIPS_DRBG_INSTANTIATE, FIPS_R_ERROR_RETRIEVING_NONCE);
FIPSerr(FIPS_F_FIPS_DRBG_INSTANTIATE, FIPS_R_INSTANTIATE_ERROR);
FIPSerr(FIPS_F_FIPS_DRBG_INSTANTIATE, FIPS_R_DRBG_NOT_INITIALISED);
#endif
int r = 0;
@ -204,6 +215,12 @@ int FIPS_drbg_instantiate(DRBG_CTX *dctx,
goto end;
}
if (!dctx->instantiate)
{
r = FIPS_R_DRBG_NOT_INITIALISED;
goto end;
}
if (dctx->status != DRBG_STATUS_UNINITIALISED)
{
if (dctx->status == DRBG_STATUS_ERROR)