In gnutls-cli the server certificate is printed prior to verification

3 files changed, 7 insertions, 5 deletions

diff --git a/src/cli.c b/src/cli.c
index a375a7c9e2..5b72310c6c 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -401,6 +401,8 @@ cert_verify_callback (gnutls_session_t session)
   int dane = ENABLED_OPT(DANE);
   const char* txt_service;
 
+  print_cert_info (session, verbose, print_cert);
+
   rc = cert_verify(session, hostname);
   if (rc == 0)
     {
@@ -1254,12 +1256,11 @@ do_handshake (socket_st * socket)
   if (ret == 0)
     {
       /* print some information */
-      print_info (socket->session, print_cert, verbose);
+      print_info (socket->session, verbose, 0);
       socket->secure = 1;
     }
   else
     {
-      print_cert_info (socket->session, verbose, print_cert);
       gnutls_alert_send_appropriate (socket->session, ret);
       shutdown (socket->fd, SHUT_RDWR);
     }
diff --git a/src/common.c b/src/common.c
index 2bccedc8c6..75048c621c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -583,7 +583,7 @@ print_ecdh_info (gnutls_session_t session, const char *str)
 }
 
 int
-print_info (gnutls_session_t session, int print_cert, int verbose)
+print_info (gnutls_session_t session, int verbose, int print_cert)
 {
     const char *tmp;
     gnutls_credentials_type_t cred;
@@ -656,7 +656,8 @@ print_info (gnutls_session_t session, int print_cert, int verbose)
                 }
           }
 
-          print_cert_info (session, verbose, print_cert);
+          if (print_cert)
+            print_cert_info (session, verbose, print_cert);
 
           if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS)
               print_dh_info (session, "Ephemeral ", verbose);
diff --git a/src/common.h b/src/common.h
index 26cadb4873..2fac7ee513 100644
--- a/src/common.h
+++ b/src/common.h
@@ -48,7 +48,7 @@
 
 extern const char str_unknown[];
 
-int print_info (gnutls_session_t state, int print_cert, int verbose);
+int print_info (gnutls_session_t state, int verbose, int print_cert);
 void print_cert_info (gnutls_session_t, int flag, int print_cert);
 void print_cert_info_compact (gnutls_session_t session);