rpms/libxcrypt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport another upstream patch for a conversion fix

Browse Source
This commit is contained in:
Björn Esser 2022-11-08 12:14:23 +01:00
parent 100ee226b6
commit e4dc5a1aba
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0005-Fix-warning-about-signed-unsigned-conversion.patch Normal file
View File

@ -0,0 +1,29 @@
From 17cf4ce8af5a2a1af4c0f52260019cbae01835b8 Mon Sep 17 00:00:00 2001
From: Moinak Bhattacharyya <moinakb001@gmail.com>
Date: Tue, 8 Nov 2022 04:37:13 -0600
Subject: [PATCH 5/5] Fix warning about signed->unsigned conversion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
---
lib/alg-yescrypt-opt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
index dacc73b..a33c6e4 100644
--- a/lib/alg-yescrypt-opt.c
+++ b/lib/alg-yescrypt-opt.c
@@ -514,7 +514,7 @@ static volatile uint64_t Smask2var = Smask2;
#define PWXFORM_SIMD(X) { \
uint64_t x; \
FORCE_REGALLOC_1 \
- uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
+ uint32_t lo = (uint32_t)(x = ((uint64_t)EXTRACT64(X)) & Smask2reg); \
FORCE_REGALLOC_2 \
uint32_t hi = x >> 32; \
X = _mm_mul_epu32(HI32(X), X); \
--
2.38.1

6
libxcrypt.spec
View File

@ -158,7 +158,7 @@ fi \
Name: libxcrypt
Version: 4.4.30
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others
# For explicit license breakdown, see the
@ -174,6 +174,7 @@ Source3: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.s
Patch0000: 0002-Fix-warning-about-truncating-conversion.patch
Patch0001: 0003-alg-sha256.c-SHA-2-Maj-optimization-proposed-by-Wei-.patch
Patch0002: 0004-test-getrandom-fallback.c-Fix-OVERRUN-found-by-Covsc.patch
Patch0003: 0005-Fix-warning-about-signed-unsigned-conversion.patch
# Patch 3000 - 5999: Backported patches from pull requests.
@ -557,6 +558,9 @@ done
%changelog
* Tue Nov 08 2022 Björn Esser <besser82@fedoraproject.org> - 4.4.30-3
- Backport another upstream patch for a conversion fix
* Tue Nov 08 2022 Björn Esser <besser82@fedoraproject.org> - 4.4.30-2
- Backport some upstream patches for fixes and optimizations
- Explicitly disable arc4random_buf in all_possible_tests configuration