From 11b8d619c3d12dd321f8e0a4791bbd3667d0d0fc Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Thu, 1 Jan 2015 12:27:08 +0100
Subject: cert-info: enable SNI, accept cert from CA bundle

---
 cert-info | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'cert-info')

diff --git a/cert-info b/cert-info
index b4aa9b1..28865bd 100755
--- a/cert-info
+++ b/cert-info
@@ -69,7 +69,8 @@ get_cert() {
 		return 1
 	fi
 	</dev/null 2>/dev/null \
-	timeout 5 openssl s_client -connect "$host:$port" -showcerts
+	timeout 5 openssl s_client \
+		-connect "$host:$port" -servername "$host" -showcerts
 }
 
 parse_arg() {
@@ -98,7 +99,7 @@ BEGIN {
 		sep=sep"-";
 	}
 }
-/^-----BEGIN CERTIFICATE-----$/ {
+/^-----BEGIN (TRUSTED )?CERTIFICATE-----$/ {
 	in_cert=1;
 }
 {
@@ -106,7 +107,7 @@ BEGIN {
 		cert = cert $0 "\n";
 	}
 }
-/^-----END CERTIFICATE-----$/ {
+/^-----END (TRUSTED )?CERTIFICATE-----$/ {
 	in_cert = 0;
 }
 {
-- 
cgit v1.2.1