diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-17 08:14:57 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 09:43:21 +0200 |
| commit | 55a9ca5cc5e14d0018015de31baa28f2a711adaa (patch) | |
| tree | c31fc4afa40d425b84c5383f81c0f1f8f0138976 /crypto/ppccap.c | |
| parent | 1313e37ab97c0b24eedf67b343b93a7c964b9767 (diff) | |
| download | openssl-new-55a9ca5cc5e14d0018015de31baa28f2a711adaa.tar.gz | |
crypto/ppccap.c: Fix FIPS build on PPC
Some code was temporarly disabled in the FIPS module because SHA other
SHA1 hadn't been ported. Now that they have, we must enable this code
again.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9168)
Diffstat (limited to 'crypto/ppccap.c')
| -rw-r--r-- | crypto/ppccap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/ppccap.c b/crypto/ppccap.c index 801a2be391..9109c4d3e4 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -65,11 +65,6 @@ 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 -/* - * 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); @@ -88,6 +83,11 @@ void sha512_block_data_order(void *ctx, const void *inp, size_t len) sha512_block_ppc(ctx, inp, len); } +/* + * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into + * the FIPS module yet. + */ +#ifndef FIPS_MODE # ifndef OPENSSL_NO_CHACHA void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp, size_t len, const unsigned int key[8], |