Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-02-27 10:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary "if" statements and remove break from "if" statements

Browse Source
This commit is contained in:
Riccardo Germenia 2025-02-20 15:45:05 +01:00
parent 355b9d2dcc
commit b3609603f9
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
testssl.sh
View File

@ -10873,22 +10873,18 @@ run_fs() {
[[ $i -eq $high ]] && break [[ $i -eq $high ]] && break
supported_curve[i]=true supported_curve[i]=true
done done
while true; do # Versions of TLS prior to 1.3 close the connection if the client does not support the curve
# Versions of TLS prior to 1.3 close the connection if the client does not support the curve # used in the certificate. The easiest solution is to move the curves to the end of the list.
# used in the certificate. The easiest solution is to move the curves to the end of the list. # instead of removing them from the ClientHello. This is only needed if there is no RSA certificate.
# instead of removing them from the ClientHello. This is only needed if there is no RSA certificate. if (! "$HAS_TLS13" || [[ "$proto" == "-no_tls1_3" ]]) && [[ ! "$ecdhe_cipher_list" == *RSA* ]]; then
if ((! "$HAS_TLS13" || [[ "$proto" == "-no_tls1_3" ]]) && [[ ! "$ecdhe_cipher_list" == *RSA* ]]) || break; then while true; do
curves_to_test="" curves_to_test=""
for (( i=low; i < high; i++ )); do for (( i=low; i < high; i++ )); do
if ! "${curves_deprecated[i]}"; then "${ossl_supported[i]}" && ! "${supported_curve[i]}" && curves_to_test+=":${curves_ossl[i]}"
"${ossl_supported[i]}" && ! "${supported_curve[i]}" && curves_to_test+=":${curves_ossl[i]}"
fi
done done
[[ -z "$curves_to_test" ]] && break [[ -z "$curves_to_test" ]] && break
for (( i=low; i < high; i++ )); do for (( i=low; i < high; i++ )); do
if ! "${curves_deprecated[i]}"; then "${supported_curve[i]}" && curves_to_test+=":${curves_ossl[i]}"
"${supported_curve[i]}" && curves_to_test+=":${curves_ossl[i]}"
fi
done done
$OPENSSL s_client $(s_client_options "$proto -cipher "\'${ecdhe_cipher_list:1}\'" -ciphersuites "\'${tls13_cipher_list:1}\'" -curves "${curves_to_test:1}" $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") &>$TMPFILE </dev/null $OPENSSL s_client $(s_client_options "$proto -cipher "\'${ecdhe_cipher_list:1}\'" -ciphersuites "\'${tls13_cipher_list:1}\'" -curves "${curves_to_test:1}" $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") &>$TMPFILE </dev/null
sclient_connect_successful $? $TMPFILE || break sclient_connect_successful $? $TMPFILE || break
@ -10909,8 +10905,8 @@ run_fs() {
done done
[[ $i -eq $high ]] && break [[ $i -eq $high ]] && break
supported_curve[i]=true supported_curve[i]=true
fi done
done fi
done done
done done
fi fi
@ -10950,19 +10946,15 @@ run_fs() {
# Versions of TLS prior to 1.3 close the connection if the client does not support the curve # Versions of TLS prior to 1.3 close the connection if the client does not support the curve
# used in the certificate. The easiest solution is to move the curves to the end of the list. # used in the certificate. The easiest solution is to move the curves to the end of the list.
# instead of removing them from the ClientHello. This is only needed if there is no RSA certificate. # instead of removing them from the ClientHello. This is only needed if there is no RSA certificate.
while true; do if ([[ "$proto" == 03 ]] && [[ ! "$ecdhe_cipher_list" == *RSA* ]]); then
if ([[ "$proto" == 03 ]] && [[ ! "$ecdhe_cipher_list" == *RSA* ]]) || break; then while true; do
curves_to_test="" curves_to_test=""
for (( i=0; i < nr_curves; i++ )); do for (( i=0; i < nr_curves; i++ )); do
if ! "${curves_deprecated[i]}" || [[ "$proto" == 03 ]]; then ! "${supported_curve[i]}" && curves_to_test+=", ${curves_hex[i]}"
! "${supported_curve[i]}" && curves_to_test+=", ${curves_hex[i]}"
fi
done done
[[ -z "$curves_to_test" ]] && break [[ -z "$curves_to_test" ]] && break
for (( i=0; i < nr_curves; i++ )); do for (( i=0; i < nr_curves; i++ )); do
if ! "${curves_deprecated[i]}" || [[ "$proto" == 03 ]]; then "${supported_curve[i]}" && curves_to_test+=", ${curves_hex[i]}"
"${supported_curve[i]}" && curves_to_test+=", ${curves_hex[i]}"
fi
done done
len1=$(printf "%02x" "$((2*${#curves_to_test}/7))") len1=$(printf "%02x" "$((2*${#curves_to_test}/7))")
len2=$(printf "%02x" "$((2*${#curves_to_test}/7+2))") len2=$(printf "%02x" "$((2*${#curves_to_test}/7+2))")
@ -10980,8 +10972,8 @@ run_fs() {
done done
[[ $i -eq $nr_curves ]] && break [[ $i -eq $nr_curves ]] && break
supported_curve[i]=true supported_curve[i]=true
fi done
done fi
done done
fi fi
if "$ecdhe_offered"; then if "$ecdhe_offered"; then