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

update DRBG to handle new file format

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-10-19 20:53:35 +00:00
parent 986b927fb3
commit 3b4f1f302d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fips/rand/fips_drbgvs.c
View File

@ -182,7 +182,7 @@ int main(int argc,char **argv)
int r, nid = 0; int r, nid = 0;
int pr = 0; int pr = 0;
char buf[2048], lbuf[2048]; char buf[2048], lbuf[2048];
unsigned char randout[2048]; unsigned char *randout = NULL;
char *keyword = NULL, *value = NULL; char *keyword = NULL, *value = NULL;
unsigned char *ent = NULL, *nonce = NULL, *pers = NULL, *adin = NULL; unsigned char *ent = NULL, *nonce = NULL, *pers = NULL, *adin = NULL;
@ -298,6 +298,8 @@ int main(int argc,char **argv)
else else
exit(1); exit(1);
} }
if (!strcmp(keyword, "[ReturnedBitsLen"))
randoutlen = atoi(value) / 8;
if (!strcmp(keyword, "EntropyInput")) if (!strcmp(keyword, "EntropyInput"))
{ {
@ -327,7 +329,11 @@ int main(int argc,char **argv)
FIPS_drbg_set_callbacks(dctx, test_entropy, 0, 0, FIPS_drbg_set_callbacks(dctx, test_entropy, 0, 0,
test_nonce, 0); test_nonce, 0);
FIPS_drbg_set_app_data(dctx, &t); FIPS_drbg_set_app_data(dctx, &t);
randoutlen = (int)FIPS_drbg_get_blocklength(dctx); if (randoutlen == 0)
randoutlen = (int)FIPS_drbg_get_blocklength(dctx);
if (randout)
OPENSSL_free(randout);
randout = OPENSSL_malloc(randoutlen);
r = FIPS_drbg_instantiate(dctx, pers, perslen); r = FIPS_drbg_instantiate(dctx, pers, perslen);
if (!r) if (!r)
{ {
@ -406,6 +412,8 @@ int main(int argc,char **argv)
} }
} }
if (randout)
OPENSSL_free(randout);
if (in && in != stdin) if (in && in != stdin)
fclose(in); fclose(in);
if (out && out != stdout) if (out && out != stdout)