From 90b4845e0c98574bbf7bea9e97796695f064bf57 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 6 May 2025 22:51:41 +0200 Subject: [PATCH] CVE-2025-5987 libcrypto: Correctly detect failures of chacha initialization Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider CVE: CVE-2025-5987 Upstream-Status: Backport [https://git.libssh.org/projects/libssh.git/commit/?id=90b4845e0c98574bbf7bea9e97796695f064bf57] Signed-off-by: Divya Chellam --- src/libcrypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcrypto.c b/src/libcrypto.c index 76e067d3..69a850de 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -771,9 +771,9 @@ chacha20_poly1305_set_key(struct ssh_cipher_struct *cipher, SSH_LOG(SSH_LOG_WARNING, "EVP_CIPHER_CTX_new failed"); goto out; } - ret = EVP_EncryptInit_ex(ctx->header_evp, EVP_chacha20(), NULL, + rv = EVP_EncryptInit_ex(ctx->header_evp, EVP_chacha20(), NULL, u8key + CHACHA20_KEYLEN, NULL); - if (ret != 1) { + if (rv != 1) { SSH_LOG(SSH_LOG_WARNING, "EVP_CipherInit failed"); goto out; } -- 2.40.0