Use 0 for tbslen to perform strlen.

[openssl.git] / crypto / dsa / dsa_key.c

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index a90b3c460b7a9a250f2c18c2385e08393d8685f7..942000e3a52e2cf88d21e2edd1becd564887db87 100644 (file)
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -71,13 +71,6 @@
 #include <openssl/fips.h>
 #include <openssl/evp.h>
 
-static int fips_dsa_pairwise_fail = 0;
-
-void FIPS_corrupt_dsa_keygen(void)
-       {
-       fips_dsa_pairwise_fail = 1;
-       }
-
 static int fips_check_dsa(DSA *dsa)
        {
        EVP_PKEY pk;
@@ -85,8 +78,8 @@ static int fips_check_dsa(DSA *dsa)
        pk.type = EVP_PKEY_DSA;
        pk.pkey.dsa = dsa;
 
-       if (!fips_pkey_signature_test(&pk, tbs, -1,
-                                       NULL, 0, EVP_sha1(), 0, NULL))
+       if (!fips_pkey_signature_test(FIPS_TEST_PAIRWISE,
+                                       &pk, tbs, 0, NULL, 0, NULL, 0, NULL))
                {
                FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
                fips_set_selftest_fail();
@@ -159,11 +152,13 @@ static int dsa_builtin_keygen(DSA *dsa)
        dsa->priv_key=priv_key;
        dsa->pub_key=pub_key;
 #ifdef OPENSSL_FIPS
-       if (fips_dsa_pairwise_fail)
-               BN_add_word(dsa->pub_key, 1);
        if(!fips_check_dsa(dsa))
+               {
+               dsa->pub_key = NULL;
+               dsa->priv_key = NULL;
+               goto err;
+               }
 #endif
-           goto err;
        ok=1;
 
 err: