mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 05:36:38 +02:00
531e69840c
Not a lot of big changes in this release, mostly code shrinks and bug fixes here and there. Hence, I don't expect too much breakage. Most patches applied as is and didn't require any changes either. Nonetheless, I rebased the entire patchset and removed patches that were backported. The 0001-modutils-check-ELF-header-before-calling-finit_modul.patch should be superseded by an upstream modutils change which checks that if the loaded module file path ends in .ko and if not attempts to uncompress it first. Thereby preventing compressed modules to be passed to the kernel and causing a weird error to be emitted. Therefore, this patch was removed See: https://git.busybox.net/busybox/commit/?id=af5277f883e8fc2e0236aa9ecc5115ecaffd0ccb
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 11e8f6d75aa73cfab17345f42678d4df3c2a4053 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
|
|
Date: Thu, 5 Jan 2023 15:47:55 +0100
|
|
Subject: [PATCH] Hackfix to disable HW acceleration for MD5/SHA1 on x86
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This causes a direct segfault with musl libc.
|
|
|
|
See: http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
|
|
---
|
|
libbb/hash_md5_sha.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
|
|
index 57a801459..96e9731c4 100644
|
|
--- a/libbb/hash_md5_sha.c
|
|
+++ b/libbb/hash_md5_sha.c
|
|
@@ -14,7 +14,7 @@
|
|
#define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA)
|
|
|
|
#if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
|
|
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
|
+# if defined(__GNUC__) && defined(__x86_64__)
|
|
static void cpuid_eax_ebx_ecx(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
|
|
{
|
|
asm ("cpuid"
|
|
@@ -1191,7 +1191,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
|
|
ctx->total64 = 0;
|
|
ctx->process_block = sha1_process_block64;
|
|
#if ENABLE_SHA1_HWACCEL
|
|
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
|
+# if defined(__GNUC__) && defined(__x86_64__)
|
|
{
|
|
int ni = shaNI;
|
|
if (!ni)
|
|
@@ -1243,7 +1243,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
|
|
/*ctx->total64 = 0; - done by prepending two 32-bit zeros to init256 */
|
|
ctx->process_block = sha256_process_block64;
|
|
#if ENABLE_SHA256_HWACCEL
|
|
-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
|
+# if defined(__GNUC__) && defined(__x86_64__)
|
|
{
|
|
int ni = shaNI;
|
|
if (!ni)
|