Replace GHASH_ASM with function specific defines.

Use the same pattern that is now used for most other code - provide HAVE_*
defines for functions and use these to selectively enable source code.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 27c61edf58..49f2f6e627 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.43 2026/01/17 13:55:30 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.44 2026/01/17 14:30:37 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -48,7 +48,6 @@ CFLAGS+= -DMD5_ASM
 SRCS+= md5_amd64_generic.S
 
 # modes
-CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-x86_64
 SRCS += gcm128_amd64.c
 
diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h
index 9a179a571e..fdc17b8110 100644
--- a/src/lib/libcrypto/arch/amd64/crypto_arch.h
+++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: crypto_arch.h,v 1.15 2025/09/08 12:56:17 jsing Exp $ */
+/*      $OpenBSD: crypto_arch.h,v 1.16 2026/01/17 14:30:37 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -49,6 +49,8 @@ extern uint64_t crypto_cpu_caps_amd64;
 #define HAVE_AES_XTS_ENCRYPT_INTERNAL
 
 #define HAVE_GCM128_INIT
+#define HAVE_GCM_GHASH_4BIT
+#define HAVE_GCM_GMULT_4BIT
 
 #define HAVE_RC4_INTERNAL
 #define HAVE_RC4_SET_KEY_INTERNAL