diff options
| author | sanumesh <sanumesh@in.ibm.com> | 2024-05-28 12:46:52 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-06-05 10:14:25 +0200 |
| commit | f56083e236c1f4bf4414a9d4ad1efe5c610b2116 (patch) | |
| tree | a4bc3406c8b80f670c17cdc2e11a00e5bc4d7cff | |
| parent | e51617bc7305280534957a67eea389ed4e5a4acc (diff) | |
enable AES-XTS optimization for AIX
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24518)
(cherry picked from commit dda1635cbff44d8d1b41a08e53c936ccb6c41acd)
| -rw-r--r-- | crypto/aes/build.info | 2 | ||||
| -rw-r--r-- | include/crypto/aes_platform.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/aes/build.info b/crypto/aes/build.info index 2dc16a2b2e..9d400a74b7 100644 --- a/crypto/aes/build.info +++ b/crypto/aes/build.info @@ -38,7 +38,7 @@ IF[{- !$disabled{asm} -}] $AESASM_parisc20_64=$AESASM_parisc11 $AESDEF_parisc20_64=$AESDEF_parisc11 - IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}] + IF[{- $target{sys_id} ne "MACOSX" -}] $AESASM_ppc32=aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s ELSE $AESASM_ppc32=aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h index bb0c10ec82..65fd694a60 100644 --- a/include/crypto/aes_platform.h +++ b/include/crypto/aes_platform.h @@ -65,7 +65,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # ifdef VPAES_ASM # define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC) # endif -# if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) +# if !defined(OPENSSL_SYS_MACOSX) # define HWAES_CAPABLE (OPENSSL_ppccap_P & PPC_CRYPTO207) # define HWAES_set_encrypt_key aes_p8_set_encrypt_key # define HWAES_set_decrypt_key aes_p8_set_decrypt_key @@ -75,6 +75,8 @@ 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 +# endif /* OPENSSL_SYS_MACOSX */ +# 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 |