Merge branch '2.9dev' into run_beast_sockets

This commit is contained in:
David Cooper 2016-12-20 08:50:09 -05:00
commit 5b52e81c20
1 changed files with 2 additions and 2 deletions

View File

@ -8435,7 +8435,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
@ -8513,7 +8513,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 (timed out)" "$cve" "$cwe" fileout "sec_client_renego" "OK" "Secure Client-Initiated Renegotiation : likely not vulnerable (timed out)" "$cve" "$cwe"
sec_client_renego=1 sec_client_renego=1
else else