diff options
| author | Matt Caswell <matt@openssl.org> | 2019-05-30 15:40:57 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-06-03 13:56:53 +0200 |
| commit | 41525ed62802afd9f125bcf33e986d82bbacd635 (patch) | |
| tree | 48da90a968a14aa0e8bb54ea3dd4866d02f5261a /crypto/sparcv9cap.c | |
| parent | Make basic AES ciphers available from within the FIPS providers (diff) | |
| download | openssl-41525ed62802afd9f125bcf33e986d82bbacd635.tar.xz openssl-41525ed62802afd9f125bcf33e986d82bbacd635.zip | |
Ensure we get all the right defines for AES assembler in FIPS module
There are various C macro definitions that are passed via the compiler
to enable AES assembler optimisation. We need to make sure that these
defines are also passed during compilation of the FIPS module.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9038)
Diffstat (limited to 'crypto/sparcv9cap.c')
| -rw-r--r-- | crypto/sparcv9cap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c index ec825662e5..e48ebf7e6d 100644 --- a/crypto/sparcv9cap.c +++ b/crypto/sparcv9cap.c @@ -24,6 +24,11 @@ __attribute__ ((visibility("hidden"))) #endif unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 }; +/* + * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into + * the FIPS module yet. + */ +#ifndef FIPS_MODE int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num) { @@ -86,6 +91,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, } return bn_mul_mont_int(rp, ap, bp, np, n0, num); } +#endif /* FIPS_MODE */ unsigned long _sparcv9_rdtick(void); void _sparcv9_vis1_probe(void); |