From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Wed, 25 Nov 2020 10:36:27 +0000 (+0100)
Subject: apps/cmp.c: Improve description of key loaded due to -newkew option
X-Git-Tag: openssl-3.0.0-alpha9~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68f9d9223b247f5c6e50bf66f405bc2fb09295cf;p=thirdparty%2Fopenssl.git

apps/cmp.c: Improve description of key loaded due to -newkew option

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13497)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index ccb61ab4977..68edfd88daa 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -1609,12 +1609,13 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         const char *file = opt_newkey;
         const int format = opt_keyform;
         const char *pass = opt_newkeypass;
-        const char *desc = "new private or public key for cert to be enrolled";
-        EVP_PKEY *pkey = load_key_pwd(file, format, pass, engine, NULL);
+        const char *desc = "new private key for cert to be enrolled";
+        EVP_PKEY *pkey = load_key_pwd(file, format, pass, engine, desc);
         int priv = 1;
 
         if (pkey == NULL) {
             ERR_clear_error();
+            desc = "fallback public key for cert to be enrolled";
             pkey = load_pubkey(file, format, 0, pass, engine, desc);
             priv = 0;
         }