@@ -196,7 +196,7 @@ TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}" # If you run testssl.sh and it
196196CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # You can have your CA stores some place else
197197EXPERIMENTAL=${EXPERIMENTAL:-false} # a development hook which allows us to disable code
198198PROXY_WAIT=${PROXY_WAIT:-20} # waiting at max 20 seconds for socket reply through proxy
199- DNS_VIA_PROXY=${DNS_VIA_PROXY:-false} # do DNS lookups via proxy. --ip=proxy reverses this
199+ DNS_VIA_PROXY=${DNS_VIA_PROXY:-false} # do DNS lookups via proxy. --ip=proxy reverses this
200200IGN_OCSP_PROXY=${IGN_OCSP_PROXY:-false} # Also when --proxy is supplied it is ignored when testing for revocation via OCSP via --phone-out
201201HEADER_MAXSLEEP=${HEADER_MAXSLEEP:-5} # we wait this long before killing the process to retrieve a service banner / http header
202202MAX_SOCKET_FAIL=${MAX_SOCKET_FAIL:-2} # If this many failures for TCP socket connects are reached we terminate
@@ -19986,7 +19986,7 @@ find_openssl_binary() {
1998619986 HAS_ZLIB=false
1998719987 HAS_UDS=false
1998819988 HAS_UDS2=false
19989- TRUSTED1ST=""
19989+ TRUSTED1ST=""
1999019990 HAS_ENABLE_PHA=false
1999119991
1999219992 $OPENSSL ciphers -s 2>&1 | grep -aiq "unknown option" || OSSL_CIPHERS_S="-s"
@@ -22041,18 +22041,18 @@ display_rdns_etc() {
2204122041datebanner() {
2204222042 local scan_time_f=""
2204322043 local node_banner=""
22044-
22044+
2204522045 if [[ -n "PROXY" ]] && $DNS_VIA_PROXY;then
22046- node_banner="$NODE:$PORT"
22046+ node_banner="$NODE:$PORT"
2204722047 else
22048- node_banner="$NODEIP:$PORT ($NODE)"
22048+ node_banner="$NODEIP:$PORT ($NODE)"
2204922049 fi
22050-
22050+
2205122051 if [[ "$1" =~ Done ]] ; then
2205222052 scan_time_f="$(printf "%04ss" "$SCAN_TIME")" # 4 digits because of windows
2205322053 pr_reverse "$1 $(date +%F) $(date +%T) [$scan_time_f] -->> $node_banner <<--"
2205422054 else
22055- pr_reverse "$1 $(date +%F) $(date +%T) -->> $node_banner <<--"
22055+ pr_reverse "$1 $(date +%F) $(date +%T) -->> $node_banner <<--"
2205622056 fi
2205722057 outln "\n"
2205822058 [[ "$1" =~ Start ]] && display_rdns_etc
@@ -23970,30 +23970,30 @@ lets_roll() {
2397023970 [[ -z "$NODE" ]] && parse_hn_port "${URI}" # NODE, URL_PATH, PORT, IPADDRs and IP46ADDR is set now
2397123971 prepare_logging
2397223972
23973- if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
23974- NODEIP="$NODE"
23975- lets_roll "${STARTTLS_PROTOCOL}"
23976- RET=$?
23977- else
23978- determine_ip_addresses
23979- if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
23980- MULTIPLE_CHECKS=true
23981- pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
23982- for ip in $IPADDRs; do
23983- draw_line "-" $((TERM_WIDTH * 2 / 3))
23984- outln
23985- NODEIP="$ip"
23986- lets_roll "${STARTTLS_PROTOCOL}"
23987- RET=$((RET + $?)) # RET value per IP address
23988- done
23989- draw_line "-" $((TERM_WIDTH * 2 / 3))
23990- outln
23991- pr_bold "Done testing now all IP addresses (on port $PORT): "; outln "$IPADDRs"
23992- else # Just 1x ip4v to check, applies also if CMDLINE_IP was supplied
23993- NODEIP="$IPADDRs"
23994- lets_roll "${STARTTLS_PROTOCOL}"
23995- RET=$?
23996- fi
23997- fi
23973+ if [[ -n "$PROXY" ]] && $DNS_VIA_PROXY; then
23974+ NODEIP="$NODE"
23975+ lets_roll "${STARTTLS_PROTOCOL}"
23976+ RET=$?
23977+ else
23978+ determine_ip_addresses
23979+ if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
23980+ MULTIPLE_CHECKS=true
23981+ pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
23982+ for ip in $IPADDRs; do
23983+ draw_line "-" $((TERM_WIDTH * 2 / 3))
23984+ outln
23985+ NODEIP="$ip"
23986+ lets_roll "${STARTTLS_PROTOCOL}"
23987+ RET=$((RET + $?)) # RET value per IP address
23988+ done
23989+ draw_line "-" $((TERM_WIDTH * 2 / 3))
23990+ outln
23991+ pr_bold "Done testing now all IP addresses (on port $PORT): "; outln "$IPADDRs"
23992+ else # Just 1x ip4v to check, applies also if CMDLINE_IP was supplied
23993+ NODEIP="$IPADDRs"
23994+ lets_roll "${STARTTLS_PROTOCOL}"
23995+ RET=$?
23996+ fi
23997+ fi
2399823998
2399923999exit $RET
0 commit comments