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

Check we recognise DRBG type in fips_drbgvs.c initialised DRBG_CTX if we

Browse Source 
don't set type in FIPS_drbg_new().
This commit is contained in:
Dr. Stephen Henson 2011-09-12 12:56:20 +00:00
parent 543dfa9f0e
commit 9e56c99e1a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fips/rand/fips_drbg_lib.c
View File

@ -115,8 +115,14 @@ DRBG_CTX *FIPS_drbg_new(int type, unsigned int flags)
FIPSerr(FIPS_F_FIPS_DRBG_NEW, ERR_R_MALLOC_FAILURE); FIPSerr(FIPS_F_FIPS_DRBG_NEW, ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }
if (type == 0) if (type == 0)
{
memset(dctx, 0, sizeof(DRBG_CTX));
dctx->type = 0;
dctx->status = DRBG_STATUS_UNINITIALISED;
return dctx; return dctx;
}
if (FIPS_drbg_init(dctx, type, flags) <= 0) if (FIPS_drbg_init(dctx, type, flags) <= 0)
{ {

5
fips/rand/fips_drbgvs.c
View File

@ -314,6 +314,11 @@ int main(int argc,char **argv)
if (!strcmp(keyword, "PersonalizationString")) if (!strcmp(keyword, "PersonalizationString"))
{ {
pers = hex2bin_m(value, &perslen); pers = hex2bin_m(value, &perslen);
if (nid == 0)
{
fprintf(stderr, "DRBG type not recognised!\n");
exit (1);
}
dctx = FIPS_drbg_new(nid, df | DRBG_FLAG_TEST); dctx = FIPS_drbg_new(nid, df | DRBG_FLAG_TEST);
if (!dctx) if (!dctx)
exit (1); exit (1);