about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2011-08-05 18:08:50 +0000
committerMarco Peereboom <marco@conformal.com>2011-08-05 18:08:50 +0000
commit447234369d7954ee3856707ecba5f1dbd27d2130 (patch)
treea6d69e84e017bef04652849610b4b253b9b835f6
parentada2a7f8fbc92ec7668d7f16d9e3cce21b14b61a (diff)
downloadxombrero-447234369d7954ee3856707ecba5f1dbd27d2130.tar.gz
Start TLS failed is useless; print something better
-rw-r--r--xxxterm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/xxxterm.c b/xxxterm.c
index 8525f33..d691e8b 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -3223,6 +3223,7 @@ start_tls(struct tab *t, int s, gnutls_session_t *gs,
 	gnutls_credentials_type_t cred;
 	cred = gnutls_auth_get_type(gsession);
 	if (cred != GNUTLS_CRD_CERTIFICATE) {
+		show_oops(t, "gnutls_auth_get_type failed %d", (int)cred);
 		stop_tls(gsession, xcred);
 		goto done;
 	}
@@ -3370,10 +3371,8 @@ load_compare_cert(struct tab *t, struct karg *args)
 		return (rv);
 
 	/* go ssl/tls */
-	if (start_tls(t, s, &gsession, &xcred)) {
-		show_oops(t, "Start TLS failed");
+	if (start_tls(t, s, &gsession, &xcred))
 		goto done;
-	}
 
 	/* verify certs in case cert file doesn't exist */
 	gnutls_certificate_verify_peers2(gsession, &error);
@@ -3451,10 +3450,8 @@ cert_cmd(struct tab *t, struct karg *args)
 	}
 
 	/* go ssl/tls */
-	if (start_tls(t, s, &gsession, &xcred)) {
-		show_oops(t, "Start TLS failed");
+	if (start_tls(t, s, &gsession, &xcred))
 		goto done;
-	}
 
 	/* get certs */
 	if (get_connection_certs(gsession, &certs, &cert_count)) {