diff options
| author | Klavishnik <evg.shtanov@gmail.com> | 2023-08-09 17:05:03 +0300 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-10-09 12:02:59 +0200 |
| commit | 91895e39b10033178e662fc7427a09d7562cf8e1 (patch) | |
| tree | 83567b0d7c57166ea9162bf1313eb37381074f96 | |
| parent | 581c87b088105db0bddaf80a572b45a23b74e929 (diff) | |
Avoid divide-by-zero in kmac_prov.c's bytepad()
This would happen if EVP_MD_get_block_size() returned 0
so we return an error instead.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21698)
| -rw-r--r-- | providers/implementations/macs/kmac_prov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index 4d920c249a..ddaab4ba86 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -249,7 +249,7 @@ static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key, ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH); return 0; } - if (w < 0) { + if (w <= 0) { ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_LENGTH); return 0; } @@ -289,7 +289,7 @@ static int kmac_init(void *vmacctx, const unsigned char *key, return 0; t = EVP_MD_get_block_size(ossl_prov_digest_md(&kctx->digest)); - if (t < 0) { + if (t <= 0) { ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_LENGTH); return 0; } |