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

Support more DSA2 tests.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-02-01 17:54:23 +00:00
parent 2ecc150530
commit 89f63d06f8
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
fips/dsa/fips_dssvs.c
View File

@ -137,7 +137,8 @@ static void pqg()
char buf[1024]; char buf[1024];
char lbuf[1024]; char lbuf[1024];
char *keyword, *value; char *keyword, *value;
int nmod=0; int dsa2, L, N;
const EVP_MD *md = NULL;
while(fgets(buf,sizeof buf,stdin) != NULL) while(fgets(buf,sizeof buf,stdin) != NULL)
{ {
@ -148,14 +149,17 @@ static void pqg()
} }
if(!strcmp(keyword,"[mod")) if(!strcmp(keyword,"[mod"))
{ {
nmod=atoi(value); fputs(buf,stdout);
if (!parse_mod(value, &dsa2, &L, &N, &md))
{
fprintf(stderr, "Mod Parse Error\n");
exit (1);
}
} }
else if(!strcmp(keyword,"N")) else if(!strcmp(keyword,"N"))
{ {
int n=atoi(value); int n=atoi(value);
printf("[mod = %d]\n\n",nmod);
while(n--) while(n--)
{ {
unsigned char seed[EVP_MAX_MD_SIZE]; unsigned char seed[EVP_MAX_MD_SIZE];
@ -164,13 +168,25 @@ static void pqg()
unsigned long h; unsigned long h;
dsa = FIPS_dsa_new(); dsa = FIPS_dsa_new();
if (!dsa_builtin_paramgen(dsa, nmod, 160, NULL, NULL, 0, if (!dsa2 && !dsa_builtin_paramgen(dsa, L, N, md,
seed,&counter,&h,NULL)) NULL, 0, seed,
&counter, &h, NULL))
{
fprintf(stderr, "Parameter Generation error\n");
exit(1); exit(1);
}
if (dsa2 && dsa_builtin_paramgen2(dsa, L, N, md,
NULL, 0, seed,
&counter, &h, NULL) <= 0)
{
fprintf(stderr, "Parameter Generation error\n");
exit(1);
}
pbn("P",dsa->p); pbn("P",dsa->p);
pbn("Q",dsa->q); pbn("Q",dsa->q);
pbn("G",dsa->g); pbn("G",dsa->g);
pv("Seed",seed,20); pv("Seed",seed, M_EVP_MD_size(md));
printf("c = %d\n",counter); printf("c = %d\n",counter);
printf("H = %lx\n",h); printf("H = %lx\n",h);
putc('\n',stdout); putc('\n',stdout);
@ -433,7 +449,8 @@ static void siggen()
char buf[1024]; char buf[1024];
char lbuf[1024]; char lbuf[1024];
char *keyword, *value; char *keyword, *value;
int nmod=0; int dsa2, L, N;
const EVP_MD *md = NULL;
DSA *dsa=NULL; DSA *dsa=NULL;
while(fgets(buf,sizeof buf,stdin) != NULL) while(fgets(buf,sizeof buf,stdin) != NULL)
@ -443,15 +460,29 @@ static void siggen()
fputs(buf,stdout); fputs(buf,stdout);
continue; continue;
} }
fputs(buf,stdout);
if(!strcmp(keyword,"[mod")) if(!strcmp(keyword,"[mod"))
{ {
nmod=atoi(value); if (!parse_mod(value, &dsa2, &L, &N, &md))
printf("[mod = %d]\n\n",nmod); {
fprintf(stderr, "Mod Parse Error\n");
exit (1);
}
if (dsa) if (dsa)
FIPS_dsa_free(dsa); FIPS_dsa_free(dsa);
dsa = FIPS_dsa_new(); dsa = FIPS_dsa_new();
if (!DSA_generate_parameters_ex(dsa, nmod,NULL,0,NULL,NULL,NULL)) if (!dsa2 && !dsa_builtin_paramgen(dsa, L, N, md, NULL, 0,
exit(1); NULL, NULL, NULL, NULL))
{
fprintf(stderr, "Parameter Generation error\n");
exit(1);
}
if (dsa2 && dsa_builtin_paramgen2(dsa, L, N, md, NULL, 0,
NULL, NULL, NULL, NULL) <= 0)
{
fprintf(stderr, "Parameter Generation error\n");
exit(1);
}
pbn("P",dsa->p); pbn("P",dsa->p);
pbn("Q",dsa->q); pbn("Q",dsa->q);
pbn("G",dsa->g); pbn("G",dsa->g);
@ -466,13 +497,12 @@ static void siggen()
EVP_MD_CTX_init(&mctx); EVP_MD_CTX_init(&mctx);
n=hex2bin(value,msg); n=hex2bin(value,msg);
pv("Msg",msg,n);
if (!DSA_generate_key(dsa)) if (!DSA_generate_key(dsa))
exit(1); exit(1);
pbn("Y",dsa->pub_key); pbn("Y",dsa->pub_key);
EVP_DigestInit_ex(&mctx, EVP_sha1(), NULL); EVP_DigestInit_ex(&mctx, md, NULL);
EVP_DigestUpdate(&mctx, msg, n); EVP_DigestUpdate(&mctx, msg, n);
sig = FIPS_dsa_sign_ctx(dsa, &mctx); sig = FIPS_dsa_sign_ctx(dsa, &mctx);
@ -528,10 +558,7 @@ static void sigver()
else if(!strcmp(keyword,"G")) else if(!strcmp(keyword,"G"))
dsa->g=hex2bn(value); dsa->g=hex2bn(value);
else if(!strcmp(keyword,"Msg")) else if(!strcmp(keyword,"Msg"))
{
n=hex2bin(value,msg); n=hex2bin(value,msg);
pv("Msg",msg,n);
}
else if(!strcmp(keyword,"Y")) else if(!strcmp(keyword,"Y"))
dsa->pub_key=hex2bn(value); dsa->pub_key=hex2bn(value);
else if(!strcmp(keyword,"R")) else if(!strcmp(keyword,"R"))
@ -542,7 +569,7 @@ static void sigver()
int r; int r;
EVP_MD_CTX_init(&mctx); EVP_MD_CTX_init(&mctx);
sig->s=hex2bn(value); sig->s=hex2bn(value);
EVP_DigestInit_ex(&mctx, md, NULL); EVP_DigestInit_ex(&mctx, md, NULL);
EVP_DigestUpdate(&mctx, msg, n); EVP_DigestUpdate(&mctx, msg, n);
no_err = 1; no_err = 1;