- unify timeout msgs on the console

This commit is contained in:
Dirk 2016-12-20 14:26:12 +01:00
parent 4ff62b9fe8
commit fd7cd54ca1

View File

@ -6559,7 +6559,7 @@ run_ccs_injection(){
fi fi
ret=1 ret=1
fi fi
[[ $retval -eq 3 ]] && out " (timed out)" [[ $retval -eq 3 ]] && out ", timed out"
outln outln
close_socket close_socket
@ -6634,7 +6634,7 @@ run_renego() {
echo R | $OPENSSL s_client $OPTIMAL_PROTO $BUGS $legacycmd $STARTTLS -msg -connect $NODEIP:$PORT $addcmd $PROXY >$TMPFILE 2>>$ERRFILE & echo R | $OPENSSL s_client $OPTIMAL_PROTO $BUGS $legacycmd $STARTTLS -msg -connect $NODEIP:$PORT $addcmd $PROXY >$TMPFILE 2>>$ERRFILE &
wait_kill $! $HEADER_MAXSLEEP wait_kill $! $HEADER_MAXSLEEP
if [[ $? -eq 3 ]]; then if [[ $? -eq 3 ]]; then
pr_done_good "likely not vulnerable (OK)"; outln " (timed out)" # it hung pr_done_good "likely not vulnerable (OK)"; outln " timed out" # it hung
fileout "sec_client_renego" "OK" "Secure Client-Initiated Renegotiation : likely not vulnerable (OK) (timed out)" fileout "sec_client_renego" "OK" "Secure Client-Initiated Renegotiation : likely not vulnerable (OK) (timed out)"
sec_client_renego=1 sec_client_renego=1
else else
@ -9075,4 +9075,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.564 2016/12/11 17:21:40 dirkw Exp $ # $Id: testssl.sh,v 1.565 2016/12/20 13:26:11 dirkw Exp $