From 42428e00ca0e8707ec5ba06b1579bf2f9c66c45c Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date: Tue, 13 Jan 2015 20:09:48 +0200
Subject: [PATCH] rc: rewrite serversslcertfp(()

Also remove unneeded functions.

Closes #55
---
 rc/bashrc | 28 +++++++---------------------
 rc/zshrc  | 28 +++++++---------------------
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index 28499a30..aade534b 100644
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -856,28 +856,14 @@ github-add-pulls() {
 }
 
 # Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-# Note that this should not be pointed to round-robin and is pointed
-# preferably to direct IP address.
-# Note that OpenSSL doesn't support IPv6 at time of writing (2014-12-21).
+# Note that OpenSSL doesn't support IPv6 at time of writing (2015-01-13).
 serversslcertfp() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -md5 -noout -in /dev/stdin
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha1 -noout -in /dev/stdin
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha256 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpmd5() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -md5 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpsha1() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha1 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpsha256() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha256 -noout -in /dev/stdin
+    SSSLCFFN="/tmp/$(date -Is).pem"
+    openssl s_client -showcerts -connect $1 < /dev/null|tee $SSSLCFFN
+    cat $SSSLCFFN|openssl x509 -md5 -fingerprint -noout
+    cat $SSSLCFFN|openssl x509 -sha1 -fingerprint -noout
+    cat $SSSLCFFN|openssl x509 -sha256 -fingerprint -noout
+    rm $SSSLCFFN
 }
 
 # .custom
diff --git a/rc/zshrc b/rc/zshrc
index 1524c8e6..0e2125ae 100644
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -834,28 +834,14 @@ github-add-pulls() {
 }
 
 # Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-# Note that this should not be pointed to round-robin and is pointed
-# preferably to direct IP address.
-# Note that OpenSSL doesn't support IPv6 at time of writing (2014-12-21).
+# Note that OpenSSL doesn't support IPv6 at time of writing (2015-01-13).
 serversslcertfp() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -md5 -noout -in /dev/stdin
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha1 -noout -in /dev/stdin
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha256 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpmd5() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -md5 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpsha1() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha1 -noout -in /dev/stdin
-}
-
-# Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
-serversslcertfpsha256() {
-    openssl s_client -connect $1 < /dev/null 2>/dev/null|openssl x509 -fingerprint -sha256 -noout -in /dev/stdin
+    SSSLCFFN="/tmp/$(date -Is).pem"
+    openssl s_client -showcerts -connect $1 < /dev/null|tee $SSSLCFFN
+    cat $SSSLCFFN|openssl x509 -md5 -fingerprint -noout
+    cat $SSSLCFFN|openssl x509 -sha1 -fingerprint -noout
+    cat $SSSLCFFN|openssl x509 -sha256 -fingerprint -noout
+    rm $SSSLCFFN
 }
 
 # Source files for miscannellious modifications.