Commit 9f2c8eb2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Redirect clone digests to FIPS module for FIPS builds.

parent 65300dcf

crypto/evp/m_dss.c

+7 −0
Original line number Diff line number Diff line
@@ -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

crypto/evp/m_dss1.c

+8 −0
Original line number Diff line number Diff line
@@ -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

crypto/evp/m_ecdsa.c

+8 −0
Original line number Diff line number Diff line
@@ -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