From 0aab45657f4c617cb7e482a6b1e8ab0103e3f7f6 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 25 Apr 2025 12:08:53 +0000
Subject: Restore two #if defined(GHASH) that were incorrectly removed.

Also condition on defined(GHASH_CHUNK) since this is used within these
blocks. This makes the conditionals consistent with other usage.

Fixes build with TABLE_BITS == 1.
---
 src/lib/libcrypto/modes/gcm128.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c
index 1e925f2a1f..21ba9eef57 100644
--- a/src/lib/libcrypto/modes/gcm128.c
+++ b/src/lib/libcrypto/modes/gcm128.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gcm128.c,v 1.34 2025/04/25 08:26:57 jsing Exp $ */
+/* $OpenBSD: gcm128.c,v 1.35 2025/04/25 12:08:53 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -1093,7 +1093,7 @@ CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 			return 0;
 		}
 	}
-
+#if defined(GHASH) && defined(GHASH_CHUNK)
 	while (len >= GHASH_CHUNK) {
 		(*stream)(in, out, GHASH_CHUNK/16, key, ctx->Yi.c);
 		ctr += GHASH_CHUNK/16;
@@ -1103,7 +1103,7 @@ CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 		in += GHASH_CHUNK;
 		len -= GHASH_CHUNK;
 	}
-
+#endif
 	if ((i = (len & (size_t)-16))) {
 		size_t j = i/16;
 
@@ -1185,7 +1185,7 @@ CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 			return 0;
 		}
 	}
-
+#if defined(GHASH) && defined(GHASH_CHUNK)
 	while (len >= GHASH_CHUNK) {
 		GHASH(ctx, in, GHASH_CHUNK);
 		(*stream)(in, out, GHASH_CHUNK/16, key, ctx->Yi.c);
@@ -1195,7 +1195,7 @@ CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 		in += GHASH_CHUNK;
 		len -= GHASH_CHUNK;
 	}
-
+#endif
 	if ((i = (len & (size_t)-16))) {
 		size_t j = i/16;
 
-- 
cgit v1.2.3-55-g6feb