Only test current clients

This commit is contained in:
Frank Breedijk 2016-07-03 19:17:59 +02:00
parent 9d481423b9
commit 9377e6ee95

View File

@ -2041,7 +2041,8 @@ run_client_simulation() {
debugme outln debugme outln
for name in "${short[@]}"; do for name in "${short[@]}"; do
# Make sure we run client simulations for those clients that support it # Make sure we run client simulations for those clients that support it
if [[ `echo "${service[i]}" | grep "$client_service" | wc -l` -eq 1 || "${service[i]}" == "ANY" ]]; then if $do_all_simulations || ${current[i]} ; then
if $do_all_simulations || [[ `echo "${service[i]}" | grep "$client_service" | wc -l` -eq 1 || "${service[i]}" == "ANY" ]]; then
#FIXME: printf formatting would look better, especially if we want a wide option here #FIXME: printf formatting would look better, especially if we want a wide option here
out " ${names[i]} " out " ${names[i]} "
if $using_sockets && [[ -n "${handshakebytes[i]}" ]]; then if $using_sockets && [[ -n "${handshakebytes[i]}" ]]; then
@ -2083,6 +2084,7 @@ run_client_simulation() {
debugme cat $TMPFILE debugme cat $TMPFILE
fi fi
fi # correct service? fi # correct service?
fi #current?
i=$((i+1)) i=$((i+1))
done done
tmpfile_handle $FUNCNAME.txt tmpfile_handle $FUNCNAME.txt
@ -5982,6 +5984,8 @@ tuning options (can also be preset via environment variables):
--proxy <host>:<port> connect via the specified HTTP proxy --proxy <host>:<port> connect via the specified HTTP proxy
-6 use also IPv6. Works only with supporting OpenSSL version and IPv6 connectivity -6 use also IPv6. Works only with supporting OpenSSL version and IPv6 connectivity
--sneaky leave less traces in target logs: user agent, referer --sneaky leave less traces in target logs: user agent, referer
--all-clients simulate all clients, not just all clients that are current and support the
service we are testing
output options (can also be preset via environment variables): output options (can also be preset via environment variables):
--warnings <batch|off|false> "batch" doesn't wait for keypress, "off" or "false" skips connection warning --warnings <batch|off|false> "batch" doesn't wait for keypress, "off" or "false" skips connection warning
@ -6872,6 +6876,7 @@ initialize_globals() {
do_test_just_one=false do_test_just_one=false
do_tls_sockets=false do_tls_sockets=false
do_client_simulation=false do_client_simulation=false
do_all_simulations=false
do_display_only=false do_display_only=false
} }
@ -6901,6 +6906,7 @@ set_scanning_defaults() {
do_ssl_poodle=true do_ssl_poodle=true
do_tls_fallback_scsv=true do_tls_fallback_scsv=true
do_client_simulation=true do_client_simulation=true
do_all_simulations=false
VULN_COUNT=10 VULN_COUNT=10
} }
@ -7037,6 +7043,10 @@ parse_cmd_line() {
-c|--client-simulation) -c|--client-simulation)
do_client_simulation=true do_client_simulation=true
;; ;;
--all-clients)
do_client_simulation=true
do_all_simulations=true
;;
-U|--vulnerable) -U|--vulnerable)
do_vulnerabilities=true do_vulnerabilities=true
do_heartbleed=true do_heartbleed=true