From cb3fde9728b9deed1ab2fb37dbe1021a471066e0 Mon Sep 17 00:00:00 2001 From: Kenzlee51 <121612281+Kenzlee51@users.noreply.github.com> Date: Tue, 8 Apr 2025 13:56:50 +0300 Subject: [PATCH] Update cms_pwri.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit CLA: trivial When entering the branch (pbe_nid <= 0), line 66 assigns new values ​​to the variable of line 67 (pbe_nid = NID_id_pbkdf2). However, it is not used anywhere in the future. For this reason, lines 66 and 67 were removed. Reviewed-by: Saša Nedvědický Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/27296) --- crypto/cms/cms_pwri.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index a7d609f8379..d907ad9a57a 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -63,9 +63,6 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms, if (wrap_nid <= 0) wrap_nid = NID_id_alg_PWRI_KEK; - if (pbe_nid <= 0) - pbe_nid = NID_id_pbkdf2; - /* Get from enveloped data */ if (kekciph == NULL) kekciph = ec->cipher; -- 2.47.2