mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-01 19:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression from GCM mode refactoring

Browse Source 
Fixes #18896

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18903)
This commit is contained in:
Tomas Mraz 2022-07-28 16:23:51 +02:00 committed by Pauli
parent 7e32ca79e3
commit 186be8ed26
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/modes/gcm128.c
View File

@ -459,7 +459,9 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
return;
# endif
#elif defined(GHASH_ASM_ARM)
/* ARM */
/* ARM defaults */
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
# ifdef PMULL_CAPABLE
if (PMULL_CAPABLE) {
ctx->ginit = (gcm_init_fn)gcm_init_v8;
@ -475,7 +477,9 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
# endif
return;
#elif defined(GHASH_ASM_SPARC)
/* SPARC */
/* SPARC defaults */
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
if (OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) {
ctx->ginit = gcm_init_vis3;
ctx->gmult = gcm_gmult_vis3;
@ -483,7 +487,7 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
}
return;
#elif defined(GHASH_ASM_PPC)
/* PowerPC */
/* PowerPC does not define GHASH_ASM; defaults set above */
if (OPENSSL_ppccap_P & PPC_CRYPTO207) {
ctx->ginit = gcm_init_p8;
ctx->gmult = gcm_gmult_p8;
@ -491,15 +495,15 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
}
return;
#elif defined(GHASH_ASM_RISCV) && __riscv_xlen == 64
/* RISCV */
/* RISCV defaults; gmult already set above */
ctx->ghash = NULL;
if (RISCV_HAS_ZBB() && RISCV_HAS_ZBC()) {
ctx->ginit = gcm_init_clmul_rv64i_zbb_zbc;
ctx->gmult = gcm_gmult_clmul_rv64i_zbb_zbc;
}
return;
#endif
#if defined(__s390__) || defined(__s390x__)
#elif defined(GHASH_ASM)
/* all other architectures use the generic names */
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
return;