return NID_undef;
}
+static int parse_ec(char *str)
+ {
+ int curve_nid, md_nid;
+ char *md;
+ md = strchr(str, ' ');
+ if (!md)
+ return NID_undef;
+ if (!strncmp(str, "[P-256", 6))
+ curve_nid = NID_X9_62_prime256v1;
+ else if (!strncmp(str, "[P-384", 6))
+ curve_nid = NID_secp384r1;
+ else if (!strncmp(str, "[P-521", 6))
+ curve_nid = NID_secp521r1;
+ else
+ return NID_undef;
+ md_nid = parse_md(md);
+ if (md_nid == NID_undef)
+ return NID_undef;
+ return (curve_nid << 16) | md_nid;
+ }
+
static int parse_aes(char *str, int *pdf)
{
return NID_undef;
}
-
- return NID_undef;
}
typedef struct
long entlen, noncelen, perslen, adinlen;
int df = 0;
+ enum dtype { DRBG_NONE, DRBG_CTR, DRBG_HASH, DRBG_HMAC, DRBG_DUAL_EC }
+ drbg_type = DRBG_NONE;
+
int randoutlen = 0;
int gen = 0;
while (fgets(buf, sizeof(buf), in) != NULL)
{
fputs(buf, out);
+ if (drbg_type == DRBG_NONE)
+ {
+ if (strstr(buf, "CTR_DRBG"))
+ drbg_type = DRBG_CTR;
+ else if (strstr(buf, "Hash_DRBG"))
+ drbg_type = DRBG_HASH;
+ else if (strstr(buf, "HMAC_DRBG"))
+ drbg_type = DRBG_HMAC;
+ else if (strstr(buf, "Dual_EC_DRBG"))
+ drbg_type = DRBG_DUAL_EC;
+ else
+ continue;
+ }
if (strlen(buf) > 4 && !strncmp(buf, "[SHA-", 5))
{
nid = parse_md(buf);
if (nid == NID_undef)
exit(1);
+ if (drbg_type == DRBG_HMAC)
+ {
+ switch (nid)
+ {
+ case NID_sha1:
+ nid = NID_hmacWithSHA1;
+ break;
+
+ case NID_sha224:
+ nid = NID_hmacWithSHA224;
+ break;
+
+ case NID_sha256:
+ nid = NID_hmacWithSHA256;
+ break;
+
+ case NID_sha384:
+ nid = NID_hmacWithSHA384;
+ break;
+
+ case NID_sha512:
+ nid = NID_hmacWithSHA512;
+ break;
+
+ default:
+ exit(1);
+ }
+ }
}
if (strlen(buf) > 12 && !strncmp(buf, "[AES-", 5))
{
if (nid == NID_undef)
exit(1);
}
+ if (strlen(buf) > 12 && !strncmp(buf, "[P-", 3))
+ {
+ nid = parse_ec(buf);
+ if (nid == NID_undef)
+ exit(1);
+ }
if (!parse_line(&keyword, &value, lbuf, buf))
continue;
if (!strcmp(keyword, "PersonalizationString"))
{
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);
if (!dctx)
exit (1);
- FIPS_drbg_set_callbacks(dctx, test_entropy, 0,
+ FIPS_drbg_set_callbacks(dctx, test_entropy, 0, 0,
test_nonce, 0);
FIPS_drbg_set_app_data(dctx, &t);
randoutlen = (int)FIPS_drbg_get_blocklength(dctx);
adin = hex2bin_m(value, &adinlen);
if (pr)
continue;
- r = FIPS_drbg_generate(dctx, randout, randoutlen, 0, 0,
+ r = FIPS_drbg_generate(dctx, randout, randoutlen, 0,
adin, adinlen);
if (!r)
{
t.entlen = entlen;
r = FIPS_drbg_generate(dctx,
randout, randoutlen,
- 0, 1, adin, adinlen);
+ 1, adin, adinlen);
if (!r)
{
fprintf(stderr,