- clearer output

This commit is contained in:
Dirk Wetter 2014-09-25 16:24:21 +02:00
parent b1d7ed0329
commit 84af820830

View File

@ -199,13 +199,13 @@ ok(){
if [ "$2" -eq 1 ] ; then if [ "$2" -eq 1 ] ; then
case $1 in case $1 in
1) redln "offered (NOT ok)" ;; # 1 1 1) redln "offered (NOT ok)" ;; # 1 1
0) greenln "NOT offered (ok)" ;; # 0 1 0) greenln "not offered (OK)" ;; # 0 1
esac esac
else else
case $1 in case $1 in
3) brownln "offered" ;; # 2 0 3) brownln "offered" ;; # 2 0
2) boldln "offered" ;; # 2 0 2) boldln "offered" ;; # 2 0
1) greenln "offered (ok)" ;; # 1 0 1) greenln "offered (OK)" ;; # 1 0
0) boldln "not offered" ;; # 0 0 0) boldln "not offered" ;; # 0 0
esac esac
fi fi
@ -904,7 +904,7 @@ rc4() {
outln "RC4 is kind of broken, for e.g. IE6 consider 0x13 or 0x0a" outln "RC4 is kind of broken, for e.g. IE6 consider 0x13 or 0x0a"
else else
outln outln
litegreenln "No RC4 ciphers detected (OK)" litegreenln "no RC4 ciphers detected (OK)"
bad=0 bad=0
fi fi
@ -1059,7 +1059,7 @@ ccs_injection(){
lines=`echo "$SOCKREPLY" | xxd -c32 | wc -l` lines=`echo "$SOCKREPLY" | xxd -c32 | wc -l`
if [ "$reply_sanitized" == "0a" ] || [ "$lines" -gt 1 ] ; then if [ "$reply_sanitized" == "0a" ] || [ "$lines" -gt 1 ] ; then
green "NOT vulnerable (ok)" green "not vulnerable (OK)"
ret=0 ret=0
else else
red "VULNERABLE" red "VULNERABLE"
@ -1083,7 +1083,7 @@ heartbleed(){
$OPENSSL s_client $STARTTLS -connect $NODEIP:$PORT -tlsextdebug &>$TMPFILE </dev/null $OPENSSL s_client $STARTTLS -connect $NODEIP:$PORT -tlsextdebug &>$TMPFILE </dev/null
grep "server extension" $TMPFILE | grep -wq heartbeat grep "server extension" $TMPFILE | grep -wq heartbeat
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
greenln "No TLS heartbeat extension (ok)" greenln "No TLS heartbeat extension (OK)"
ret=0 ret=0
else else
# mainly adapted from https://gist.github.com/takeshixx/10107280 # mainly adapted from https://gist.github.com/takeshixx/10107280
@ -1174,7 +1174,7 @@ heartbleed(){
red "VULNERABLE" red "VULNERABLE"
ret=1 ret=1
else else
green "NOT vulnerable (ok)" green "not vulnerable (OK)"
ret=0 ret=0
fi fi
[ $retval -eq 3 ] && green ", timed out" [ $retval -eq 3 ] && green ", timed out"
@ -1212,11 +1212,11 @@ renego() {
if [ $reneg_ok -eq 0 ] && [ $secreg -eq 0 ]; then if [ $reneg_ok -eq 0 ] && [ $secreg -eq 0 ]; then
# Client side renegotiation is accepted and secure renegotiation IS NOT supported # Client side renegotiation is accepted and secure renegotiation IS NOT supported
redln "is vulnerable (not ok)" redln "IS vulnerable (NOT ok)"
return 1 return 1
fi fi
if [ $reneg_ok -eq 1 ] && [ $secreg -eq 1 ]; then if [ $reneg_ok -eq 1 ] && [ $secreg -eq 1 ]; then
greenln "NOT vulnerable (ok)" greenln "not vulnerable (OK)"
return 0 return 0
fi fi
if [ $reneg_ok -eq 1 ] ; then # 1,0 if [ $reneg_ok -eq 1 ] ; then # 1,0
@ -1255,10 +1255,10 @@ crime() {
STR=`$OPENSSL s_client $ADDCMD $STARTTLS -connect $NODEIP:$PORT $SNI 2>&1 </dev/null | grep Compression ` STR=`$OPENSSL s_client $ADDCMD $STARTTLS -connect $NODEIP:$PORT $SNI 2>&1 </dev/null | grep Compression `
if echo $STR | grep -q NONE >/dev/null; then if echo $STR | grep -q NONE >/dev/null; then
greenln "NOT vulnerable (ok) " greenln "not vulnerable (OK) "
ret=0 ret=0
else else
redln "is vulnerable (not ok)" redln "IS vulnerable (NOT ok)"
ret=1 ret=1
fi fi
@ -1286,10 +1286,10 @@ crime() {
# STR=`grep Compression $TMPFILE ` # STR=`grep Compression $TMPFILE `
# if echo $STR | grep -q NONE >/dev/null; then # if echo $STR | grep -q NONE >/dev/null; then
# green "NOT vulnerable (ok)" # green "not vulnerable (OK)"
# ret=`expr $ret + 0` # ret=`expr $ret + 0`
# else # else
# red "is vulnerable (not ok)" # red "IS vulnerable (NOT ok)"
# ret=`expr $ret + 1` # ret=`expr $ret + 1`
# fi # fi
# fi # fi
@ -1878,7 +1878,7 @@ case "$1" in
exit $ret ;; exit $ret ;;
esac esac
# $Id: testssl.sh,v 1.115 2014/09/16 20:16:07 dirkw Exp $ # $Id: testssl.sh,v 1.116 2014/09/24 09:29:05 dirkw Exp $
# vim:ts=5:sw=5 # vim:ts=5:sw=5