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

Workaround so "make depend" works for fips builds.

parent 7e0fd45c

apps/speed.c

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

crypto/evp/evp_locl.h

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