diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-01-18 01:40:36 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-01-18 01:40:36 +0000 |
| commit | 7b23c126e604dbc7e13bdf69b968ae9f8131a7fc (patch) | |
| tree | 37fa70ae3a6de301f081bb2214adbcaf10bdef09 | |
| parent | 25e3d2225acaf6ce60243210b2607393e4dc57ff (diff) | |
undef some symbols that cause problems with make depend for fips builds
| -rw-r--r-- | crypto/bn/bn_lcl.h | 4 | ||||
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_locl.h | 1 |
3 files changed, 6 insertions, 0 deletions
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 |