1 files changed, 13 insertions, 38 deletions

diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index b5f8cfa1d0..9cf669b921 100644
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -58,47 +58,34 @@
 
 #include <stdio.h>
 #include <time.h>
+#include "cryptlib.h"
 #ifndef OPENSSL_NO_SHA
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
-
-static int fips_dsa_pairwise_fail = 0;
-
-void FIPS_corrupt_dsa_keygen(void)
-        {
-        fips_dsa_pairwise_fail = 1;
-        }
+#include <openssl/fips.h>
+#endif
 
 static int dsa_builtin_keygen(DSA *dsa);
 
-int fips_check_dsa(DSA *dsa)
+int DSA_generate_key(DSA *dsa)
         {
-        EVP_PKEY pk;
-        unsigned char tbs[] = "DSA Pairwise Check Data";
-        pk.type = EVP_PKEY_DSA;
-        pk.pkey.dsa = dsa;
-
-        if (!fips_pkey_signature_test(&pk, tbs, -1,
-                                        NULL, 0, EVP_dss1(), 0, NULL))
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW))
                 {
-                FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
-                fips_set_selftest_fail();
+                DSAerr(DSA_F_DSA_GENERATE_KEY, DSA_R_NON_FIPS_DSA_METHOD);
                 return 0;
                 }
-        return 1;
-        }
-
-int DSA_generate_key(DSA *dsa)
-        {
+#endif
         if(dsa->meth->dsa_keygen)
                 return dsa->meth->dsa_keygen(dsa);
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                return FIPS_dsa_generate_key(dsa);
+#endif
         return dsa_builtin_keygen(dsa);
         }
 
@@ -108,12 +95,6 @@ static int dsa_builtin_keygen(DSA *dsa)
         BN_CTX *ctx=NULL;
         BIGNUM *pub_key=NULL,*priv_key=NULL;
 
-        if (FIPS_mode() && (BN_num_bits(dsa->p) < OPENSSL_DSA_FIPS_MIN_MODULUS_BITS))
-                {
-                DSAerr(DSA_F_DSA_BUILTIN_KEYGEN, DSA_R_KEY_SIZE_TOO_SMALL);
-                goto err;
-                }
-
         if ((ctx=BN_CTX_new()) == NULL) goto err;
 
         if (dsa->priv_key == NULL)
@@ -152,10 +133,6 @@ static int dsa_builtin_keygen(DSA *dsa)
 
         dsa->priv_key=priv_key;
         dsa->pub_key=pub_key;
-        if (fips_dsa_pairwise_fail)
-                BN_add_word(dsa->pub_key, 1);
-        if(!fips_check_dsa(dsa))
-            goto err;
         ok=1;
 
 err:
@@ -165,5 +142,3 @@ err:
         return(ok);
         }
 #endif
-
-#endif