Merge pull request #2263 from dcooper16/run_pfs_infinite_loop

Fix infinite loop in run_pfs()
This commit is contained in:
Dirk Wetter 2022-11-10 10:49:33 +01:00 committed by GitHub
commit 9eeb93625d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9711,7 +9711,12 @@ run_pfs() {
fi
fi
done
[[ -z "$ciphers_to_test" ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
if "$HAS_TLS13"; then
[[ "$proto" == -no_ssl2 ]] && [[ -z "$tls13_ciphers_to_test" ]] && break
[[ "$proto" == -no_tls1_3 ]] && [[ -z "$ciphers_to_test" ]] && break
else
[[ -z "$ciphers_to_test" ]] && break
fi
$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
sclient_connect_successful $? $TMPFILE || break
pfs_cipher=$(get_cipher $TMPFILE)