generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

undef some symbols that cause problems with make depend for fips builds

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-01-18 01:40:36 +00:00
parent 25e3d2225a
commit 7b23c126e6
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bn/bn_lcl.h
View File

@ -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);

1
crypto/evp/e_aes_cbc_hmac_sha1.c
View File

@ -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

1
crypto/evp/evp_locl.h
View File

@ -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