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 d7dff0d90ccd5461d363c315a885755e2bf6fb15..eecfd8cc99e7fb4eebd088fe739202f7fa885798 100644 (file)
--- 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 43fc26d0d164814cefc5500161ff1ae36ea523ee..278c6caa280ac8e83016951cec23e92f0317924c 100644 (file)
--- 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 53308446e95d155843f91325662bb360162429a3..08c0a66d39c79c60107f0315d463841aeb59d1cc 100644 (file)
--- 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