diff options
| author | Evan Miller <emmiller@gmail.com> | 2023-03-18 11:03:22 -0400 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-03-22 14:26:26 +0100 |
| commit | 175645a1a695017a312155a2c1d864ad8bff4eaa (patch) | |
| tree | e55d2b80ca8bfe68ee70558f9781be4e0d3924bb /crypto | |
| parent | 83ff6cbd9a02ed713bf66f960ab9aea5fced49a3 (diff) | |
Do not build P10-specific AES-GCM assembler on macOS
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20543)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/chacha/build.info | 2 | ||||
| -rw-r--r-- | crypto/chacha/chacha_ppc.c | 2 | ||||
| -rw-r--r-- | crypto/modes/build.info | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info index b8c0a7870b..1fa1a716f5 100644 --- a/crypto/chacha/build.info +++ b/crypto/chacha/build.info @@ -13,7 +13,7 @@ IF[{- !$disabled{asm} -}] $CHACHAASM_aarch64=chacha-armv8.S chacha-armv8-sve.S $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s - IF[{- $target{sys_id} ne "AIX" -}] + IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}] $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s chachap10-ppc.s ENDIF $CHACHAASM_ppc64=$CHACHAASM_ppc32 diff --git a/crypto/chacha/chacha_ppc.c b/crypto/chacha/chacha_ppc.c index 05d8cf100d..29eb9833d0 100644 --- a/crypto/chacha/chacha_ppc.c +++ b/crypto/chacha/chacha_ppc.c @@ -30,7 +30,7 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len, const unsigned int key[8], const unsigned int counter[4]) { -#ifndef OPENSSL_SYS_AIX +#if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) OPENSSL_ppccap_P & PPC_BRD31 ? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter) : #endif diff --git a/crypto/modes/build.info b/crypto/modes/build.info index 65853ba456..4ba7c24f3e 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -33,7 +33,7 @@ IF[{- !$disabled{asm} -}] $MODESDEF_parisc20_64=$MODESDEF_parisc11 $MODESASM_ppc32=ghashp8-ppc.s - IF[{- $target{sys_id} ne "AIX" -}] + IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}] $MODESASM_ppc32=ghashp8-ppc.s aes-gcm-ppc.s ENDIF $MODESDEF_ppc32= |