packages/libxcrypt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix build error

Browse Source 
Change-Id: Ic7c2f53f0ef651c57ab46ed6cfa9c19d4f68f13f
This commit is contained in:
Chenxi Mao 2023-06-08 09:53:17 +08:00
parent 50c0fd8a3c
commit 84b46c9c65
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-Fix-warning-about-signed-unsigned-conversion.patch Normal file
View File

@ -0,0 +1,25 @@
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 1/1] Fix warning about signed->unsigned conversion
---
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.33.0

25
0001-Fix-warning-about-truncating-conversion.patch Normal file
View File

@ -0,0 +1,25 @@
From 239664bf18fc2bc093d8dbaa1fb0a0307651897f Mon Sep 17 00:00:00 2001
From: Moinak Bhattacharyya <moinakb001@gmail.com>
Date: Mon, 7 Nov 2022 03:40:23 -0600
Subject: [PATCH 1/1] Fix warning about truncating conversion
---
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 60a6ccd..dacc73b 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 = x = EXTRACT64(X) & Smask2reg; \
+ uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
FORCE_REGALLOC_2 \
uint32_t hi = x >> 32; \
X = _mm_mul_epu32(HI32(X), X); \
--
2.33.0

2
libxcrypt.spec
View File

@ -13,6 +13,8 @@ Source0: https://github.com/besser82/%{name}/archive/v%{version}.tar.gz
Patch9000: add-sm3-crypt-support.patch
Patch9001: libxcrypt-4.4.26-sw.patch
Patch9002: 0001-Fix-warning-about-truncating-conversion.patch
Patch9003: 0001-Fix-warning-about-signed-unsigned-conversion.patch
BuildRequires: autoconf libtool fipscheck
BuildRequires: perl >= 5.14.0