From fd19eff2f98d72aee359ddccbf890bac0361fb66 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 27 Jun 2025 17:26:57 +0000
Subject: Simplify EVP AES-GCM implementation and remove AES-NI specific code.

Like CTR, the mode implementation for GCM has two variants - rather than
using multiple variants (one for AES-NI, another for non-AES-NI),
consistently use CRYPTO_gcm128_{en,de}crypt_ctr32() with the
aes_ctr32_encrypt_internal() function added for CTR mode.

This lets us remove the AES-NI specific code, AES-NI specific EVP_CIPHER
methods and the ctr function pointer from EVP_AES_GCM_CTX.

ok tb@
---
 src/lib/libcrypto/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/Makefile')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 3ad03831f8..a33a209ef7 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.237 2025/05/25 06:27:02 jsing Exp $
+# $OpenBSD: Makefile,v 1.238 2025/06/27 17:26:57 jsing Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -25,6 +25,7 @@ CFLAGS+= -DLIBRESSL_NAMESPACE -DLIBRESSL_CRYPTO_NAMESPACE
 CFLAGS+= -DHAVE_FUNOPEN
 
 CFLAGS+= -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/aes
 CFLAGS+= -I${LCRYPTO_SRC}/arch/${MACHINE_CPU}
 CFLAGS+= -I${LCRYPTO_SRC}/asn1
 CFLAGS+= -I${LCRYPTO_SRC}/bio
-- 
cgit v1.2.3-55-g6feb