3 files changed, 40 insertions, 20 deletions

diff --git a/src/lib/libcrypto/sha/sha1.c b/src/lib/libcrypto/sha/sha1.c
index 52338812db..ab05709818 100644
--- a/src/lib/libcrypto/sha/sha1.c
+++ b/src/lib/libcrypto/sha/sha1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha1.c,v 1.15 2024/06/01 07:36:16 tb Exp $ */
+/* $OpenBSD: sha1.c,v 1.16 2025/02/14 12:01:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,11 +71,10 @@
 /* Ensure that SHA_LONG and uint32_t are equivalent sizes. */
 CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t));
 
-#ifdef SHA1_ASM
 void sha1_block_data_order(SHA_CTX *ctx, const void *p, size_t num);
-#endif
+void sha1_block_generic(SHA_CTX *ctx, const void *p, size_t num);
 
-#ifndef SHA1_ASM
+#ifndef HAVE_SHA1_BLOCK_GENERIC
 static inline SHA_LONG
 Ch(SHA_LONG x, SHA_LONG y, SHA_LONG z)
 {
@@ -164,8 +163,8 @@ sha1_round4(SHA_LONG *a, SHA_LONG *b, SHA_LONG *c, SHA_LONG *d, SHA_LONG *e,
         *a = T;
 }
 
-static void
-sha1_block_data_order(SHA_CTX *ctx, const void *_in, size_t num)
+void
+sha1_block_generic(SHA_CTX *ctx, const void *_in, size_t num)
 {
         const uint8_t *in = _in;
         const SHA_LONG *in32;
@@ -382,6 +381,14 @@ sha1_block_data_order(SHA_CTX *ctx, const void *_in, size_t num)
 }
 #endif
 
+#ifndef HAVE_SHA1_BLOCK_DATA_ORDER
+void
+sha1_block_data_order(SHA_CTX *ctx, const void *_in, size_t num)
+{
+        sha1_block_generic(ctx, _in, num);
+}
+#endif
+
 int
 SHA1_Init(SHA_CTX *c)
 {
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c
index ab00c17878..5d002ca62c 100644
--- a/src/lib/libcrypto/sha/sha256.c
+++ b/src/lib/libcrypto/sha/sha256.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha256.c,v 1.32 2024/06/01 07:36:16 tb Exp $ */
+/* $OpenBSD: sha256.c,v 1.33 2025/02/14 12:01:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -68,11 +68,10 @@
 /* Ensure that SHA_LONG and uint32_t are equivalent. */
 CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t));
 
-#ifdef SHA256_ASM
 void sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num);
-#endif
+void sha256_block_generic(SHA256_CTX *ctx, const void *_in, size_t num);
 
-#ifndef SHA256_ASM
+#ifndef HAVE_SHA256_BLOCK_GENERIC
 static const SHA_LONG K256[64] = {
         0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
         0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
@@ -155,8 +154,8 @@ sha256_round(SHA_LONG *a, SHA_LONG *b, SHA_LONG *c, SHA_LONG *d, SHA_LONG *e,
         *a = T1 + T2;
 }
 
-static void
-sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num)
+void
+sha256_block_generic(SHA256_CTX *ctx, const void *_in, size_t num)
 {
         const uint8_t *in = _in;
         const SHA_LONG *in32;
@@ -277,7 +276,15 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num)
                 ctx->h[7] += h;
         }
 }
-#endif /* SHA256_ASM */
+#endif
+
+#ifndef HAVE_SHA256_BLOCK_DATA_ORDER
+void
+sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num)
+{
+        sha256_block_generic(ctx, _in, num);
+}
+#endif
 
 int
 SHA224_Init(SHA256_CTX *c)
diff --git a/src/lib/libcrypto/sha/sha512.c b/src/lib/libcrypto/sha/sha512.c
index 7a2a40d3df..43d25eb119 100644
--- a/src/lib/libcrypto/sha/sha512.c
+++ b/src/lib/libcrypto/sha/sha512.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha512.c,v 1.42 2024/06/01 07:36:16 tb Exp $ */
+/* $OpenBSD: sha512.c,v 1.43 2025/02/14 12:01:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -69,11 +69,10 @@
 /* Ensure that SHA_LONG64 and uint64_t are equivalent. */
 CTASSERT(sizeof(SHA_LONG64) == sizeof(uint64_t));
 
-#ifdef SHA512_ASM
 void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
-#endif
+void sha512_block_generic(SHA512_CTX *ctx, const void *in, size_t num);
 
-#ifndef SHA512_ASM
+#ifndef HAVE_SHA512_BLOCK_GENERIC
 static const SHA_LONG64 K512[80] = {
         U64(0x428a2f98d728ae22), U64(0x7137449123ef65cd),
         U64(0xb5c0fbcfec4d3b2f), U64(0xe9b5dba58189dbbc),
@@ -182,8 +181,8 @@ sha512_round(SHA_LONG64 *a, SHA_LONG64 *b, SHA_LONG64 *c, SHA_LONG64 *d,
         *a = T1 + T2;
 }
 
-static void
-sha512_block_data_order(SHA512_CTX *ctx, const void *_in, size_t num)
+void
+sha512_block_generic(SHA512_CTX *ctx, const void *_in, size_t num)
 {
         const uint8_t *in = _in;
         const SHA_LONG64 *in64;
@@ -304,8 +303,15 @@ sha512_block_data_order(SHA512_CTX *ctx, const void *_in, size_t num)
                 ctx->h[7] += h;
         }
 }
+#endif
 
-#endif /* SHA512_ASM */
+#ifndef HAVE_SHA512_BLOCK_DATA_ORDER
+void
+sha512_block_data_order(SHA512_CTX *ctx, const void *_in, size_t num)
+{
+        sha512_block_generic(ctx, _in, num);
+}
+#endif
 
 int
 SHA384_Init(SHA512_CTX *c)