Merge pull request #9335 from heitbaum/busybox

busybox: fix not x86 builds with 1.37.0
This commit is contained in:
Jernej Škrabec 2024-09-29 20:44:54 +02:00 committed by GitHub
commit fa9cd1bf80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -0,0 +1,27 @@
From ca2cc021326f3f846ead76675c419942633819f2 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 29 Sep 2024 17:45:43 +0000
Subject: [PATCH] tls: fix not x86: fix CONFIG_FEATURE_TLS_SHA1=y +
CONFIG_SHA1_HWACCEL=y
---
libbb/hash_md5_sha.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 57a801459..75a61c32c 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf)
hash_size = 8;
if (ctx->process_block == sha1_process_block64
#if ENABLE_SHA1_HWACCEL
+# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|| ctx->process_block == sha1_process_block64_shaNI
+# endif
#endif
) {
hash_size = 5;
--
2.43.0