From: Todd Short <tshort@akamai.com>
Date: Wed, 20 Jul 2022 15:06:59 +0000 (-0400)
Subject: Clean up use of GHASH macro
X-Git-Tag: openssl-3.2.0-alpha1~2344
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95201ef45711220455e8abf1cc6b334393384af2;p=thirdparty%2Fopenssl.git

Clean up use of GHASH macro

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18835)
---

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 4a1492fc9ad..a53dcb6e41a 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -326,7 +326,7 @@ void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16], const u8 *inp,
 
 # define GCM_MUL(ctx)      gcm_gmult_4bit(ctx->Xi.u,ctx->Htable)
 # if defined(GHASH_ASM) || !defined(OPENSSL_SMALL_FOOTPRINT)
-#  define GHASH(ctx,in,len) gcm_ghash_4bit((ctx)->Xi.u,(ctx)->Htable,in,len)
+#  define GHASH(ctx,in,len) ctx->funcs.ghash((ctx)->Xi.u,(ctx)->Htable,in,len)
 /*
  * GHASH_CHUNK is "stride parameter" missioned to mitigate cache trashing
  * effect. In other words idea is to hash data while it's still in L1 cache
@@ -416,10 +416,6 @@ void gcm_gmult_clmul_rv64i_zbb_zbc(u64 Xi[2], const u128 Htable[16]);
 #ifdef GCM_FUNCREF_4BIT
 # undef  GCM_MUL
 # define GCM_MUL(ctx)           (*gcm_gmult_p)(ctx->Xi.u,ctx->Htable)
-# ifdef GHASH
-#  undef  GHASH
-#  define GHASH(ctx,in,len)     (*gcm_ghash_p)(ctx->Xi.u,ctx->Htable,in,len)
-# endif
 #endif
 
 static void gcm_get_funcs(struct gcm_funcs_st *ctx)
@@ -642,9 +638,6 @@ int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
     u64 alen = ctx->len.u[0];
 #ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-# ifdef GHASH
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-# endif
 #endif
 
     if (ctx->len.u[1])
@@ -706,9 +699,6 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
     void *key = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-# if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-# endif
 #endif
 
     mlen += len;
@@ -937,9 +927,6 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
     void *key = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-# if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-# endif
 #endif
 
     mlen += len;
@@ -1178,9 +1165,6 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
     void *key = ctx->key;
 # ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-#  ifdef GHASH
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-#  endif
 # endif
 
     mlen += len;
@@ -1338,9 +1322,6 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
     void *key = ctx->key;
 # ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-#  ifdef GHASH
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-#  endif
 # endif
 
     mlen += len;
@@ -1499,9 +1480,6 @@ int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
     u64 clen = ctx->len.u[1] << 3;
 #ifdef GCM_FUNCREF_4BIT
     gcm_gmult_fn gcm_gmult_p = ctx->funcs.gmult;
-# if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)
-    gcm_ghash_fn gcm_ghash_p = ctx->funcs.ghash;
-# endif
 #endif
 
 #if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)