From 2858ef8116b0eedc2062c44bdb9d170a304a5788 Mon Sep 17 00:00:00 2001
From: Julien Vehent <julien@linuxwall.info>
Date: Wed, 8 Oct 2014 21:53:22 -0400
Subject: [PATCH] Revert "no need to grep the input when we're using awk"

This reverts commit 4c05897be2f252f6647f52d7ee799ef80edce954.
---
 cipherscan | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cipherscan b/cipherscan
index b7e8e4d..60743be 100755
--- a/cipherscan
+++ b/cipherscan
@@ -108,21 +108,20 @@ test_cipher_on_target() {
         tmp=$(awk 'BEGIN { pr="yes" } /^======================================/ { if ( pr=="yes" ) pr="no"; else pr="yes" } { if ( pr == "yes" ) print }' <<<"$tmp")
 
         # session metadata
-        current_cipher=$(awk '/New, / {print $5; exit}' <<<"$tmp")
-        current_pfs=$(awk '/Server Temp Key/ {print $4$5$6$7; exit}' <<<"$tmp")
-        current_protocol=$(awk '/^\s+Protocol\s+:/ {print $3; exit}' <<<"$tmp")
-        current_tickethint=$(awk '/ticket lifetime hint/ {print $6; exit}' <<<"$tmp")
+        current_cipher=$(grep "New, " <<<"$tmp"|awk '{print $5}')
+        current_pfs=$(grep 'Server Temp Key' <<<"$tmp"|awk '{print $4$5$6$7}')
+        current_protocol=$(egrep "^\s+Protocol\s+:" <<<"$tmp"|awk '{print $3}')
+        current_tickethint=$(grep 'ticket lifetime hint' <<<"$tmp"|awk '{print $6 }')
         if [ -z $current_tickethint ]; then
             current_tickethint=None
         fi
 
         # certificate metadata
-        current_pubkey=$(awk '/Server public key is / {print $5;exit}' <<<"$tmp")
+        current_pubkey=$(grep 'Server public key is ' <<<"$tmp"|awk '{print $5}')
         if [ -z $current_pubkey ]; then
             current_pubkey=0
         fi
-        current_sigalg=$(${OPENSSLBIN} x509 -noout -text 2>/dev/null <<<"$tmp"|\
-            awk '/Signature Algorithm/ {print $3; exit}') || current_sigalg="None"
+        current_sigalg=$(${OPENSSLBIN} x509 -noout -text 2>/dev/null <<<"$tmp"|grep Signature\ Algorithm | head -n 1 | awk '{print $3}') || current_sigalg="None"
         grep 'Verify return code: 0 ' <<<"$tmp" >/dev/null
         if [ $? -eq 0 ]; then
             current_trusted="True"