Key pair test.

diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index 8cd4b3ed1345d53fa0470bf68045c37dc7217c19..f3287d6bdf89733b25b8315b33df2189effdaaf0 100644 (file)
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -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/PQGGen.req > $A/PQGGen.rsp
+#      ./fips_dssvs pqg < $Q/PQGGen.req > $A/PQGGen.rsp
+       ./fips_dssvs keypair < $Q/KeyPair.req > $A/KeyPair.rsp
 
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff

diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index a6c39560ad339081eed536a96998f280393fc6ef..594797f3f4abfdc94a659ddb560638e8ea56041c 100644 (file)
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -61,13 +61,18 @@ int bin2hex(const unsigned char *in,int len,char *out)
     return n2;
     }
 
-void pv(char *tag,const unsigned char *val,int len)
+void pv(const char *tag,const unsigned char *val,int len)
     {
     char obuf[2048];
     int olen;
 
     olen=bin2hex(val,len,obuf);
-    printf("%s = %s\n", tag,obuf);
+    printf("%s = %s\n",tag,obuf);
+    }
+
+void pbn(const char *tag,const BIGNUM *val)
+    {
+    printf("%s = %s\n",tag,BN_bn2hex(val));
     }
 
 void primes()
@@ -123,7 +128,40 @@ void pqg()
            }
        else
            fputs(buf,stdout);
+       }
+    }
+
+void keypair()
+    {
+    char buf[1024];
+    int nmod=0;
+
+    while(fgets(buf,sizeof buf,stdin) != NULL)
+       {
+       if(!strncmp(buf,"[mod = ",7))
+           nmod=atoi(buf+7);
+       else if(!strncmp(buf,"N = ",4))
+           {
+           DSA *dsa;
+           int n=atoi(buf+4);
+
+           printf("[mod = %d]\n\n",nmod);
+
+           dsa=DSA_generate_parameters(nmod,NULL,0,NULL,NULL,NULL,NULL);
+           pbn("P",dsa->p);
+           pbn("Q",dsa->q);
+           pbn("G",dsa->g);
+           putc('\n',stdout);
 
+           while(n--)
+               {
+               DSA_generate_key(dsa);
+
+               pbn("X",dsa->priv_key);
+               pbn("Y",dsa->pub_key);
+               putc('\n',stdout);
+               }
+           }
        }
     }
 
@@ -144,6 +182,8 @@ int main(int argc,char **argv)
        primes();
     else if(!strcmp(argv[1],"pqg"))
        pqg();
+    else if(!strcmp(argv[1],"keypair"))
+       keypair();
     //    else if(!strcmp(argv[1],"versig"))
     // versig();
     else