diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-02-16 14:40:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-02-16 14:40:06 +0000 |
| commit | d749e1080a4ec0ae6af5edc4851379fbc2a5ebca (patch) | |
| tree | 44e436481d60d2cdcfe54e141d554c5302ccc6c2 /crypto/bn/bn_asm.c | |
| parent | 0fbf8f447b6063b2023ddbf8e8caa57a29aa368a (diff) | |
Experimental symbol renaming to avoid clashes with regular OpenSSL.
Make sure crypto.h is included first in any affected files.
Diffstat (limited to 'crypto/bn/bn_asm.c')
| -rw-r--r-- | crypto/bn/bn_asm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c index c43c91cc09..7b1280ae61 100644 --- a/crypto/bn/bn_asm.c +++ b/crypto/bn/bn_asm.c @@ -63,6 +63,7 @@ #include <stdio.h> #include <assert.h> +#include <openssl/crypto.h> #include "cryptlib.h" #include "bn_lcl.h" @@ -428,10 +429,12 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int n) #if defined(BN_MUL_COMBA) && !defined(OPENSSL_SMALL_FOOTPRINT) +#ifndef OPENSSL_FIPSCANISTER #undef bn_mul_comba8 #undef bn_mul_comba4 #undef bn_sqr_comba8 #undef bn_sqr_comba4 +#endif /* mul_add_c(a,b,c0,c1,c2) -- c+=a*b for three word number c=(c2,c1,c0) */ /* mul_add_c2(a,b,c0,c1,c2) -- c+=2*a*b for three word number c=(c2,c1,c0) */ @@ -946,14 +949,16 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U #else /* !BN_MUL_COMBA */ /* hmm... is it faster just to do a multiply? */ +#ifndef OPENSSL_FIPSCANISTER #undef bn_sqr_comba4 +#undef bn_sqr_comba8 +#endif void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) { BN_ULONG t[8]; bn_sqr_normal(r,a,4,t); } -#undef bn_sqr_comba8 void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a) { BN_ULONG t[16]; |