diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-11-22 12:50:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-11-22 12:50:59 +0000 |
| commit | a310428527671f43142d551b96438b5d3db318d7 (patch) | |
| tree | 805edf38c91d165ab21a891909480fc75a3ab7e9 | |
| parent | 7e0fd45ce3daa5cce7f7ea1b7dc14fc61ed21104 (diff) | |
Workaround so "make depend" works for fips builds.
| -rw-r--r-- | apps/speed.c | 5 | ||||
| -rw-r--r-- | crypto/evp/evp_locl.h | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/apps/speed.c b/apps/speed.c index b397c85095..1eed48c11c 100644 --- 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 620c551f80..53308446e9 100644 --- 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 |