Skip to content

Commit 9eeb936

Browse files
authored
Merge pull request #2263 from dcooper16/run_pfs_infinite_loop
Fix infinite loop in run_pfs()
2 parents abdd51d + b9271ba commit 9eeb936

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
@@ -9711,7 +9711,12 @@ run_pfs() {
97119711
fi
97129712
fi
97139713
done
9714-
[[ -z "$ciphers_to_test" ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
9714+
if "$HAS_TLS13"; then
9715+
[[ "$proto" == -no_ssl2 ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
9716+
[[ "$proto" == -no_tls1_3 ]] && [[ -z "$ciphers_to_test" ]] && break
9717+
else
9718+
[[ -z "$ciphers_to_test" ]] && break
9719+
fi
97159720
$OPENSSL s_client $(s_client_options "$proto -cipher "\'${ciphers_to_test:1}\'" -ciphersuites "\'${tls13_ciphers_to_test:1}\'" $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") &>$TMPFILE </dev/null
97169721
sclient_connect_successful $? $TMPFILE || break
97179722
pfs_cipher=$(get_cipher $TMPFILE)

0 commit comments

Comments
 (0)