From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 14 May 2012 15:56:54 +0000 (+0200)
Subject: Print certificate if --print-cert is given, even on verification failure.
X-Git-Tag: gnutls_3_0_21~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3f90ae0ffdf6e23f5ea031df84bdb588967c4c5;p=thirdparty%2Fgnutls.git

Print certificate if --print-cert is given, even on verification failure.
---

diff --git a/src/cli.c b/src/cli.c
index 03848cad9f..b9368dc0d1 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1288,6 +1288,7 @@ do_handshake (socket_st * socket)
     }
   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 b61bc0f20f..c2f30a001c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -651,9 +651,7 @@ print_info (gnutls_session_t session, int print_cert)
                 }
           }
 
-          print_cert_info (session, 
-                           verbose?GNUTLS_CRT_PRINT_FULL:GNUTLS_CRT_PRINT_COMPACT, 
-                           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);
@@ -712,8 +710,12 @@ print_info (gnutls_session_t session, int print_cert)
 }
 
 void
-print_cert_info (gnutls_session_t session, int flag, int print_cert)
+print_cert_info (gnutls_session_t session, int verbose, int print_cert)
 {
+int flag;
+
+    if (verbose) flag = GNUTLS_CRT_PRINT_FULL;
+    else flag = GNUTLS_CRT_PRINT_COMPACT;
 
     if (gnutls_certificate_client_get_request_status (session) != 0)
         printf ("- Server has requested a certificate.\n");