For consistency define clone digests in evp_fips.c

diff --git a/crypto/evp/evp_fips.c b/crypto/evp/evp_fips.c
index fd5725a4b60171d8c7766a03ba53331a30388918..033aecc654dad3de9965726db8adcdfc894a1bc3 100644 (file)
--- a/crypto/evp/evp_fips.c
+++ b/crypto/evp/evp_fips.c
@@ -105,4 +105,8 @@ const EVP_MD *EVP_sha256(void)  { return FIPS_evp_sha256(); }
 const EVP_MD *EVP_sha384(void)  { return FIPS_evp_sha384(); }
 const EVP_MD *EVP_sha512(void)  { return FIPS_evp_sha512(); }
 
+const EVP_MD *EVP_dss(void)  { return FIPS_evp_dss(); }
+const EVP_MD *EVP_dss1(void)  { return FIPS_evp_dss1(); }
+const EVP_MD *EVP_ecdsa(void)  { return FIPS_evp_ecdsa(); }
+
 #endif

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index 192a29884fc62675e45fda0fa913f2444b415aa3..4ad63ada6fe228c859eccbac137c63f5c3d1d218 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -66,12 +66,7 @@
 #endif
 
 #ifndef OPENSSL_NO_SHA
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-
-const EVP_MD *EVP_dss(void) { return FIPS_evp_dss(); }
-
-#else
+#ifndef OPENSSL_FIPS
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }

diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
index b730c6e2223db17cd3172a587703c243678211b4..f80170efeb98404e446ac24ac5ffbd1ce5e08267 100644 (file)
--- a/crypto/evp/m_dss1.c
+++ b/crypto/evp/m_dss1.c
@@ -68,12 +68,7 @@
 #include <openssl/dsa.h>
 #endif
 
-#ifdef OPENSSL_FIPS 
-#include <openssl/fips.h>
-
-const EVP_MD *EVP_dss1(void) { return FIPS_evp_dss1(); }
-
-#else
+#ifndef OPENSSL_FIPS 
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }

diff --git a/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c
index 1e64a593bf53100c74affca3a87c529dbf41d810..4b15fb0f6cec0bc3c84ea623cdacd34649a1a382 100644 (file)
--- a/crypto/evp/m_ecdsa.c
+++ b/crypto/evp/m_ecdsa.c
@@ -116,12 +116,7 @@
 #include <openssl/x509.h>
 
 #ifndef OPENSSL_NO_SHA
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-
-const EVP_MD *EVP_ecdsa(void) { return FIPS_evp_ecdsa(); }
-
-#else
+#ifndef OPENSSL_FIPS
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }