Accepting request 1223748 from security:tls

OBS-URL: https://build.opensuse.org/request/show/1223748
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-3?expand=0&rev=34
This commit is contained in:
Ana Guerrero 2024-11-13 14:26:48 +00:00 committed by Git OBS Bridge
commit b3fd9c08d5
4 changed files with 78 additions and 7 deletions

@ -0,0 +1,25 @@
From b5795e3ed3ec38ef4686a5b7ff03bfd60183cb71 Mon Sep 17 00:00:00 2001
From: "Randall S. Becker" <randall.becker@nexbridge.ca>
Date: Mon, 20 May 2024 22:23:04 +0000
Subject: [PATCH] Added an explicit yield (OP_SLEEP) to QUIC testing for
cooperative threading.
Fixes: #24442
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
---
test/quic_multistream_test.c | 1 +
1 file changed, 1 insertion(+)
Index: openssl-3.2.3/test/quic_multistream_test.c
===================================================================
--- openssl-3.2.3.orig/test/quic_multistream_test.c
+++ openssl-3.2.3/test/quic_multistream_test.c
@@ -2397,6 +2397,7 @@ static const struct script_op script_13_
OP_C_ACCEPT_STREAM_WAIT (a)
OP_C_READ_EXPECT (a, "foo", 3)
+ OP_SLEEP (10)
OP_C_EXPECT_FIN (a)
OP_C_FREE_STREAM (a)

@ -0,0 +1,31 @@
commit ed5e478261127cafe9c3f86c4992eab1e5c7ebb1
Author: Rohan McLure <rmclure@linux.ibm.com>
Date: Tue Nov 14 14:14:33 2023 +1100
ppc64: Fix SHA3_squeeze
Fix the conditional on the 'next' parameter passed into SHA3_squeeze.
Reported-by: David Benjamin <davidben@davidben.net>
Signed-off-by: Rohan McLure <rmclure@linux.ibm.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22722)
diff --git a/crypto/sha/asm/keccak1600-ppc64.pl b/crypto/sha/asm/keccak1600-ppc64.pl
index 3f8ba817f8..fe7d6db20e 100755
--- a/crypto/sha/asm/keccak1600-ppc64.pl
+++ b/crypto/sha/asm/keccak1600-ppc64.pl
@@ -668,8 +668,8 @@ SHA3_squeeze:
subi $out,r4,1 ; prepare for stbu
mr $len,r5
mr $bsz,r6
- ${UCMP}i r7,1 ; r7 = 'next' argument
- blt .Lnext_block
+ ${UCMP}i r7,0 ; r7 = 'next' argument
+ bne .Lnext_block
b .Loop_squeeze
.align 4

@ -1,7 +1,21 @@
-------------------------------------------------------------------
Tue Nov 12 15:46:20 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
- Do not use HASHBANGPERL to avoid introducing a dependency on the
perl-base package. [bsc#1233235]
-------------------------------------------------------------------
Thu Nov 7 16:43:15 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Add missing fixes for SHA3_squeeze and quic_multistream_test on
pcc64 arch. [jsc#PED-10280]
* Added openssl-3-fix-sha3-squeeze-ppc64.patch
* Added openssl-3-fix-quic_multistream_test.patch
-------------------------------------------------------------------
Tue Nov 5 15:11:46 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Support MSA 11 HMAC on s390x jsc#PED-10273
- Support MSA 11 HMAC on s390x [jsc#PED-10274]
* Add openssl-3-disable-hmac-hw-acceleration-with-engine-digest.patch
* Add openssl-3-fix-hmac-digest-detection-s390x.patch
* Add openssl-3-fix-memleak-s390x_HMAC_CTX_copy.patch
@ -9,13 +23,13 @@ Tue Nov 5 15:11:46 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
-------------------------------------------------------------------
Tue Nov 5 10:39:14 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Add hardware acceleration for full AES-XTS jsc#PED-10273
- Add hardware acceleration for full AES-XTS [jsc#PED-10273]
* Add openssl-3-hw-acceleration-aes-xts-s390x.patch
-------------------------------------------------------------------
Fri Nov 1 14:32:50 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Support MSA 12 SHA3 on s390x jsc#PED-10280
- Support MSA 12 SHA3 on s390x [jsc#PED-10280]
* Add openssl-3-add_EVP_DigestSqueeze_api.patch
* Add openssl-3-support-multiple-sha3_squeeze_s390x.patch
* Add openssl-3-add-xof-state-handling-s3_absorb.patch

@ -135,12 +135,15 @@ Patch57: openssl-3-add-hw-acceleration-hmac.patch
Patch58: openssl-3-support-CPACF-sha3-shake-perf-improvement.patch
Patch59: openssl-3-fix-s390x_sha3_absorb.patch
Patch60: openssl-3-fix-s390x_shake_squeeze.patch
# PATCH-FIX-UPSTREAM: support MSA 10 XTS #jsc-PED-10273
# PATCH-FIX-UPSTREAM: support MSA 10 XTS jsc#PED-10273
Patch61: openssl-3-hw-acceleration-aes-xts-s390x.patch
# PATCH-FIX-UPSTREAM: support MSA 11 HMAC #jsc-PED-10274
# PATCH-FIX-UPSTREAM: support MSA 11 HMAC jsc#PED-10274
Patch62: openssl-3-disable-hmac-hw-acceleration-with-engine-digest.patch
Patch63: openssl-3-fix-hmac-digest-detection-s390x.patch
Patch64: openssl-3-fix-memleak-s390x_HMAC_CTX_copy.patch
# PATCH-FIX-UPSTREAM: Fix failing tests on ppc64 jsc#PED-10280
Patch65: openssl-3-fix-sha3-squeeze-ppc64.patch
Patch66: openssl-3-fix-quic_multistream_test.patch
BuildRequires: pkgconfig
%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550
@ -243,8 +246,6 @@ export MACHINE=armv5el
export MACHINE=armv6l
%endif
export HASHBANGPERL=/usr/bin/perl
./Configure \
enable-camellia \
%ifarch x86_64 aarch64 ppc64le