1 files changed, 4 insertions, 11 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index c4aa86bc6d..980b6dc2d3 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -56,25 +56,17 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_SHA
 #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>
 
-static int dsa_builtin_keygen(DSA *dsa);
-
+#ifndef OPENSSL_FIPS
 int DSA_generate_key(DSA *dsa)
         {
-        if(dsa->meth->dsa_keygen)
-                return dsa->meth->dsa_keygen(dsa);
-        return dsa_builtin_keygen(dsa);
-        }
-
-static int dsa_builtin_keygen(DSA *dsa)
-        {
         int ok=0;
         BN_CTX *ctx=NULL;
         BIGNUM *pub_key=NULL,*priv_key=NULL;
@@ -107,7 +99,7 @@ static int dsa_builtin_keygen(DSA *dsa)
                         {
                         BN_init(&local_prk);
                         prk = &local_prk;
-                        BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME);
+                        BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME);
                         }
                 else
                         prk = priv_key;
@@ -126,3 +118,4 @@ err:
         return(ok);
         }
 #endif
+#endif