For consistency define clone digests in evp_fips.c

openssl · Jun 1, 2011 · c7373c3 · c7373c3
1 parent 9f2c8eb
commit c7373c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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); }