diff options
| author | Matt Caswell <matt@openssl.org> | 2019-06-11 13:49:43 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-06-12 09:16:43 +0100 |
| commit | a8140a42f5ee9e4e1423b5b6b319dc4657659f6f (patch) | |
| tree | c38dd7dcd24d47a528737c5a223a4c86b56e7b0c /crypto/ppccap.c | |
| parent | 444ab3abb1ff4b28189e7b15dadcebb2e3564fdf (diff) | |
| download | openssl-new-a8140a42f5ee9e4e1423b5b6b319dc4657659f6f.tar.gz | |
Ensure code is compiled with correct BIGNUM assembler defines
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9130)
Diffstat (limited to 'crypto/ppccap.c')
| -rw-r--r-- | crypto/ppccap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/ppccap.c b/crypto/ppccap.c index 3465864f0a..801a2be391 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -38,12 +38,8 @@ unsigned int OPENSSL_ppccap_P = 0; static sigset_t all_masked; -/* - * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into - * the FIPS module yet. - */ -#ifndef FIPS_MODE -# ifdef OPENSSL_BN_ASM_MONT + +#ifdef OPENSSL_BN_ASM_MONT 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) { @@ -68,8 +64,12 @@ 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 - +#endif +/* + * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into + * the FIPS module yet. + */ +#ifndef FIPS_MODE void sha256_block_p8(void *ctx, const void *inp, size_t len); void sha256_block_ppc(void *ctx, const void *inp, size_t len); void sha256_block_data_order(void *ctx, const void *inp, size_t len); |