Skip to content

Commit 405f431

Browse files
committed
Relax STARTTLS FTP requirement (3.0)
In rare? occassions where the STARTTLS FEAT request only displays AUTH instead of AUTH TLS, testssl.sh fails as it cannot upgrade to TLS. Required by RFC 4217 is only AUTH ("MUST"), AUTH TLS is optional ("should"), see section 6. This PR relaxes the presence of TLS after AUTH and fixes #2132 for the 3.0 branch.
1 parent 2eac75d commit 405f431

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

testssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10297,7 +10297,7 @@ starttls_full_read(){
1029710297

1029810298
starttls_ftp_dialog() {
1029910299
debugme echo "=== starting ftp STARTTLS dialog ==="
10300-
local reAUTHTLS='^ AUTH TLS'
10300+
local reAUTHTLS='^ AUTH'
1030110301
starttls_full_read '^220-' '^220 ' && debugme echo "received server greeting" &&
1030210302
starttls_just_send 'FEAT' && debugme echo "sent FEAT" &&
1030310303
starttls_full_read '^(211-| )' '^211 ' "${reAUTHTLS}" && debugme echo "received server features and checked STARTTLS availability" &&

0 commit comments

Comments
 (0)