Workaround so "make depend" works for fips builds.

diff --git a/apps/speed.c b/apps/speed.c
index b397c85095f7049f37ec5a170135311b8ee84d46..1eed48c11cec62a3a2deefed5833b4166303fb78 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -186,6 +186,11 @@
 #include <openssl/modes.h>
 
 #ifdef OPENSSL_FIPS
+#ifdef OPENSSL_DOING_MAKEDEPEND
+#undef AES_set_encrypt_key
+#undef AES_set_decrypt_key
+#undef DES_set_key_unchecked
+#endif
 #define BF_set_key     private_BF_set_key
 #define CAST_set_key   private_CAST_set_key
 #define idea_set_encrypt_key   private_idea_set_encrypt_key

diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h
index 620c551f80a77d79496269532bf975bfba683101..53308446e95d155843f91325662bb360162429a3 100644 (file)
--- a/crypto/evp/evp_locl.h
+++ b/crypto/evp/evp_locl.h
@@ -349,6 +349,16 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                             const EVP_CIPHER *c, const EVP_MD *md, int en_de);
 
 #ifdef OPENSSL_FIPS
+
+#ifdef OPENSSL_DOING_MAKEDEPEND
+#undef SHA1_Init
+#undef SHA224_Init
+#undef SHA256_Init
+#undef SHA384_Init
+#undef SHA512_Init
+#undef DES_set_key_unchecked
+#endif
+
 #define RIPEMD160_Init private_RIPEMD160_Init
 #define WHIRLPOOL_Init private_WHIRLPOOL_Init
 #define MD5_Init       private_MD5_Init