Skip to content

Commit 878513e

Browse files
authored
Merge pull request #2845 from testssl/fix_misleading_ipv4_msg_3.2
Fix displayed message when IPv6 needs to be tested too (3.2)
2 parents 0191098 + 853cea8 commit 878513e

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

testssl.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23134,7 +23134,12 @@ run_mx_all_ips() {
2313423134
determine_ip_addresses || continue
2313523135
if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
2313623136
MULTIPLE_CHECKS=true
23137-
pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
23137+
if [[ "$HAS_IPv6" ]]; then
23138+
pr_bold "Testing all IP addresses (port $PORT): "
23139+
else
23140+
pr_bold "Testing all IPv4 addresses (port $PORT): "
23141+
fi
23142+
outln "$IPADDRs"
2313823143
for ip in $IPADDRs; do
2313923144
NODEIP="$ip"
2314023145
lets_roll "${STARTTLS_PROTOCOL}"
@@ -25055,7 +25060,12 @@ lets_roll() {
2505525060
determine_ip_addresses
2505625061
if [[ $(count_words "$IPADDRs") -gt 1 ]]; then # we have more than one ipv4 address to check
2505725062
MULTIPLE_CHECKS=true
25058-
pr_bold "Testing all IPv4 addresses (port $PORT): "; outln "$IPADDRs"
25063+
if [[ "$HAS_IPv6" ]]; then
25064+
pr_bold "Testing all IP addresses (port $PORT): "
25065+
else
25066+
pr_bold "Testing all IPv4 addresses (port $PORT): "
25067+
fi
25068+
outln "$IPADDRs"
2505925069
for ip in $IPADDRs; do
2506025070
draw_line "-" $((TERM_WIDTH * 2 / 3))
2506125071
outln

0 commit comments

Comments
 (0)