From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Fri, 26 Jun 2020 10:37:12 +0000 (+0200)
Subject: apps/cmp.c: Defer diagnostic output on server+proxy to be contacted
X-Git-Tag: openssl-3.0.0-alpha6~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f7e897995ae49546ab94a6969e85d797ac6c486;p=thirdparty%2Fopenssl.git

apps/cmp.c: Defer diagnostic output on server+proxy to be contacted

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12296)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index e5f72cbea78..1af53510b32 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2095,7 +2095,6 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
 
     if (opt_proxy != NULL)
         (void)BIO_snprintf(proxy_buf, sizeof(proxy_buf), " via %s", opt_proxy);
-    CMP_info2("will contact %s%s", server_buf, proxy_buf);
 
     if (!transform_opts())
         goto err;
@@ -2217,6 +2216,9 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     if (opt_geninfo != NULL && !handle_opt_geninfo(ctx))
         goto err;
 
+    /* not printing earlier, to minimize confusion in case setup fails before */
+    CMP_info2("will contact %s%s", server_buf, proxy_buf);
+
     ret = 1;
 
  err: