From: barracuda156 Date: Tue, 9 Jan 2024 22:35:33 +0000 (+0800) Subject: aes_platform.h, gcm128.c: fix Darwin PowerPC macro to include ppc64 X-Git-Tag: openssl-3.3.0-alpha1~312 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df04e81794ac3083804c34c173eb2b2fa55d373d;p=thirdparty%2Fopenssl.git aes_platform.h, gcm128.c: fix Darwin PowerPC macro to include ppc64 Current PowerPC-related defines omit Darwin ppc64 case. Use __POWERPC__ in place of __ppc__ + __ppc64__ Fixes #23220 CLA: trivial Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23245) --- diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c index 6f293ef7944..de9137c9278 100644 --- a/crypto/modes/gcm128.c +++ b/crypto/modes/gcm128.c @@ -393,7 +393,7 @@ void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]); void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]); void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len); -# elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC)) +# elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)) # include "crypto/ppc_arch.h" # define GHASH_ASM_PPC void gcm_init_p8(u128 Htable[16], const u64 Xi[2]); diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h index 51fc5ba2111..cf4a94b86ed 100644 --- a/include/crypto/aes_platform.h +++ b/include/crypto/aes_platform.h @@ -60,7 +60,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # endif /* AES_XTS_ASM */ # if defined(OPENSSL_CPUID_OBJ) -# if (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC)) +# if (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)) # include "crypto/ppc_arch.h" # ifdef VPAES_ASM # define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC)