New upstream release
This commit is contained in:
Björn Esser
parent
36f60dc662
commit
80db03d98d
@ -1,54 +0,0 @@
|
||||
From 59823543d095ad0fe4a063d819c52953249c9ba0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Wed, 7 Dec 2022 07:04:51 +0100
|
||||
Subject: [PATCH] alg-sha512.c: SHA-2 Maj() optimization proposed by Wei Dai.
|
||||
|
||||
This patch has already been applied to 'lib/alg-sha256.c'
|
||||
in commit bb1721800932268a537c804a4b7655af8c62d5e8.
|
||||
---
|
||||
lib/alg-sha512.c | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/alg-sha512.c b/lib/alg-sha512.c
|
||||
index c30f8a0..4e9965d 100644
|
||||
--- a/lib/alg-sha512.c
|
||||
+++ b/lib/alg-sha512.c
|
||||
@@ -1,6 +1,7 @@
|
||||
/*-
|
||||
* Copyright 2005 Colin Percival
|
||||
* Copyright (c) 2015 Allan Jude <allanjude@FreeBSD.org>
|
||||
+ * Copyright 2021, 2022 Alexander Peslyak
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -78,7 +79,11 @@ static const uint64_t K[80] = {
|
||||
|
||||
/* Elementary functions used by SHA512 */
|
||||
#define Ch(x, y, z) ((x & (y ^ z)) ^ z)
|
||||
-#define Maj(x, y, z) ((x & (y | z)) | (y & z))
|
||||
+#if 1 /* Explicit caching/reuse of common subexpression between rounds */
|
||||
+#define Maj(x, y, z) (y ^ ((x_xor_y = x ^ y) & y_xor_z))
|
||||
+#else /* Let the compiler cache/reuse or not */
|
||||
+#define Maj(x, y, z) (y ^ ((x ^ y) & (y ^ z)))
|
||||
+#endif
|
||||
#define SHR(x, n) (x >> n)
|
||||
#define ROTR(x, n) ((x >> n) | (x << (64 - n)))
|
||||
#define S0(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
|
||||
@@ -90,7 +95,8 @@ static const uint64_t K[80] = {
|
||||
#define RND(a, b, c, d, e, f, g, h, k) \
|
||||
h += S1(e) + Ch(e, f, g) + k; \
|
||||
d += h; \
|
||||
- h += S0(a) + Maj(a, b, c);
|
||||
+ h += S0(a) + Maj(a, b, c); \
|
||||
+ y_xor_z = x_xor_y;
|
||||
|
||||
/* Adjusted round function for rotating state */
|
||||
#define RNDr(S, W, i, ii) \
|
||||
@@ -123,6 +129,7 @@ SHA512_Transform(uint64_t * state, const unsigned char block[SHA512_BLOCK_LENGTH
|
||||
|
||||
/* 3. Mix. */
|
||||
for (i = 0; i < 80; i += 16) {
|
||||
+ uint64_t x_xor_y, y_xor_z = S[(65 - i) % 8] ^ S[(66 - i) % 8];
|
||||
RNDr(S, W, 0, i);
|
||||
RNDr(S, W, 1, i);
|
||||
RNDr(S, W, 2, i);
|
||||
@ -1,23 +0,0 @@
|
||||
From 9d5e7b7307f264c2d177a1f014fa3a3b9da524df Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Sun, 20 Nov 2022 09:57:15 +0100
|
||||
Subject: [PATCH] alg-yescrypt-platform.c: Optimize some cast operation for
|
||||
performance.
|
||||
|
||||
---
|
||||
lib/alg-yescrypt-platform.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/alg-yescrypt-platform.c b/lib/alg-yescrypt-platform.c
|
||||
index d68af2d..fbad1dc 100644
|
||||
--- a/lib/alg-yescrypt-platform.c
|
||||
+++ b/lib/alg-yescrypt-platform.c
|
||||
@@ -59,7 +59,7 @@ static void *alloc_region(yescrypt_region_t *region, size_t size)
|
||||
if (base != MAP_FAILED) {
|
||||
base_size = new_size;
|
||||
} else if (flags & MAP_HUGETLB) {
|
||||
- flags &= (unsigned int)~(MAP_HUGETLB | MAP_HUGE_2MB);
|
||||
+ flags &= ~(unsigned int)(MAP_HUGETLB | MAP_HUGE_2MB);
|
||||
base = mmap(NULL, size, PROT_READ | PROT_WRITE, (int)flags, -1, 0);
|
||||
}
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmN3044ACgkQ9S6YAHWU
|
||||
wh32zQ/+Kkw7VpFYVhgkfYfmyS/08LCp6EMYHhLP8OxMxFqRxA3boSGJll4GFTU9
|
||||
/+UiWpnFs/3prr+0w9WiF4iK8A230urzMVwql1y2KvUvoHOxtagBdtBjP0pxzSJc
|
||||
MWR9cXNMTRLQFrADov+1lrrZr+fHPs5bVcLa8THD9TGBRXN8RUg1Yt6RGyJX+fsd
|
||||
Gf72yfQh9lKZEzf42zd9wUE9zkEEeUoHh4gOvy6EYVvjSoQnM7l5Vs3nP9XVJpvi
|
||||
RxFvioeo32JSebvFV+yLx62SSQaJfMIqP7xHtrCQS41VbGxqd/N411z+9q+bQEWi
|
||||
cwytUDKSbM8ax1Bqj4EQeCulLMuLZF/hNY9abzzfYWlVYQktYaE+/ZVubOF8Ng/k
|
||||
IZ2WBZCq2U2lOrxEJCSrZ7php6XXIq+dEEcsUXXCLQZjfOn/8tdsXblp3eFF6XIh
|
||||
Xf+UDW8BEKXcE1EFqMwf2Vsd4sBd9qsqEaHiDhz6AW+3qz1QcGIBtYjAKv0bo2Vi
|
||||
CGX/ggtEHruff0PVwRC+ALo6bHW+R/q54rWA3+cPBm7nGqQkJib42UJDyHvCziw6
|
||||
OWZgYY6Prac+jPu8TIZelIBmM+lS0kvCAvREUf1Ec9I1iYkG9kboA80gvOx2smfB
|
||||
vWcTAr/NqYZF3CmkIz3t606n6FrXnKudAiWN6si+HEHsY6efw8o=
|
||||
=zK1h
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,2 +0,0 @@
|
||||
e87acf9c652c573a4713d5582159f98f305d56ed5f754ce64f57d4194d6b3a6f libxcrypt-4.4.33.tar.xz
|
||||
23347dc4535e050ef0ca4f0f95b3d95625c868c876fdca0d341412eb1871e0b3 libxcrypt-4.4.33.tar.xz.asc
|
||||
16
libxcrypt-4.4.34.tar.xz.asc
Normal file
16
libxcrypt-4.4.34.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmR3X68ACgkQ9S6YAHWU
|
||||
wh0u7w/8CSUiyC8p/USH09zcfK1T3UXBtYECL9gX1lG4jwNhR0gKDhPVRJokU6ot
|
||||
50qfI9zHoHoFJbtfoIS8rynEnfjO6CFIqAJ81B0EINUFnyPb0lar0YoI5KRdGw/3
|
||||
aq+IepAqjhvjP1X6ljNr/XsDeHcLUjqQlMtJLnZzm2sej4McQ5hpK96V859lXWB0
|
||||
yG5hccIfd0UIaTzkftYIhSEY1ovYqoaJbVurShbiqBEsoH1SplEucyJYhQ3/wsfh
|
||||
p2YWJ4n5EwqouYPyp5VMT8JLTvAkfKfcaFmbRs9j4clnX8MKgi9rpibi9HoesPep
|
||||
1/r7RK0r0XjKr3NvIDIlVrFlGIcgu7uzZ6rSP4v4+5jqyYk1WgiDP1+N1mHiGZkw
|
||||
WTFuTsJDEofqMloOeRTm2cekrlyZ82TjgAqlJxY1YsJOkk+zIJb9HNaqyfmehztv
|
||||
qE2IWVTli8wvEOFwLWsovRTpm2nLe83mcJuSrgRFtSmlrYVPLMoJnzslMVx/Lmw1
|
||||
9dO88u3A1oJF5tB61/DfobQxOtoPm3FvFPLVGnyoDFz6KqCxLitVHW/Nv+0eR5kL
|
||||
0W6FegN0vSln/9HA0kbBlrZgWtdxEqyY1OPS1SWqwN+nTCCq0U9qTwsE+BYlfa6j
|
||||
0fGlrnd5qoQjn6Lldjr0qhE8o+7Z0TbohPMf4cj0mBGlNitJvGQ=
|
||||
=e7kw
|
||||
-----END PGP SIGNATURE-----
|
||||
2
libxcrypt-4.4.34.tar.xz.sha256sum
Normal file
2
libxcrypt-4.4.34.tar.xz.sha256sum
Normal file
@ -0,0 +1,2 @@
|
||||
bb3f467af21c48046ce662186eb2ddf078ca775c441fdf1c3628448a3833a230 libxcrypt-4.4.34.tar.xz
|
||||
2cf8ea88663db5ae888fef601049659e13196f7db2082358a7e72b113bd609b8 libxcrypt-4.4.34.tar.xz.asc
|
||||
@ -167,8 +167,8 @@ fi \
|
||||
|
||||
|
||||
Name: libxcrypt
|
||||
Version: 4.4.33
|
||||
Release: 7%{?dist}
|
||||
Version: 4.4.34
|
||||
Release: 1%{?dist}
|
||||
Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others
|
||||
|
||||
# For explicit license breakdown, see the
|
||||
@ -181,8 +181,6 @@ Source2: %{url}/releases/download/v%{version}/%{name}-gpgkey.gpg
|
||||
Source3: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.sha256sum
|
||||
|
||||
# Patch 0000 - 2999: Backported patches from upstream.
|
||||
Patch0000: %{url}/commit/9d5e7b7307f2.patch#/%{name}-4.4.33-yescrypt_platform_cast_performance.patch
|
||||
Patch0001: %{url}/commit/59823543d095.patch#/%{name}-4.4.33-SHA512_Maj_optimization.patch
|
||||
|
||||
# Patch 3000 - 5999: Backported patches from pull requests.
|
||||
|
||||
@ -586,6 +584,9 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 31 2023 Björn Esser <besser82@fedoraproject.org> - 4.4.34-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Jan 21 2023 Björn Esser <besser82@fedoraproject.org> - 4.4.33-7
|
||||
- Run autoreconf during %%prep
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (libxcrypt-4.4.33.tar.xz) = b46d226a83d35b578381aa340e34cd77aea25a304aec3d00ba3d3acb6462e96824ff82ea930aaf2b87039dfffef4dab4b1774736d6b8a107cfb61e6cdb307b99
|
||||
SHA512 (libxcrypt-4.4.34.tar.xz) = b315ee5574c80f212f0a38a10993ac4abd7241eddbc8314edc00cdd96c9a1d79c9bfbfcee53b2baa6962524628e84457e303578fd358d4ddd42f429de434908a
|
||||
SHA512 (libxcrypt-gpgkey.gpg) = 723ce5d76676e4366959e03850f8814d5b30f8b20a39629f0ccff61bb2b2bef64223fd78e719ad23d7dd272ca6c0177089749f9b508099d56750a8bb466d006c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user