From 017acc58f6b67d5b347db411a7a1c4e890434f42 Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Wed, 27 Sep 2023 15:36:59 +0200 Subject: [PATCH] Fix state handling of sha3_final for s390x. The digest life-cycle state diagram has been updated for XOF. Fix the state handling in s390x_sha3_final() according to the updated state diagram. Signed-off-by: Holger Dengler Reviewed-by: Shane Lontis Reviewed-by: Todd Short Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/22221) --- providers/implementations/digests/sha3_prov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 85370912f62..5cf9791bbf1 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -202,6 +202,10 @@ static int s390x_sha3_final(void *vctx, unsigned char *out, size_t outlen) if (!ossl_prov_is_running()) return 0; + if (!(ctx->xof_state == XOF_STATE_INIT || + ctx->xof_state == XOF_STATE_ABSORB)) + return 0; + ctx->xof_state = XOF_STATE_FINAL; s390x_klmd(ctx->buf, ctx->bufsz, NULL, 0, ctx->pad, ctx->A); memcpy(out, ctx->A, outlen); return 1; -- 2.47.2