Update DSA selftest with data from NIST test vectors.

diff --git a/fips-1.0/dsa/fips_dsa_selftest.c b/fips-1.0/dsa/fips_dsa_selftest.c
index bb4726226113a3e461db20b2fc19a61dd480fb6d..6ff114e6b2ea2ef72493fb86376c143d614839d5 100644 (file)
--- a/fips-1.0/dsa/fips_dsa_selftest.c
+++ b/fips-1.0/dsa/fips_dsa_selftest.c
@@ -65,39 +65,44 @@
 
 #ifdef OPENSSL_FIPS
 
-/* 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 the NIST test vectors */
+
+static unsigned char seed[20] = {
+       0x77, 0x8f, 0x40, 0x74, 0x6f, 0x66, 0xbe, 0x33, 0xce, 0xbe, 0x99, 0x34,
+       0x4c, 0xfc, 0xf3, 0x28, 0xaa, 0x70, 0x2d, 0x3a
+       };
+
+static unsigned char out_p[] = {
+       0xf7, 0x7c, 0x1b, 0x83, 0xd8, 0xe8, 0x5c, 0x7f, 0x85, 0x30, 0x17, 0x57,
+       0x21, 0x95, 0xfe, 0x26, 0x04, 0xeb, 0x47, 0x4c, 0x3a, 0x4a, 0x81, 0x4b,
+       0x71, 0x2e, 0xed, 0x6e, 0x4f, 0x3d, 0x11, 0x0f, 0x7c, 0xfe, 0x36, 0x43,
+       0x51, 0xd9, 0x81, 0x39, 0x17, 0xdf, 0x62, 0xf6, 0x9c, 0x01, 0xa8, 0x69,
+       0x71, 0xdd, 0x29, 0x7f, 0x47, 0xe6, 0x65, 0xa6, 0x22, 0xe8, 0x6a, 0x12,
+       0x2b, 0xc2, 0x81, 0xff, 0x32, 0x70, 0x2f, 0x9e, 0xca, 0x53, 0x26, 0x47,
+       0x0f, 0x59, 0xd7, 0x9e, 0x2c, 0xa5, 0x07, 0xc4, 0x49, 0x52, 0xa3, 0xe4,
+       0x6b, 0x04, 0x00, 0x25, 0x49, 0xe2, 0xe6, 0x7f, 0x28, 0x78, 0x97, 0xb8,
+       0x3a, 0x32, 0x14, 0x38, 0xa2, 0x51, 0x33, 0x22, 0x44, 0x7e, 0xd7, 0xef,
+       0x45, 0xdb, 0x06, 0x4a, 0xd2, 0x82, 0x4a, 0x82, 0x2c, 0xb1, 0xd7, 0xd8,
+       0xb6, 0x73, 0x00, 0x4d, 0x94, 0x77, 0x94, 0xef
        };
 
-static const 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_q[] = {
+       0xd4, 0x0a, 0xac, 0x9f, 0xbd, 0x8c, 0x80, 0xc2, 0x38, 0x7e, 0x2e, 0x0c,
+       0x52, 0x5c, 0xea, 0x34, 0xa1, 0x83, 0x32, 0xf3
        };
 
-static const 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 const 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[] = {
+       0x34, 0x73, 0x8b, 0x57, 0x84, 0x8e, 0x55, 0xbf, 0x57, 0xcc, 0x41, 0xbb,
+       0x5e, 0x2b, 0xd5, 0x42, 0xdd, 0x24, 0x22, 0x2a, 0x09, 0xea, 0x26, 0x1e,
+       0x17, 0x65, 0xcb, 0x1a, 0xb3, 0x12, 0x44, 0xa3, 0x9e, 0x99, 0xe9, 0x63,
+       0xeb, 0x30, 0xb1, 0x78, 0x7b, 0x09, 0x40, 0x30, 0xfa, 0x83, 0xc2, 0x35,
+       0xe1, 0xc4, 0x2d, 0x74, 0x1a, 0xb1, 0x83, 0x54, 0xd8, 0x29, 0xf4, 0xcf,
+       0x7f, 0x6f, 0x67, 0x1c, 0x36, 0x49, 0xee, 0x6c, 0xa2, 0x3c, 0x2d, 0x6a,
+       0xe9, 0xd3, 0x9a, 0xf6, 0x57, 0x78, 0x6f, 0xfd, 0x33, 0xcd, 0x3c, 0xed,
+       0xfd, 0xd4, 0x41, 0xe6, 0x5c, 0x8b, 0xe0, 0x68, 0x31, 0x47, 0x47, 0xaf,
+       0x12, 0xa7, 0xf9, 0x32, 0x0d, 0x94, 0x15, 0x48, 0xd0, 0x54, 0x85, 0xb2,
+       0x04, 0xb5, 0x4d, 0xd4, 0x9d, 0x05, 0x22, 0x25, 0xd9, 0xfd, 0x6c, 0x36,
+       0xef, 0xbe, 0x69, 0x6c, 0x55, 0xf4, 0xee, 0xec
        };
 
 static const unsigned char str1[]="12345678901234567890";
@@ -123,9 +128,9 @@ int FIPS_selftest_dsa()
 
     if(dsa == NULL)
        goto err;
-    if(!DSA_generate_parameters_ex(dsa, 512,seed,20,&counter,&h,NULL))
+    if(!DSA_generate_parameters_ex(dsa, 1024,seed,20,&counter,&h,NULL))
        goto err;
-    if (counter != 105) 
+    if (counter != 378) 
        goto err;
     if (h != 2)
        goto err;