LittleNellie
/
cipherscan
mirror of https://github.com/mozilla/cipherscan.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Revert "no need to grep the input when we're using awk" 

This reverts commit 4c05897be2.
This commit is contained in:
Julien Vehent 2014-10-08 21:53:22 -04:00
parent 34b2eb7819
commit 2858ef8116
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cipherscan
View File

@ -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") tmp=$(awk 'BEGIN { pr="yes" } /^======================================/ { if ( pr=="yes" ) pr="no"; else pr="yes" } { if ( pr == "yes" ) print }' <<<"$tmp")
# session metadata # session metadata
current_cipher=$(awk '/New, / {print $5; exit}' <<<"$tmp") current_cipher=$(grep "New, " <<<"$tmp"|awk '{print $5}')
current_pfs=$(awk '/Server Temp Key/ {print $4$5$6$7; exit}' <<<"$tmp") current_pfs=$(grep 'Server Temp Key' <<<"$tmp"|awk '{print $4$5$6$7}')
current_protocol=$(awk '/^\s+Protocol\s+:/ {print $3; exit}' <<<"$tmp") current_protocol=$(egrep "^\s+Protocol\s+:" <<<"$tmp"|awk '{print $3}')
current_tickethint=$(awk '/ticket lifetime hint/ {print $6; exit}' <<<"$tmp") current_tickethint=$(grep 'ticket lifetime hint' <<<"$tmp"|awk '{print $6 }')
if [ -z $current_tickethint ]; then if [ -z $current_tickethint ]; then
current_tickethint=None current_tickethint=None
fi fi
# certificate metadata # 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 if [ -z $current_pubkey ]; then
current_pubkey=0 current_pubkey=0
fi fi
current_sigalg=$(${OPENSSLBIN} x509 -noout -text 2>/dev/null <<<"$tmp"|\ current_sigalg=$(${OPENSSLBIN} x509 -noout -text 2>/dev/null <<<"$tmp"|grep Signature\ Algorithm | head -n 1 | awk '{print $3}') || current_sigalg="None"
awk '/Signature Algorithm/ {print $3; exit}') || current_sigalg="None"
grep 'Verify return code: 0 ' <<<"$tmp" >/dev/null grep 'Verify return code: 0 ' <<<"$tmp" >/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
current_trusted="True" current_trusted="True"