From b256d32915d29bdcbc109363d3b05fce6dac30b7 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 28 Jun 2023 16:55:57 +0200 Subject: [PATCH] Do not use stitched AES-GCM implementation on PPC32 The implementation is not usable there at all. Fixes #21301 Reviewed-by: Hugo Landau Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/21312) --- crypto/modes/build.info | 6 +++--- providers/implementations/ciphers/cipher_aes_gcm_hw.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/modes/build.info b/crypto/modes/build.info index fd781e7144f..d46e424c2b7 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -33,11 +33,11 @@ IF[{- !$disabled{asm} -}] $MODESDEF_parisc20_64=$MODESDEF_parisc11 $MODESASM_ppc32=ghashp8-ppc.s - IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}] - $MODESASM_ppc32=ghashp8-ppc.s aes-gcm-ppc.s - ENDIF $MODESDEF_ppc32= $MODESASM_ppc64=$MODESASM_ppc32 + IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}] + $MODESASM_ppc64=$MODESASM_ppc32 aes-gcm-ppc.s + ENDIF $MODESDEF_ppc64=$MODESDEF_ppc32 $MODESASM_c64xplus=ghash-c64xplus.s diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw.c b/providers/implementations/ciphers/cipher_aes_gcm_hw.c index 145b207c472..53524d4e4a8 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw.c +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw.c @@ -141,7 +141,7 @@ static const PROV_GCM_HW aes_gcm = { # include "cipher_aes_gcm_hw_t4.inc" #elif defined(AES_PMULL_CAPABLE) && defined(AES_GCM_ASM) # include "cipher_aes_gcm_hw_armv8.inc" -#elif defined(PPC_AES_GCM_CAPABLE) +#elif defined(PPC_AES_GCM_CAPABLE) && defined(_ARCH_PPC64) # include "cipher_aes_gcm_hw_ppc.inc" #elif defined(RV64I_ZKND_ZKNE_CAPABLE) # include "cipher_aes_gcm_hw_rv64i_zknd_zkne.inc" -- 2.47.2