Replace Makefile based SHA*_ASM defines with HAVE_SHA_* defines.

Currently, SHA{1,256,512}_ASM defines are used to remove the C
implementation of sha{1,256,512}_block_data_order() when it is provided
by assembly. However, this prevents the C implementation from being used
as a fallback.

Rename the C sha*_block_data_order() to sha*_block_generic() and provide
a sha*_block_data_order() that calls sha*_block_generic(). Replace the
Makefile based SHA*_ASM defines with two HAVE_SHA_* defines that allow
these functions to be compiled in or removed, such that machine specific
verisons can be provided. This should effectively be a no-op on any
platform that defined SHA{1,256,512}_ASM.

ok tb@

2 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index b09b54a564..e078c51d98 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -12,11 +12,8 @@ SSLASM+= bn armv4-mont
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-armv4
 # sha
-CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-armv4-large
-CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha256-armv4
-CFLAGS+= -DSHA512_ASM
 SSLASM+= sha sha512-armv4
 
 .for dir f in ${SSLASM}
diff --git a/src/lib/libcrypto/arch/arm/crypto_arch.h b/src/lib/libcrypto/arch/arm/crypto_arch.h
index 4276dc31ea..07d7829fe3 100644
--- a/src/lib/libcrypto/arch/arm/crypto_arch.h
+++ b/src/lib/libcrypto/arch/arm/crypto_arch.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: crypto_arch.h,v 1.1 2024/08/11 13:02:39 jsing Exp $ */
+/*      $OpenBSD: crypto_arch.h,v 1.2 2025/02/14 12:01:58 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -25,6 +25,15 @@
 #define HAVE_AES_ENCRYPT_INTERNAL
 #define HAVE_AES_DECRYPT_INTERNAL
 
+#define HAVE_SHA1_BLOCK_DATA_ORDER
+#define HAVE_SHA1_BLOCK_GENERIC
+
+#define HAVE_SHA256_BLOCK_DATA_ORDER
+#define HAVE_SHA256_BLOCK_GENERIC
+
+#define HAVE_SHA512_BLOCK_DATA_ORDER
+#define HAVE_SHA512_BLOCK_GENERIC
+
 #endif
 
 #endif