Skip to content

Commit c2ed4d5

Browse files
committed
Fix json/csv output when STARTTLS problem is passed back (3.0)
In rare cases testssl.sh writes to the terminal output "likely not offered" but misses the "likely" in the json/csv output. This fixes #2575 for the 3.0 branch by adding that word and amending the return value 4 with a comment.
1 parent d248451 commit c2ed4d5

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

testssl.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5050,7 +5050,8 @@ run_protocols() {
50505050
fileout "$jsonID" "OK" "not offered"
50515051
add_tls_offered ssl2 no
50525052
;;
5053-
4) out "likely "; pr_svrty_best "not offered (OK), "
5053+
4) # STARTTLS problem
5054+
out "likely "; pr_svrty_best "not offered (OK), "
50545055
fileout "$jsonID" "OK" "likely not offered"
50555056
add_tls_offered ssl2 no
50565057
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
@@ -5220,7 +5221,7 @@ run_protocols() {
52205221
pr_warning "TLS downgraded to STARTTLS plaintext"; outln
52215222
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
52225223
;;
5223-
4) out "likely not offered, "
5224+
4) out "likely not offered, " # STARTTLS problem
52245225
fileout "$jsonID" "INFO" "likely not offered"
52255226
add_tls_offered tls1 no
52265227
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
@@ -5301,8 +5302,8 @@ run_protocols() {
53015302
pr_warning "TLS downgraded to STARTTLS plaintext"; outln
53025303
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
53035304
;;
5304-
4) out "likely not offered, "
5305-
fileout "$jsonID" "INFO" "not offered"
5305+
4) out "likely not offered, " # STARTTLS problem
5306+
fileout "$jsonID" "INFO" "likely not offered"
53065307
add_tls_offered tls1_1 no
53075308
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
53085309
fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}"
@@ -5566,8 +5567,8 @@ run_protocols() {
55665567
pr_warning "TLS downgraded to STARTTLS plaintext"; outln
55675568
fileout "$jsonID" "WARN" "TLS downgraded to STARTTLS plaintext"
55685569
;;
5569-
4) out "likely not offered, "
5570-
fileout "$jsonID" "INFO" "not offered"
5570+
4) out "likely not offered, " # STARTTLS problem
5571+
fileout "$jsonID" "INFO" "likely not offered"
55715572
add_tls_offered tls1_3 no
55725573
pr_warning "received 4xx/5xx after STARTTLS handshake"; outln "$debug_recomm"
55735574
fileout "$jsonID" "WARN" "received 4xx/5xx after STARTTLS handshake${debug_recomm}"

0 commit comments

Comments
 (0)