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

Cope with new DSA2 file format where some p/q only tests are made.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-02-02 17:48:03 +00:00
parent 5f885f1ea4
commit ee9884654b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fips/dsa/fips_dssvs.c
View File

@ -212,7 +212,7 @@ static void pqgver()
int counter, counter2; int counter, counter2;
unsigned long h, h2; unsigned long h, h2;
DSA *dsa=NULL; DSA *dsa=NULL;
int dsa2, L, N; int dsa2, L, N, part_test = 0;
const EVP_MD *md = NULL; const EVP_MD *md = NULL;
int seedlen; int seedlen;
unsigned char seed[1024]; unsigned char seed[1024];
@ -221,6 +221,11 @@ static void pqgver()
{ {
if (!parse_line(&keyword, &value, lbuf, buf)) if (!parse_line(&keyword, &value, lbuf, buf))
{ {
if (p && q)
{
part_test = 1;
goto partial;
}
fputs(buf,stdout); fputs(buf,stdout);
continue; continue;
} }
@ -250,10 +255,12 @@ static void pqgver()
} }
else if(!strcmp(keyword,"c")) else if(!strcmp(keyword,"c"))
counter =atoi(buf+4); counter =atoi(buf+4);
else if(!strcmp(keyword,"H")) partial:
if(!strcmp(keyword,"H") || part_test)
{ {
h = atoi(value); if (!part_test)
if (!p || !q || !g) h = atoi(value);
if (!p || !q || (!g && !part_test))
{ {
fprintf(stderr, "Parse Error\n"); fprintf(stderr, "Parse Error\n");
exit (1); exit (1);
@ -273,8 +280,9 @@ static void pqgver()
fprintf(stderr, "Parameter Generation error\n"); fprintf(stderr, "Parameter Generation error\n");
exit(1); exit(1);
} }
if (BN_cmp(dsa->p, p) || BN_cmp(dsa->q, q) || BN_cmp(dsa->g, g) if (BN_cmp(dsa->p, p) || BN_cmp(dsa->q, q) ||
|| (counter != counter2) || (h != h2)) (!part_test &&
((BN_cmp(dsa->g, g) || (counter != counter2) || (h != h2)))))
printf("Result = F\n"); printf("Result = F\n");
else else
printf("Result = P\n"); printf("Result = P\n");
@ -286,6 +294,11 @@ static void pqgver()
g = NULL; g = NULL;
FIPS_dsa_free(dsa); FIPS_dsa_free(dsa);
dsa = NULL; dsa = NULL;
if (part_test)
{
fputs(buf,stdout);
part_test = 0;
}
} }
} }
} }