From a72843bbe6e4c50077546036d1a5a35dde68f727c514ac195199e3d0a0fa355a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 26 May 2022 20:44:21 +0000 Subject: [PATCH] osc copypac from project:openSUSE:Factory package:gnutls revision:136, using expand OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=138 --- gnutls-3.7.4.tar.xz | 3 +++ gnutls-3.7.4.tar.xz.sig | Bin 0 -> 685 bytes gnutls-3.7.5.tar.xz | 3 --- gnutls-3.7.5.tar.xz.sig | Bin 685 -> 0 bytes gnutls-FIPS-PBKDF2-KAT-requirements.patch | 12 ++++++------ gnutls.changes | 21 --------------------- gnutls.spec | 22 +++++++++++----------- 7 files changed, 20 insertions(+), 41 deletions(-) create mode 100644 gnutls-3.7.4.tar.xz create mode 100644 gnutls-3.7.4.tar.xz.sig delete mode 100644 gnutls-3.7.5.tar.xz delete mode 100644 gnutls-3.7.5.tar.xz.sig diff --git a/gnutls-3.7.4.tar.xz b/gnutls-3.7.4.tar.xz new file mode 100644 index 0000000..2a5a64d --- /dev/null +++ b/gnutls-3.7.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f +size 6131772 diff --git a/gnutls-3.7.4.tar.xz.sig b/gnutls-3.7.4.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..5cd81fca7ec0c74f4565bbc97198bdb80ee1f7f57ef75721b263627155d02df1 GIT binary patch literal 685 zcmV;e0#f~mbp!ww3IH7zAp~7U%MW%m1*ZiyR`hyxrbx5-A`ArrVlyr80162ZdUd8q zv-u(n1fT%@6p|Gjsi!d%jZayHA(`cQ<>+~sy4$WtrhapJo4T(K0RXwd%q}q}Ybf;b z%vd1>kQOV+LR^s~^WXqaLUuumtqh3*GXwwu2ml=xAp}MuCBw9DG>4zaNo>{ygpSwd zm~jOHVlz7C0162Z)&+!)*XEdUbkz_26y8?IDiWQ~yL{S3<@MyX0J#&?!B!Hmkuqjr zVjSXJp&OyeF&uRa*1-ZjIZQ|HW5c4yp=uLm>WYU-Ib4Irr?CgoL7fZ1l$y6 z!bx4F4Jylhe5XS-;?wZ38V=L4I0Z)%$ zmHdQpnRXGHNa_UoPKj_Kdd5(Pc!UPKU8^0qG>GF{yJD%H&W;gP{`zG7$PG;qSKAr; Ty-KhOFJ<0WcXPu(BNiKNz}7%A literal 0 HcmV?d00001 diff --git a/gnutls-3.7.5.tar.xz b/gnutls-3.7.5.tar.xz deleted file mode 100644 index cf59d4d..0000000 --- a/gnutls-3.7.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad -size 6321392 diff --git a/gnutls-3.7.5.tar.xz.sig b/gnutls-3.7.5.tar.xz.sig deleted file mode 100644 index 364458a19665be2121ef820f922692dd6964726f8f94d9d334cb569870cd76e9..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmV;e0#f~mbp!ww3IH7zAp~7U%MW%m1*ZiyR`hyxrbx5-A`ArrVtojB0162ZdUd8q zv-u(nw*>(IQVa%7W49>fM5KR_wVg;cFShzNT&Y1NDK&B`xlr5W0RL^^JLh<|DKQ|4 z8}_{OUkD!EFGKQ54zaNo>{ygpSwd zm~jOHVtpTt0162Z)&+!)*XEdUsZ0<5K?NGDVyp9oAj!B=TrD?H!L(8*Fxq>^>+_!( zX?Ub3u#)1@-RqY>v88qw`^m_WEG1$14ofMBfgIz_MmE~pVIAV4$rQ@*RrX*D!`I~a!kAQ(04)dm?K94|16jz}> zv1Z;%Vph$#iMI-N{M`_yC1hz*#vMYUnlMTYmy4bktI6P3Mr)yVC+g%CeKykz{>=HV zND_ePY5}YAhh(x1+mAF^k=^mrDC$^YNHeZrP0JvfqT1%*6w;kw_ zR>R%#rt)OQ;Vb*ELgr&6HSR6|X#6dJvJQ16z>W?Tk(Q1ystr(LRrw!>!4qNj;~>G{y)@OgqHv11 Tgh%PbJ8f@0Zcx^u-OUEF diff --git a/gnutls-FIPS-PBKDF2-KAT-requirements.patch b/gnutls-FIPS-PBKDF2-KAT-requirements.patch index fc6bac4..21f767e 100644 --- a/gnutls-FIPS-PBKDF2-KAT-requirements.patch +++ b/gnutls-FIPS-PBKDF2-KAT-requirements.patch @@ -1,10 +1,10 @@ -Index: gnutls-3.7.5/lib/crypto-selftests.c +Index: gnutls-3.7.3/lib/crypto-selftests.c =================================================================== ---- gnutls-3.7.5.orig/lib/crypto-selftests.c -+++ gnutls-3.7.5/lib/crypto-selftests.c -@@ -3123,6 +3123,16 @@ const struct pbkdf2_vectors_st pbkdf2_sh - "\x84\xcf\x2b\x17\x34\x7e\xbc\x18\x00\x18\x1c\x4e\x2a\x1f" - "\xb8\xdd\x53\xe1\xc6\x35\x51\x8c\x7d\xac\x47\xe9"), +--- gnutls-3.7.3.orig/lib/crypto-selftests.c ++++ gnutls-3.7.3/lib/crypto-selftests.c +@@ -3112,6 +3112,16 @@ const struct pbkdf2_vectors_st pbkdf2_sh + "\x84\x1b\x51\xc9\xb3\x17\x6a\x27\x2b\xde\xbb\xa1\xd0\x78" + "\x47\x8f\x62\xb3\x97\xf3\x3c\x8d"), }, + /* Test vector extracted from https://dev.gnupg.org/source/libgcrypt/browse/master/cipher/kdf.c */ + { diff --git a/gnutls.changes b/gnutls.changes index 70efa12..0ff9c92 100644 --- a/gnutls.changes +++ b/gnutls.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Sat May 21 17:50:57 UTC 2022 - Andreas Stieger - -- update to 3.7.5: - * add options disable session ticket usage in TLS 1.2 because - it does not provide forward secrecy - * For TLS 1.3 where session tickets do provide forward secrecy, - the PFS priority string now only disables session tickets in - TLS 1.2. - * Future backward incompatibility: in the next major release of - GnuTLS those flag and modifier are planned to be removed - * gnutls-cli, gnutls-serv: Channel binding for printing - information has been changed from tls-unique to tls-exporter - as tls-unique is not supported in TLS 1.3. - * Certificate sanity checks has been enhanced to make gnutls - more RFC 5280 compliant: - * Removed 3DES from FIPS approved algorithms - * Optimized support for AES-SIV-CMAC algorithms - * libgnutls: HKDF and AES-GCM algorithms are now approved in - FIPS-140 mode when used in TLS - ------------------------------------------------------------------- Wed May 11 09:19:52 UTC 2022 - Marcus Meissner diff --git a/gnutls.spec b/gnutls.spec index 5b5d53c..1079524 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -36,7 +36,7 @@ %bcond_with tpm %bcond_without guile Name: gnutls -Version: 3.7.5 +Version: 3.7.4 Release: 0 Summary: The GNU Transport Layer Security Library License: GPL-3.0-or-later AND LGPL-2.1-or-later @@ -159,6 +159,7 @@ Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: gnutls = %{version} Requires: libgnutls%{gnutls_sover} = %{version} +Requires(pre): %{install_info_prereq} Provides: gnutls-devel = %{version}-%{release} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 Requires: crypto-policies @@ -185,6 +186,7 @@ Group: Development/Libraries/C and C++ Requires: libgnutls-devel = %{version} Requires: libgnutlsxx%{gnutlsxx_sover} = %{version} Requires: libstdc++-devel +Requires(pre): %{install_info_prereq} %description -n libgnutlsxx-devel Files needed for software development using gnutls. @@ -239,7 +241,7 @@ export CXXFLAGS="%{optflags} -fPIE" --with-fips140-module-name="GnuTLS version" \ --with-fips140-module-version="%{version}-%{release}" \ %{nil} -%make_build +make %{?_smp_mflags} %install %make_install @@ -266,7 +268,7 @@ rm -rf %{buildroot}%{_datadir}/doc/gnutls %check %if ! 0%{?qemu_user_space_build} -%make_build check GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null || { +make %{?_smp_mflags} check GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null || { find -name test-suite.log -print -exec cat {} + exit 1 } @@ -288,6 +290,12 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE= %post -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig %postun -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig +%post -n libgnutls-devel +%install_info --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz + +%preun -n libgnutls-devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz + %files -f libgnutls.lang %license LICENSE %doc THANKS README.md NEWS ChangeLog AUTHORS doc/TODO @@ -308,25 +316,20 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE= %{_mandir}/man1/* %files -n libgnutls%{gnutls_sover} -%license LICENSE %{_libdir}/libgnutls.so.%{gnutls_sover}* %files -n libgnutls%{gnutls_sover}-hmac -%license LICENSE %{_libdir}/.libgnutls.so.%{gnutls_sover}*.hmac %if %{with dane} %files -n libgnutls-dane%{gnutls_dane_sover} -%license LICENSE %{_libdir}/libgnutls-dane.so.%{gnutls_dane_sover}* %endif %files -n libgnutlsxx%{gnutlsxx_sover} -%license LICENSE %{_libdir}/libgnutlsxx.so.%{gnutlsxx_sover}* %files -n libgnutls-devel -%license LICENSE %dir %{_includedir}/%{name} %{_includedir}/%{name}/abstract.h %{_includedir}/%{name}/crypto.h @@ -353,7 +356,6 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE= %if %{with dane} %files -n libgnutls-dane-devel -%license LICENSE %dir %{_includedir}/%{name} %{_includedir}/%{name}/dane.h %{_libdir}/pkgconfig/gnutls-dane.pc @@ -361,14 +363,12 @@ GNUTLS_FORCE_FIPS_MODE=1 make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE= %endif %files -n libgnutlsxx-devel -%license LICENSE %{_libdir}/libgnutlsxx.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/gnutlsxx.h %if %{with guile} %files guile -%license LICENSE %{_libdir}/guile/* %{_datadir}/guile/gnutls* %endif