David Laing
50076c5031
Remove CVE patches now included upstream in 1.37.0: - CVE-2022-28391 (sockaddr2str/nslookup sanitization) - CVE-2022-48174 (shell segfault on malformed input) - CVE-2023-42363, CVE-2023-42364, CVE-2023-42365, CVE-2023-42366 (awk fixes) - tar TOCTOU symlink race condition Add patch to fix aarch64-linux build failure where sha1_process_block64_shaNI is x86-specific and needs architecture guards. Release notes: https://busybox.net/news.html Fix reference: https://lists.busybox.net/pipermail/busybox/2024-September/090943.html 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
25 lines
868 B
Diff
25 lines
868 B
Diff
From upstream commit fixing aarch64 build failure
|
|
|
|
The sha1_process_block64_shaNI function is x86-specific and needs
|
|
architecture guards to prevent undeclared function errors on ARM64
|
|
and other non-x86 platforms.
|
|
|
|
This fixes the compile error: 'sha1_process_block64_shaNI' undeclared
|
|
(first use in this function)
|
|
|
|
Reference: https://lists.busybox.net/pipermail/busybox/2024-September/090943.html
|
|
Upstream patch: https://www.mail-archive.com/busybox@busybox.net/msg29511.html
|
|
|
|
--- 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;
|