diff options
| author | Holger Dengler <dengler@linux.ibm.com> | 2023-09-27 15:43:18 +0200 |
|---|---|---|
| committer | Holger Dengler <dengler@linux.ibm.com> | 2023-11-10 14:26:27 +0100 |
| commit | 1022131d16e30cfbf896e02419019de48e8e1149 (patch) | |
| tree | 20de2486b872152ab3129d52723cc9f8d044434a /providers | |
| parent | 288fbb4b71343516cee6f6a44b9ec55d82fb1532 (diff) | |
Fix state handling of keccak_final for s390x.
The digest life-cycle state diagram has been updated for XOF. Fix the
state handling in s390x_keccac_final() 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)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/digests/sha3_prov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 34620cf95a..f691273baf 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -235,6 +235,10 @@ static int s390x_keccakc_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; if (outlen == 0) return 1; memset(ctx->buf + num, 0, bsz - num); |