Commit 7b23c126 authored Jan 18, 2012 by Dr. Stephen Henson

undef some symbols that cause problems with make depend for fips builds

parent 25e3d222

crypto/bn/bn_lcl.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -472,6 +472,10 @@ extern "C" {
		}
		#endif /* !BN_LLONG */

		#if defined(OPENSSL_DOING_MAKEDEPEND) && defined(OPENSSL_FIPS)
		#undef bn_div_words
		#endif

		void bn_mul_normal(BN_ULONG r,BN_ULONG a,int na,BN_ULONG *b,int nb);
		void bn_mul_comba8(BN_ULONG r,BN_ULONG a,BN_ULONG *b);
		void bn_mul_comba4(BN_ULONG r,BN_ULONG a,BN_ULONG *b);

crypto/evp/e_aes_cbc_hmac_sha1.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		#include <openssl/objects.h>
		#include <openssl/aes.h>
		#include <openssl/sha.h>
		#include "evp_locl.h"

		#ifndef EVP_CIPH_FLAG_AEAD_CIPHER
		#define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000

crypto/evp/evp_locl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX ctx, const char pass, int passlen,

		#ifdef OPENSSL_DOING_MAKEDEPEND
		#undef SHA1_Init
		#undef SHA1_Update
		#undef SHA224_Init
		#undef SHA256_Init
		#undef SHA384_Init