From: Dr. David von Oheimb <dev@ddvo.net>
Date: Mon, 14 Apr 2025 18:58:57 +0000 (+0200)
Subject: apps/cmp.c: refactor load_key_pwd() and load_cert_pwd() params for clarity w.r.t... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62af159ea5db0382dac5b0fdd70267639f976aca;p=thirdparty%2Fopenssl.git

apps/cmp.c: refactor load_key_pwd() and load_cert_pwd() params for clarity w.r.t. password source vs. actual password

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/28477)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index 990112b64dd..7becab43d2f 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -834,22 +834,21 @@ static int set_verbosity(int level)
 }
 
 static EVP_PKEY *load_key_pwd(const char *uri, int format,
-    const char *pass, const char *desc)
+    const char *source, const char *desc)
 {
-    char *pass_string = get_passwd(pass, desc);
-    EVP_PKEY *pkey = load_key(uri, format, 0, pass_string, desc);
+    char *pass = get_passwd(source, desc);
+    EVP_PKEY *pkey = load_key(uri, format, 0, pass, desc);
 
-    clear_free(pass_string);
+    clear_free(pass);
     return pkey;
 }
 
-static X509 *load_cert_pwd(const char *uri, const char *pass, const char *desc)
+static X509 *load_cert_pwd(const char *uri, const char *source, const char *desc)
 {
-    X509 *cert;
-    char *pass_string = get_passwd(pass, desc);
+    char *pass = get_passwd(source, desc);
+    X509 *cert = load_cert_pass(uri, FORMAT_UNDEF, 0, pass, desc);
 
-    cert = load_cert_pass(uri, FORMAT_UNDEF, 0, pass_string, desc);
-    clear_free(pass_string);
+    clear_free(pass);
     return cert;
 }