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

update patch to remove function declare in header file

Browse Source 
Signed-off-by: xuraoqing <xuraoqing@huawei.com>
This commit is contained in:
xuraoqing 2024-03-26 19:29:48 +08:00
parent d09afe28be
commit 09bc14916a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backport-fix-CVE-2024-28834-nettle-avoid-normalization-of-mpz_t-in-deterministic.patch
View File

@ -22,10 +22,10 @@ Conflict: lib/nettle/pk.c,
lib/nettle/int/dsa-compute-k.c | 82 ++++++++++++++++++++----------- lib/nettle/int/dsa-compute-k.c | 82 ++++++++++++++++++++-----------
lib/nettle/int/dsa-compute-k.h | 31 +++++++++--- lib/nettle/int/dsa-compute-k.h | 31 +++++++++---
lib/nettle/int/ecdsa-compute-k.c | 33 +++---------- lib/nettle/int/ecdsa-compute-k.c | 33 +++----------
lib/nettle/int/ecdsa-compute-k.h | 1 + lib/nettle/int/ecdsa-compute-k.h | 8 +--
lib/nettle/pk.c | 79 +++++++++++++++++++---------- lib/nettle/pk.c | 79 +++++++++++++++++++----------
tests/sign-verify-deterministic.c | 2 +- tests/sign-verify-deterministic.c | 2 +-
6 files changed, 138 insertions(+), 90 deletions(-) 6 files changed, 138 insertions(+), 97 deletions(-)
diff --git a/lib/nettle/int/dsa-compute-k.c b/lib/nettle/int/dsa-compute-k.c diff --git a/lib/nettle/int/dsa-compute-k.c b/lib/nettle/int/dsa-compute-k.c
index 17d6331..649a194 100644 index 17d6331..649a194 100644
@ -278,13 +278,20 @@ index 94914eb..d98f246 100644
- return ret; - return ret;
-} -}
diff --git a/lib/nettle/int/ecdsa-compute-k.h b/lib/nettle/int/ecdsa-compute-k.h diff --git a/lib/nettle/int/ecdsa-compute-k.h b/lib/nettle/int/ecdsa-compute-k.h
index 7ca401d..593910a 100644 index 7ca401d..a7e612b 100644
--- a/lib/nettle/int/ecdsa-compute-k.h --- a/lib/nettle/int/ecdsa-compute-k.h
+++ b/lib/nettle/int/ecdsa-compute-k.h +++ b/lib/nettle/int/ecdsa-compute-k.h
@@ -33,5 +33,6 @@ _gnutls_ecdsa_compute_k (mpz_t k, @@ -26,12 +26,6 @@
gnutls_mac_algorithm_t mac, #include <gnutls/gnutls.h>
const uint8_t *digest, #include <nettle/bignum.h> /* includes gmp.h */
size_t length);
-int
-_gnutls_ecdsa_compute_k (mpz_t k,
- gnutls_ecc_curve_t curve,
- const mpz_t x,
- gnutls_mac_algorithm_t mac,
- const uint8_t *digest,
- size_t length);
+int _gnutls_ecc_curve_to_dsa_q(mpz_t q, gnutls_ecc_curve_t curve); +int _gnutls_ecc_curve_to_dsa_q(mpz_t q, gnutls_ecc_curve_t curve);
#endif /* GNUTLS_LIB_NETTLE_INT_ECDSA_COMPUTE_K_H */ #endif /* GNUTLS_LIB_NETTLE_INT_ECDSA_COMPUTE_K_H */

5
gnutls.spec
View File

@ -1,6 +1,6 @@
Name: gnutls Name: gnutls
Version: 3.7.2 Version: 3.7.2
Release: 12 Release: 13
Summary: The GNU Secure Communication Protocol Library Summary: The GNU Secure Communication Protocol Library
License: LGPLv2.1+ and GPLv3+ License: LGPLv2.1+ and GPLv3+
@ -224,6 +224,9 @@ make check %{?_smp_mflags}
%endif %endif
%changelog %changelog
* Tue Mar 26 2024 xuraoqing <xuraoqing@huawei.com> - 3.7.2-13
- update patch to remove function declare in header file
* Sat Mar 23 2024 xuraoqing <xuraoqing@huawei.com> - 3.7.2-12 * Sat Mar 23 2024 xuraoqing <xuraoqing@huawei.com> - 3.7.2-12
- fix CVE-2024-28834 - fix CVE-2024-28834