Update fips_dsatest to use 1024 bit key.

diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index e9105d6297fe71116151fe59f64f878b71b592da..a29d90b5a912eb8e68624f26384150f43ad9c4b2 100644 (file)
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -95,46 +95,52 @@ int main(int argc, char *argv[])
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-       0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-       0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-       };
+/* seed, out_p, out_q, out_g are taken from the earlier validation test
+ * vectors.
+ */
+
+static unsigned char seed[20] = {
+       0x1c, 0xfb, 0xa9, 0x6c, 0xf7, 0x95, 0xb3, 0x2e, 0x01, 0x01, 0x3c, 0x8d,
+       0x7f, 0x6e, 0xf4, 0x59, 0xcc, 0x2f, 0x19, 0x59
+       };
 
-static unsigned char out_p[]={
-       0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-       0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-       0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-       0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-       0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-       0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-       0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-       0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
+static unsigned char out_p[] = {
+       0xc2, 0x3c, 0x48, 0x31, 0x7e, 0x3b, 0x4e, 0x5d, 0x3c, 0x93, 0x78, 0x60,
+       0x5c, 0xf2, 0x60, 0xbb, 0x5a, 0xfa, 0x7f, 0x17, 0xf9, 0x26, 0x69, 0x46,
+       0xe7, 0x07, 0xbb, 0x3b, 0x2e, 0xc4, 0xb5, 0x66, 0xf7, 0x4d, 0xae, 0x9b,
+       0x8f, 0xf0, 0x42, 0xea, 0xb3, 0xa0, 0x7e, 0x81, 0x85, 0x89, 0xe6, 0xb0,
+       0x29, 0x03, 0x6b, 0xcc, 0xfb, 0x8e, 0x46, 0x15, 0x4d, 0xc1, 0x69, 0xd8,
+       0x2f, 0xef, 0x5c, 0x8b, 0x29, 0x32, 0x41, 0xbd, 0x13, 0x72, 0x3d, 0xac,
+       0x81, 0xcc, 0x86, 0x6c, 0x06, 0x5d, 0x51, 0xa1, 0xa5, 0x07, 0x0c, 0x3e,
+       0xbe, 0xdd, 0xf4, 0x6e, 0xa8, 0xed, 0xb4, 0x2f, 0xbd, 0x3e, 0x64, 0xea,
+       0xee, 0x92, 0xec, 0x51, 0xe1, 0x0d, 0xab, 0x25, 0x45, 0xae, 0x55, 0x21,
+       0x4d, 0xd6, 0x96, 0x6f, 0xe6, 0xaa, 0xd3, 0xca, 0x87, 0x92, 0xb1, 0x1c,
+       0x3c, 0xaf, 0x29, 0x09, 0x8b, 0xc6, 0xed, 0xe1
        };
 
-static unsigned char out_q[]={
-       0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-       0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-       0xda,0xce,0x91,0x5f,
+static unsigned char out_q[] = {
+       0xae, 0x0a, 0x8c, 0xfb, 0x80, 0xe1, 0xc6, 0xd1, 0x09, 0x0f, 0x26, 0xde,
+       0x91, 0x53, 0xc2, 0x8b, 0x2b, 0x0f, 0xde, 0x7f
        };
 
-static unsigned char out_g[]={
-       0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-       0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-       0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-       0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-       0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-       0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-       0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-       0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
+static unsigned char out_g[] = {
+       0x0d, 0x7d, 0x92, 0x74, 0x10, 0xf6, 0xa4, 0x43, 0x86, 0x9a, 0xd1, 0xd9,
+       0x56, 0x00, 0xbc, 0x18, 0x97, 0x99, 0x4e, 0x9a, 0x93, 0xfb, 0x00, 0x3d,
+       0x6c, 0xa0, 0x1b, 0x95, 0x6b, 0xbd, 0xf7, 0x7a, 0xbc, 0x36, 0x3f, 0x3d,
+       0xb9, 0xbf, 0xf9, 0x91, 0x37, 0x68, 0xd1, 0xb9, 0x1e, 0xfe, 0x7f, 0x10,
+       0xc0, 0x6a, 0xcd, 0x5f, 0xc1, 0x65, 0x1a, 0xb8, 0xe7, 0xab, 0xb5, 0xc6,
+       0x8d, 0xb7, 0x86, 0xad, 0x3a, 0xbf, 0x6b, 0x7b, 0x0a, 0x66, 0xbe, 0xd5,
+       0x58, 0x23, 0x16, 0x48, 0x83, 0x29, 0xb6, 0xa7, 0x64, 0xc7, 0x08, 0xbe,
+       0x55, 0x4c, 0x6f, 0xcb, 0x34, 0xc1, 0x73, 0xb0, 0x39, 0x68, 0x52, 0xdf,
+       0x27, 0x7f, 0x32, 0xbc, 0x2b, 0x0d, 0x63, 0xed, 0x75, 0x3e, 0xb5, 0x54,
+       0xac, 0xc8, 0x20, 0x2a, 0x73, 0xe8, 0x29, 0x51, 0x03, 0x77, 0xe8, 0xc9,
+       0x61, 0x32, 0x25, 0xaf, 0x21, 0x5b, 0x6e, 0xda
        };
 
+
 static const unsigned char str1[]="12345678901234567890";
 
 static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-static const unsigned char rnd_key1[]="12345678";
-static const unsigned char rnd_key2[]="abcdefgh";
 
 int main(int argc, char **argv)
        {
@@ -154,21 +160,11 @@ int main(int argc, char **argv)
            do_print_errors();
            EXIT(1);
            }
-#if 0
-       CRYPTO_malloc_debug_init();
-       CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-       CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-#endif
-
-#if 0
-       FIPS_rand_set_key(rnd_key1,rnd_key2);
-       RAND_seed(rnd_seed, sizeof rnd_seed);
-#endif
 
        fprintf(stderr,"test generation of DSA parameters\n");
 
        dsa = FIPS_dsa_new();
-       DSA_generate_parameters_ex(dsa, 512,seed,20,&counter,&h,&cb);
+       DSA_generate_parameters_ex(dsa, 1024,seed,20,&counter,&h,&cb);
 
        fprintf(stderr,"seed\n");
        for (i=0; i<20; i+=4)
@@ -177,10 +173,9 @@ int main(int argc, char **argv)
                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
                }
        fprintf(stderr,"\ncounter=%d h=%ld\n",counter,h);
-               
+
        if (dsa == NULL) goto end;
-       /*DSA_print(bio_err,dsa,0);*/
-       if (counter != 105) 
+       if (counter != 16) 
                {
                fprintf(stderr,"counter should be 105\n");
                goto end;

diff --git a/test/Makefile b/test/Makefile
index eeb519997f608c92d1080247c84dc07c1b79ad43..8b9670a054dd397abc939302946e41c17f4eb389 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -280,10 +280,8 @@ test_dh:
 test_dsa:
        @echo "Generate a set of DSA parameters"
        ../util/shlib_wrap.sh ./$(DSATEST)
-       ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
        if [ -n "$(FIPSCANLIB)" ]; then \
          ../util/shlib_wrap.sh ./$(FIPS_DSATEST); \
-         ../util/shlib_wrap.sh ./$(FIPS_DSATEST) -app2_1; \
        fi
 
 test_gen: