mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-15 04:53:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not build P10-specific AES-GCM assembler on macOS

Browse Source 
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20543)
This commit is contained in:
Evan Miller 2023-03-18 11:03:22 -04:00 committed by Tomas Mraz
parent 83ff6cbd9a
commit 175645a1a6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/chacha/build.info
View File

@ -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

2
crypto/chacha/chacha_ppc.c
View File

@ -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

2
crypto/modes/build.info
View File

@ -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=

4
include/crypto/aes_platform.h
View File

@ -74,7 +74,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
# define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks
# define HWAES_xts_encrypt aes_p8_xts_encrypt
# define HWAES_xts_decrypt aes_p8_xts_decrypt
# ifndef OPENSSL_SYS_AIX
# if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
# define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300)
# define AES_GCM_ENC_BYTES 128
# define AES_GCM_DEC_BYTES 128
@ -87,7 +87,7 @@ size_t ppc_aes_gcm_decrypt(const unsigned char *in, unsigned char *out,
# define AES_GCM_ASM_PPC(gctx) ((gctx)->ctr==aes_p8_ctr32_encrypt_blocks && \
(gctx)->gcm.funcs.ghash==gcm_ghash_p8)
void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len);
# endif /* OPENSSL_SYS_AIX */
# endif /* OPENSSL_SYS_AIX || OPENSSL_SYS_MACOSX */
# endif /* PPC */
# if (defined(__arm__) || defined(__arm) || defined(__aarch64__))