Ything-RepoMirrors/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-01-25 02:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Dr. David von Oheimb
2025-04-14 20:58:57 +02:00
parent 2f949642a1
commit 62af159ea5
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/cmp.c
View File

@@ -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;
}