apps/cmp.c: Improve description of key loaded due to -newkew option
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Wed, 25 Nov 2020 10:36:27 +0000 (11:36 +0100)
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>
Wed, 25 Nov 2020 12:33:50 +0000 (13:33 +0100)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13497)

apps/cmp.c

index ccb61ab4977c2da883d571ccbb498a11c0039a94..68edfd88daa586b899c4f972f8d30f4ade334623 100644 (file)
@@ -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;
         }