From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 18 Jan 2012 01:40:36 +0000 (+0000)
Subject: undef some symbols that cause problems with make depend for fips builds
X-Git-Tag: OpenSSL_1_0_1-beta2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b23c126e604dbc7e13bdf69b968ae9f8131a7fc;p=oweals%2Fopenssl.git

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

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index d7dff0d90c..eecfd8cc99 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -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);
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 43fc26d0d1..278c6caa28 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -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
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h
index 53308446e9..08c0a66d39 100644
--- a/crypto/evp/evp_locl.h
+++ b/crypto/evp/evp_locl.h
@@ -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