Commit dcd44b51 authored by Ben Laurie's avatar Ben Laurie
Browse files

New style PQGGen test.

parent 75dca32a

fips/dsa/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ A=../testvectors/dsa/rsp 
fips_test: top_fips_dssvs

	-rm -rf $A

	mkdir $A

	./fips_dssvs prime < $Q/prime.req > $A/prime.rsp

	./fips_dssvs pqg < $Q/pqg.req > $A/pqg.rsp

#	./fips_dssvs prime < $Q/prime.req > $A/prime.rsp

	./fips_dssvs pqg < $Q/PQGGen.req > $A/PQGGen.rsp



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff

fips/dsa/fips_dssvs.c

+18 −11
Original line number Diff line number Diff line
@@ -96,12 +96,13 @@ void pqg() 


    while(fgets(buf,sizeof buf,stdin) != NULL)

	{

	fputs(buf,stdout);

	if(!strncmp(buf,"[mod=",5))

	    nmod=atoi(buf+5);

	else if(!strncmp(buf,"N= ",3))

	if(!strncmp(buf,"[mod = ",7))

	    nmod=atoi(buf+7);

	else if(!strncmp(buf,"N = ",4))

	    {

	    int n=atoi(buf+3);

	    int n=atoi(buf+4);



	    printf("[mod = %d]\n\n",nmod);



	    while(n--)

		{
@@ -115,10 +116,14 @@ void pqg() 
		printf("Q = %s\n",BN_bn2hex(dsa->q));

		printf("G = %s\n",BN_bn2hex(dsa->g));

		pv("Seed",seed,20);

		printf("c = %d\n",counter);

		printf("H = %lx\n",h);

		printf("C= %d\n",counter);

		putc('\n',stdout);

		}

	    }

	else

	    fputs(buf,stdout);



	}

    }
@@ -139,6 +144,8 @@ int main(int argc,char **argv) 
	primes();

    else if(!strcmp(argv[1],"pqg"))

	pqg();

    //    else if(!strcmp(argv[1],"versig"))

    //	versig();

    else

	{

	fprintf(stderr,"Don't know how to %s.\n",argv[1]);