Redirect clone digests to FIPS module for FIPS builds.

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

diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
index 4f03fb70e0263e84566c24d333ddd06b7cee71ce..b730c6e2223db17cd3172a587703c243678211b4 100644 (file)
--- a/crypto/evp/m_dss1.c
+++ b/crypto/evp/m_dss1.c
@@ -68,6 +68,13 @@
 #include <openssl/dsa.h>
 #endif
 
+#ifdef OPENSSL_FIPS 
+#include <openssl/fips.h>
+
+const EVP_MD *EVP_dss1(void) { return FIPS_evp_dss1(); }
+
+#else
+
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }
 
@@ -98,3 +105,4 @@ const EVP_MD *EVP_dss1(void)
        return(&dss1_md);
        }
 #endif
+#endif

diff --git a/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c
index 8d87a49ebe9af85ca213f8f3ff67fb6b31d2407c..1e64a593bf53100c74affca3a87c529dbf41d810 100644 (file)
--- a/crypto/evp/m_ecdsa.c
+++ b/crypto/evp/m_ecdsa.c
@@ -116,6 +116,13 @@
 #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
+
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }
 
@@ -146,3 +153,4 @@ const EVP_MD *EVP_ecdsa(void)
        return(&ecdsa_md);
        }
 #endif
+#endif