Skip to content

Commit a4c24d5

Browse files
author
David Cooper
committed
Fix infinite loop in run_fs()
This commit fixes an infinite loop in run_fs() that occurs in cases in which $OPENSSL supports TLS 1.3 and the server supports all of the non-TLS 1.3 FS ciphers that $OPENSSL supports but not all of the TLS 1.3 ciphers that $OPENSSL supports. The problem is that testing for supported ciphers using $OPENSSL, testing should stop if there are no more ciphers to test (because all of the ciphers supported by $OPENSSL have been determined to be supported by the server). However, currently testing only stops if both the list of TLS 1.3 ciphers and non-TLS 1.3 ciphers is empty. In the problematic case, only the list of non-TLS 1.3 ciphers is empty. Instead of stopping, s_client_options() is called with a -cipher option with an empty list, and s_client_options() simply removes the -cipher option from the command, resulting in a call to $OPENSSL s_client with a full list of non-TLS 1.3 ciphers. Since this call succeeds, the loop continues. This commit fixes the problem by stopping TLS 1.3 ClientHello testing when the list of TLS 1.3 ciphers is empty and stopping non-TLS 1.3 ClientHello testing when the list of non-TLS 1.3 ciphers is empty.
1 parent f5d41ff commit a4c24d5

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

testssl.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10557,7 +10557,12 @@ run_fs() {
1055710557
fi
1055810558
fi
1055910559
done
10560-
[[ -z "$ciphers_to_test" ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
10560+
if "$HAS_TLS13"; then
10561+
[[ "$proto" == -no_ssl2 ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
10562+
[[ "$proto" =~ -no_tls1_3 ]] && [[ -z "$ciphers_to_test" ]] && break
10563+
else
10564+
[[ -z "$ciphers_to_test" ]] && break
10565+
fi
1056110566
if [[ "$proto" =~ curves1 ]]; then
1056210567
curves_option="-curves $curves_list1"
1056310568
elif [[ "$proto" =~ curves2 ]]; then

0 commit comments

Comments
 (0)