summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2023-03-29 15:17:00 +0200
committerDenys Vlasenko2023-03-29 15:17:00 +0200
commitbd76b75f72f717150b909e8c64edfda725cabe11 (patch)
tree9192bd8526a07bd77e5700f4688ead9c65f22cc6 /libbb
parent3253d7fe0097ff15797ee4918e927b0c9d6863a9 (diff)
downloadbusybox-bd76b75f72f717150b909e8c64edfda725cabe11.zip
busybox-bd76b75f72f717150b909e8c64edfda725cabe11.tar.gz
libbb/sha: fix sha-NI instruction detection
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/hash_md5_sha.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 880ffab..bbe58c7 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -1178,7 +1178,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
if (!shaNI) {
unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
cpuid(&eax, &ebx, &ecx, &edx);
- shaNI = ((ebx >> 29) << 1) - 1;
+ shaNI = ((ebx >> 28) & 2) - 1; /* bit 29 -> 1 or -1 */
}
if (shaNI > 0)
ctx->process_block = sha1_process_block64_shaNI;
@@ -1232,7 +1232,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
if (!shaNI) {
unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
cpuid(&eax, &ebx, &ecx, &edx);
- shaNI = ((ebx >> 29) << 1) - 1;
+ shaNI = ((ebx >> 28) & 2) - 1; /* bit 29 -> 1 or -1 */
}
if (shaNI > 0)
ctx->process_block = sha256_process_block64_shaNI;