Pedro Monreal Gonzalez
30c6de24df
* Miscellaneous minor bug fixes.
* The FIPS provider now performs a PCT on key import for RSA, EC and ECX.
This is mandated by FIPS 140-3 IG 10.3.A additional comment 1.
- Rebase patches:
* openssl-FIPS-140-3-keychecks.patch
* openssl-FIPS-NO-DES-support.patch
* openssl-FIPS-enforce-EMS-support.patch
* openssl-disable-fipsinstall.patch
- Move ssl configuration files to the libopenssl package [bsc#1247463]
- Don't install unneeded NOTES
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=153
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
commit 7aa45b8bb3269e881d0378aa785ff344efdd2897
|
|
Author: Holger Dengler <dengler@linux.ibm.com>
|
|
Date: Wed Sep 27 15:36:23 2023 +0200
|
|
|
|
Fix state handling of sha3_absorb for s390x.
|
|
|
|
The digest life-cycle state diagram has been updated for XOF. Fix the
|
|
state handling in s390x_sha3_aborb() according to the updated state
|
|
diagram.
|
|
|
|
Signed-off-by: Holger Dengler <dengler@linux.ibm.com>
|
|
|
|
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
|
|
Reviewed-by: Todd Short <todd.short@me.com>
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/22221)
|
|
|
|
Index: openssl-3.2.3/providers/implementations/digests/sha3_prov.c
|
|
===================================================================
|
|
--- openssl-3.2.3.orig/providers/implementations/digests/sha3_prov.c
|
|
+++ openssl-3.2.3/providers/implementations/digests/sha3_prov.c
|
|
@@ -188,6 +188,10 @@ static size_t s390x_sha3_absorb(void *vc
|
|
KECCAK1600_CTX *ctx = vctx;
|
|
size_t rem = len % ctx->block_size;
|
|
|
|
+ if (!(ctx->xof_state == XOF_STATE_INIT ||
|
|
+ ctx->xof_state == XOF_STATE_ABSORB))
|
|
+ return 0;
|
|
+ ctx->xof_state = XOF_STATE_ABSORB;
|
|
s390x_kimd(inp, len - rem, ctx->pad, ctx->A);
|
|
return rem;
|
|
}
|