From c7373c3dee87f3bebb67b4bff03c30356fafd09d Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 1 Jun 2011 15:11:00 +0000
Subject: For consistency define clone digests in evp_fips.c

---
 crypto/evp/evp_fips.c | 4 ++++
 crypto/evp/m_dss.c    | 7 +------
 crypto/evp/m_dss1.c   | 7 +------
 crypto/evp/m_ecdsa.c  | 7 +------
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/crypto/evp/evp_fips.c b/crypto/evp/evp_fips.c
index fd5725a4b6..033aecc654 100644
--- 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 192a29884f..4ad63ada6f 100644
--- 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 b730c6e222..f80170efeb 100644
--- 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 1e64a593bf..4b15fb0f6c 100644
--- 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); }
-- 
cgit v1.2.3