Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-11-03 23:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1469 from dcooper16/simplify_draft_tls13_version_determination

Browse Source 
Simplify code to determine draft TLS 1.3 version
This commit is contained in:
Dirk Wetter
2020-01-22 20:39:10 +01:00
committed by GitHub
parent 7619e430f2 43d83b27d4
commit ec722e0e9c
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
testssl.sh
View File

@@ -5398,13 +5398,8 @@ run_protocols() {
[[ $? -eq 0 ]] || break
if [[ "${TLS_SERVER_HELLO:8:3}" == 7F1 ]]; then
drafts_offered+=" ${TLS_SERVER_HELLO:8:4} "
else
for i in 16 15 14 13 12; do
if [[ "$TLS_SERVER_HELLO" =~ 002B00027F$i ]]; then
drafts_offered+=" 7F$i "
break
fi
done
elif [[ "$TLS_SERVER_HELLO" =~ 002B00027F1[2-6] ]]; then
drafts_offered+=" ${BASH_REMATCH:8:4} "
fi
done
KEY_SHARE_EXTN_NR="33"
@@ -5420,13 +5415,8 @@ run_protocols() {
[[ $? -eq 0 ]] || break
if [[ "$TLS_SERVER_HELLO" =~ 002B00020304 ]]; then
drafts_offered+=" 0304 "
else
for i in 1C 1B 1A 19 18 17; do
if [[ "$TLS_SERVER_HELLO" =~ 002B00027F$i ]]; then
drafts_offered+=" 7F$i "
break
fi
done
elif [[ "$TLS_SERVER_HELLO" =~ 002B00027F1[7-9A-C] ]]; then
drafts_offered+=" ${BASH_REMATCH:8:4} "
fi
done
KEY_SHARE_EXTN_NR="$key_share_extn_nr"
@@ -18228,13 +18218,8 @@ determine_optimal_sockets_params() {
add_tls_offered tls1_3_draft$(hex2dec "${TLS_SERVER_HELLO:10:2}") yes
elif [[ "$TLS_SERVER_HELLO" =~ 002B00020304 ]]; then
add_tls_offered tls1_3_rfc8446 yes
else
for i in 1C 1B 1A 19 18 17 16 15 14 13 12; do
if [[ "$TLS_SERVER_HELLO" =~ 002B00027F$i ]]; then
add_tls_offered tls1_3_draft$(hex2dec "$i") yes
break
fi
done
elif [[ "$TLS_SERVER_HELLO" =~ 002B00027F1[2-9A-C] ]]; then
add_tls_offered tls1_3_draft$(hex2dec "${BASH_REMATCH:10:2}") yes
fi
fi