From 278e4a3148ea1ed54b918b7df4222060cb4389f8f94a7eae93e3a869db0dd80c Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Thu, 29 Jul 2021 18:29:14 +0000 Subject: [PATCH] Accepting request 909235 from security:tls:unstable OBS-URL: https://build.opensuse.org/request/show/909235 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=29 --- openssl-3.0.0-beta1.tar.gz | 3 -- openssl-3.0.0-beta1.tar.gz.asc | 11 ------- openssl-3.0.0-beta2.tar.gz | 3 ++ openssl-3.0.0-beta2.tar.gz.asc | 11 +++++++ openssl-3.changes | 15 ++++++++++ openssl-3.spec | 4 +-- openssl-ppc64-fix-build.patch | 55 ---------------------------------- 7 files changed, 30 insertions(+), 72 deletions(-) delete mode 100644 openssl-3.0.0-beta1.tar.gz delete mode 100644 openssl-3.0.0-beta1.tar.gz.asc create mode 100644 openssl-3.0.0-beta2.tar.gz create mode 100644 openssl-3.0.0-beta2.tar.gz.asc delete mode 100644 openssl-ppc64-fix-build.patch diff --git a/openssl-3.0.0-beta1.tar.gz b/openssl-3.0.0-beta1.tar.gz deleted file mode 100644 index 5be8995..0000000 --- a/openssl-3.0.0-beta1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bfedc9a1062cbd2aabc294acc93cbd5259e6e7bd5bbe38e454cc6a32564029f -size 14878832 diff --git a/openssl-3.0.0-beta1.tar.gz.asc b/openssl-3.0.0-beta1.tar.gz.asc deleted file mode 100644 index 0d506fc..0000000 --- a/openssl-3.0.0-beta1.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAmDLSDUACgkQ2cTSbQ5g -RJHqsQgAqrgdOsgiCVf9PXigEr27njVGZ8t/qSsqJOKQ+MTf6Fpu66yj4h6bJOF+ -0dODk+ahur4Aw70Zi1BDG5xqo95KhdgFioGorE7+JxapNh5p/mYqlddFVhGUmNaR -9HjKOLSKolQ2vJ1SdNlO8xXFeHcdALuDQUo3M5ql+pDIhses5vWKntR3u0UxYSu1 -VLiP1ERv8VzC7Fc62yX0pKifVATr/vub+KCxbVl4v8ESdggKYLeqIbFJlGdO8Wfs -jEiG3mLe/WMdgiVbzPLRrAHvlcuf6gLKy/AG0vRT9qIgjO0ZvAER2mglDRsRIIMJ -Oh3N7eRWL4syrorPRV+h+AHyvKQ9WA== -=YLhM ------END PGP SIGNATURE----- diff --git a/openssl-3.0.0-beta2.tar.gz b/openssl-3.0.0-beta2.tar.gz new file mode 100644 index 0000000..819a216 --- /dev/null +++ b/openssl-3.0.0-beta2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76ab22879201b12f014393ee4becec7f264d8f6955b1036839128002868df71 +size 14912360 diff --git a/openssl-3.0.0-beta2.tar.gz.asc b/openssl-3.0.0-beta2.tar.gz.asc new file mode 100644 index 0000000..56eef26 --- /dev/null +++ b/openssl-3.0.0-beta2.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAmECwD8ACgkQ2cTSbQ5g +RJGK7wf/dQKIMkV1dLMZ5DImwWot5dJgDJWxrw6COGT2KnUliGojm35wvy7onv/d +KtmLz1Ri1xhAnpaxbXuOlYW5VWhA3AHwFkTfl4bZ/cwDfrl9HJ82eDn6cQpAhiiy +p3qyOH4Ky52LrJaXSFoh+OKZa8IMVRuWMCFs9dWp7v/+IYAnSdjNM4T61WOgjUhD +Z1FQCoknxvozdXWSDj7a6lyudE/XuP2Xc05UPAO4UfaSn8fuaDXfmqyhlO14JZ+R +sgWtzXLRBHLSKionMLZvhVCF5n3MXZfo0vaO4fNcZzTXPlm/o1xSbQszvAysQQGs +hx+o0MRyohxu5mxiaruqApzHKNHqPA== +=0fpj +-----END PGP SIGNATURE----- diff --git a/openssl-3.changes b/openssl-3.changes index 7623f63..4499344 100644 --- a/openssl-3.changes +++ b/openssl-3.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jul 29 16:46:14 UTC 2021 - Pedro Monreal + +- Update to 3.0.0 Beta 2 + * The ERR_GET_FUNC() function was removed. With the loss of + meaningful function codes, this function can only cause problems + for calling applications. + * While a callback function set via 'SSL_CTX_set_cert_verify_callback()' + is not allowed to return a value > 1, this is no more taken as + failure. + * Deprecated the obsolete X9.31 RSA key generation related + functions BN_X931_generate_Xpq(), BN_X931_derive_prime_ex(), + and BN_X931_generate_prime_ex(). +- Remove openssl-ppc64-fix-build.patch fixed upstream + ------------------------------------------------------------------- Mon Jul 5 14:29:05 UTC 2021 - Pedro Monreal diff --git a/openssl-3.spec b/openssl-3.spec index 7262017..509be82 100644 --- a/openssl-3.spec +++ b/openssl-3.spec @@ -20,7 +20,7 @@ %define sover 3 %define _rname openssl %define vernum 3.0.0 -%define relnum beta1 +%define relnum beta2 %define dash_version %{vernum}-%{relnum} Name: openssl-3 # Don't forget to update the version in the "openssl" package! @@ -45,8 +45,6 @@ Patch3: openssl-pkgconfig.patch Patch4: openssl-DEFAULT_SUSE_cipher.patch Patch5: openssl-ppc64-config.patch Patch6: openssl-no-date.patch -# Fix build on ppc/ppc64: github.com/openssl/openssl/issues/15923 -Patch7: openssl-ppc64-fix-build.patch BuildRequires: pkgconfig Conflicts: ssl Provides: ssl diff --git a/openssl-ppc64-fix-build.patch b/openssl-ppc64-fix-build.patch deleted file mode 100644 index dcdd8f9..0000000 --- a/openssl-ppc64-fix-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d18f9e0354894a5d3d86b9b0b09acc5953766e54 Mon Sep 17 00:00:00 2001 -From: Martin Schwenke -Date: Thu, 1 Jul 2021 14:23:50 +1000 -Subject: [PATCH 1/3] bn: Use a basic branch-if-not-zero - -Ancient toolchains fail the build because they don't like the hints, -newer ISAs recommend not using the hints and relying on dynamic branch -prediction. - -Signed-off-by: Martin Schwenke ---- - crypto/bn/asm/ppc64-mont-fixed.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: openssl-3.0.0-beta1/crypto/bn/asm/ppc64-mont-fixed.pl -=================================================================== ---- openssl-3.0.0-beta1.orig/crypto/bn/asm/ppc64-mont-fixed.pl -+++ openssl-3.0.0-beta1/crypto/bn/asm/ppc64-mont-fixed.pl -@@ -267,7 +267,7 @@ ___ - addze $tp[$n],$tp[$n+1] - - addi $i,$i,$SIZE_T -- bc 25,0,$label->{"outer"} -+ bdnz $label->{"outer"} - - and. $tp[$n],$tp[$n],$tp[$n] - bne $label->{"sub"} -@@ -322,7 +322,7 @@ ___ - $self->add_code(<<___); - li r3,1 - blr --.size ${fname},.-${fname} -+.size .${fname},.-.${fname} - ___ - - } -Index: openssl-3.0.0-beta1/crypto/ppccap.c -=================================================================== ---- openssl-3.0.0-beta1.orig/crypto/ppccap.c -+++ openssl-3.0.0-beta1/crypto/ppccap.c -@@ -68,12 +68,14 @@ int bn_mul_mont(BN_ULONG *rp, const BN_U - * no opportunity to figure it out... - */ - -+#if defined(_ARCH_PPC64) - if (num == 6) { - if (OPENSSL_ppccap_P & PPC_MADD300) - return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num); - else - return bn_mul_mont_fixed_n6(rp, ap, bp, np, n0, num); - } -+#endif - - return bn_mul_mont_int(rp, ap, bp, np, n0, num); - }