Skip to content

Commit 70e1c4d

Browse files
drwetterdrwetter
authored
Merge pull request #2689 from dcooper16/sort_tls_extns
Sort TLS extensions
2 parents 6ed6db5 + 75b78bc commit 70e1c4d

1 file changed

Lines changed: 37 additions & 22 deletions

File tree

‎testssl.sh‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ KNOWN_OSSL_PROB=false # We need OpenSSL a few times. This vari
277277
DETECTED_TLS_VERSION="" # .. as hex string, e.g. 0300 or 0303
278278
APP_TRAF_KEY_INFO="" # Information about the application traffic keys for a TLS 1.3 connection.
279279
TLS13_ONLY=false # Does the server support TLS 1.3 ONLY?
280-
TLS_EXTENSIONS=""
280+
declare -a TLS_EXTENSIONS=()
281281
TLS13_CERT_COMPRESS_METHODS=""
282282
CERTIFICATE_TRANSPARENCY_SOURCE=""
283283
V2_HELLO_CIPHERSPEC_LENGTH=0
@@ -7882,6 +7882,7 @@ sclient_connect_successful() {
78827882

78837883
extract_new_tls_extensions() {
78847884
local tls_extensions
7885+
local -i i
78857886

78867887
# this is not beautiful (grep+sed)
78877888
# but maybe we should just get the ids and do a private matching, according to
@@ -7895,12 +7896,15 @@ extract_new_tls_extensions() {
78957896
if [[ -n "$tls_extensions" ]]; then
78967897
# check to see if any new TLS extensions were returned and add any new ones to TLS_EXTENSIONS
78977898
while read -d "\"" -r line; do
7898-
if [[ $line != "" ]] && [[ ! "$TLS_EXTENSIONS" =~ "$line" ]]; then
7899-
#FIXME: This is a string of quoted strings, so this seems to determine the output format already. Better e.g. would be an array
7900-
TLS_EXTENSIONS+=" \"${line}\""
7899+
if [[ $line != "" ]] && [[ ! "${TLS_EXTENSIONS[*]}" =~ "$line" ]]; then
7900+
i=${#TLS_EXTENSIONS[*]}
7901+
while [[ $i -gt 0 ]] && [[ ${TLS_EXTENSIONS[i-1]#*/#} -gt ${line#*/#} ]]; do
7902+
TLS_EXTENSIONS[i]="${TLS_EXTENSIONS[i-1]}"
7903+
i=$((i-1))
7904+
done
7905+
TLS_EXTENSIONS[i]="$line"
79017906
fi
79027907
done <<<$tls_extensions
7903-
[[ "${TLS_EXTENSIONS:0:1}" == " " ]] && TLS_EXTENSIONS="${TLS_EXTENSIONS:1}"
79047908
fi
79057909
}
79067910

@@ -7916,7 +7920,7 @@ extract_new_tls_extensions() {
79167920
determine_tls_extensions() {
79177921
local addcmd
79187922
local -i success=1
7919-
local line params="" tls_extensions=""
7923+
local line params="" tls_extensions="" extn
79207924
local alpn_proto alpn="" alpn_list_len_hex alpn_extn_len_hex
79217925
local -i alpn_list_len alpn_extn_len
79227926
local cbc_cipher_list="ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DH-RSA-AES256-SHA256:DH-DSS-AES256-SHA256:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DH-RSA-AES256-SHA:DH-DSS-AES256-SHA:ECDHE-RSA-CAMELLIA256-SHA384:ECDHE-ECDSA-CAMELLIA256-SHA384:DHE-RSA-CAMELLIA256-SHA256:DHE-DSS-CAMELLIA256-SHA256:DH-RSA-CAMELLIA256-SHA256:DH-DSS-CAMELLIA256-SHA256:DHE-RSA-CAMELLIA256-SHA:DHE-DSS-CAMELLIA256-SHA:DH-RSA-CAMELLIA256-SHA:DH-DSS-CAMELLIA256-SHA:ECDH-RSA-AES256-SHA384:ECDH-ECDSA-AES256-SHA384:ECDH-RSA-AES256-SHA:ECDH-ECDSA-AES256-SHA:ECDH-RSA-CAMELLIA256-SHA384:ECDH-ECDSA-CAMELLIA256-SHA384:AES256-SHA256:AES256-SHA:CAMELLIA256-SHA256:CAMELLIA256-SHA:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:DHE-RSA-AES128-SHA256:DHE-DSS-AES128-SHA256:DH-RSA-AES128-SHA256:DH-DSS-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:DH-RSA-AES128-SHA:DH-DSS-AES128-SHA:ECDHE-RSA-CAMELLIA128-SHA256:ECDHE-ECDSA-CAMELLIA128-SHA256:DHE-RSA-CAMELLIA128-SHA256:DHE-DSS-CAMELLIA128-SHA256:DH-RSA-CAMELLIA128-SHA256:DH-DSS-CAMELLIA128-SHA256:DHE-RSA-SEED-SHA:DHE-DSS-SEED-SHA:DH-RSA-SEED-SHA:DH-DSS-SEED-SHA:DHE-RSA-CAMELLIA128-SHA:DHE-DSS-CAMELLIA128-SHA:DH-RSA-CAMELLIA128-SHA:DH-DSS-CAMELLIA128-SHA:ECDH-RSA-AES128-SHA256:ECDH-ECDSA-AES128-SHA256:ECDH-RSA-AES128-SHA:ECDH-ECDSA-AES128-SHA:ECDH-RSA-CAMELLIA128-SHA256:ECDH-ECDSA-CAMELLIA128-SHA256:AES128-SHA256:AES128-SHA:CAMELLIA128-SHA256:SEED-SHA:CAMELLIA128-SHA:IDEA-CBC-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DH-RSA-DES-CBC3-SHA:DH-DSS-DES-CBC3-SHA:ECDH-RSA-DES-CBC3-SHA:ECDH-ECDSA-DES-CBC3-SHA:DES-CBC3-SHA:EXP1024-DHE-DSS-DES-CBC-SHA:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DH-RSA-DES-CBC-SHA:DH-DSS-DES-CBC-SHA:EXP1024-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-DH-DSS-DES-CBC-SHA:EXP-DH-RSA-DES-CBC-SHA"
@@ -7938,7 +7942,7 @@ determine_tls_extensions() {
79387942
alpn_extn_len_hex=$(printf "%04x" $alpn_extn_len)
79397943
tls_extensions+=", 00,10,${alpn_extn_len_hex:0:2},${alpn_extn_len_hex:2:2},${alpn_list_len_hex:0:2},${alpn_list_len_hex:2:2}$alpn"
79407944
fi
7941-
if [[ ! "$TLS_EXTENSIONS" =~ encrypt-then-mac ]]; then
7945+
if [[ ! "${TLS_EXTENSIONS[*]}" =~ encrypt-then-mac ]]; then
79427946
tls_sockets "03" "$cbc_cipher_list_hex, 00,ff" "all" "$tls_extensions"
79437947
success=$?
79447948
fi
@@ -7963,7 +7967,7 @@ determine_tls_extensions() {
79637967
else
79647968
addcmd="$SNI"
79657969
fi
7966-
if [[ ! "$TLS_EXTENSIONS" =~ encrypt-then-mac ]]; then
7970+
if [[ ! "${TLS_EXTENSIONS[*]}" =~ encrypt-then-mac ]]; then
79677971
$OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $addcmd $OPTIMAL_PROTO -tlsextdebug $params -cipher $cbc_cipher_list") </dev/null 2>$ERRFILE >$TMPFILE
79687972
sclient_connect_successful $? $TMPFILE
79697973
success=$?
@@ -7978,7 +7982,13 @@ determine_tls_extensions() {
79787982
fi
79797983

79807984
# Keep it "on file" for debugging purposes
7981-
[[ "$DEBUG" -ge 1 ]] && safe_echo "$TLS_EXTENSIONS" >"$TEMPDIR/$NODE.$NODEIP.tls_extensions.txt"
7985+
if [[ "$DEBUG" -ge 1 ]]; then
7986+
tls_extensions=""
7987+
for extn in "${TLS_EXTENSIONS[@]}"; do
7988+
tls_extensions+=" \"${extn}\""
7989+
done
7990+
safe_echo "${tls_extensions:1}" >"$TEMPDIR/$NODE.$NODEIP.tls_extensions.txt"
7991+
fi
79827992

79837993
return $success
79847994
}
@@ -8863,7 +8873,7 @@ certificate_transparency() {
88638873
# determine_tls_extensions() discovered an SCT TLS extension. If the server has more than
88648874
# one certificate, then it is possible that an SCT TLS extension is returned for some
88658875
# certificates, but not for all of them.
8866-
if [[ $number_of_certificates -eq 1 ]] && [[ "$TLS_EXTENSIONS" =~ signed\ certificate\ timestamps ]]; then
8876+
if [[ $number_of_certificates -eq 1 ]] && [[ "${TLS_EXTENSIONS[*]}" =~ signed\ certificate\ timestamps ]]; then
88678877
CERTIFICATE_TRANSPARENCY_SOURCE="TLS extension"
88688878
return 0
88698879
fi
@@ -10074,7 +10084,7 @@ run_server_defaults() {
1007410084
local -a ocsp_response_binary ocsp_response ocsp_response_status sni_used tls_version ct
1007510085
local -a ciphers_to_test certificate_type
1007610086
local -a -i success
10077-
local cn_nosni cn_sni sans_nosni sans_sni san tls_extensions client_auth_ca
10087+
local cn_nosni cn_sni sans_nosni sans_sni san tls_extensions extn client_auth_ca
1007810088
local using_sockets=true
1007910089

1008010090
"$SSL_NATIVE" && using_sockets=false
@@ -10326,7 +10336,7 @@ run_server_defaults() {
1032610336
outln
1032710337

1032810338
pr_bold " TLS extensions (standard) "
10329-
if [[ -z "$TLS_EXTENSIONS" ]]; then
10339+
if [[ ${#TLS_EXTENSIONS[*]} -eq 0 ]]; then
1033010340
outln "(none)"
1033110341
fileout "TLS_extensions" "INFO" "(none)"
1033210342
else
@@ -10337,12 +10347,17 @@ run_server_defaults() {
1033710347
# across lines, temporarily replace space characters within the text
1033810348
# of an extension with "}", and then convert the "}" back to space in
1033910349
# the output of out_row_aligned_max_width().
10340-
tls_extensions="${TLS_EXTENSIONS// /{}"
10350+
tls_extensions=""
10351+
for extn in "${TLS_EXTENSIONS[@]}"; do
10352+
tls_extensions+=" \"${extn}\""
10353+
done
10354+
tls_extensions="${tls_extensions:1}"
10355+
fileout "TLS_extensions" "INFO" "$tls_extensions"
10356+
tls_extensions="${tls_extensions// /{}"
1034110357
tls_extensions="${tls_extensions//\"{\"/\" \"}"
1034210358
tls_extensions="$(out_row_aligned_max_width "$tls_extensions" " " $TERM_WIDTH)"
1034310359
tls_extensions="${tls_extensions//{/ }"
1034410360
outln "$tls_extensions"
10345-
fileout "TLS_extensions" "INFO" "$TLS_EXTENSIONS"
1034610361
fi
1034710362

1034810363
pr_bold " Session Ticket RFC 5077 hint "
@@ -16710,8 +16725,8 @@ run_heartbleed(){
1671016725
return 1
1671116726
fi
1671216727

16713-
[[ -z "$TLS_EXTENSIONS" ]] && determine_tls_extensions
16714-
if [[ ! "${TLS_EXTENSIONS}" =~ heartbeat ]]; then
16728+
[[ ${#TLS_EXTENSIONS[*]} -eq 0 ]] && determine_tls_extensions
16729+
if [[ ! "${TLS_EXTENSIONS[*]}" =~ heartbeat ]]; then
1671516730
pr_svrty_best "not vulnerable (OK)"
1671616731
outln ", no heartbeat extension"
1671716732
fileout "$jsonID" "OK" "not vulnerable, no heartbeat extension" "$cve" "$cwe"
@@ -17015,8 +17030,8 @@ run_ticketbleed() {
1701517030
fi
1701617031

1701717032
# highly unlikely that it is NOT supported. We may loose time here but it's more solid
17018-
[[ -z "$TLS_EXTENSIONS" ]] && determine_tls_extensions
17019-
if [[ ! "${TLS_EXTENSIONS}" =~ "session ticket" ]]; then
17033+
[[ ${#TLS_EXTENSIONS[*]} -eq 0 ]] && determine_tls_extensions
17034+
if [[ ! "${TLS_EXTENSIONS[*]}" =~ "session ticket" ]]; then
1702017035
pr_svrty_best "not vulnerable (OK)"
1702117036
outln ", no session ticket extension"
1702217037
fileout "$jsonID" "OK" "no session ticket extension" "$cve" "$cwe"
@@ -19118,7 +19133,7 @@ run_winshock() {
1911819133
# (~ sub_check_curves) which is some work. But also for the sake of clean code this needs to be done.
1911919134

1912019135

19121-
[[ -z "$TLS_EXTENSIONS" ]] && determine_tls_extensions
19136+
[[ ${#TLS_EXTENSIONS[*]} -eq 0 ]] && determine_tls_extensions
1912219137
# Basis of the following https://en.wikipedia.org/wiki/Comparison_of_TLS_implementations#Extensions
1912319138
# Our standard: https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
1912419139

@@ -19132,9 +19147,9 @@ run_winshock() {
1913219147
local -a forbidden_tls_ext=("encrypt-then-mac" "max fragment length")
1913319148
# Open whether ec_point_formats, supported_groups(=elliptic_curves), heartbeat are supported under windows <=2012
1913419149
# key_share and supported_versions are extensions which came with TLS 1.3. We checked the protocol before.
19135-
if [[ -n "$TLS_EXTENSIONS" ]]; then
19150+
if [[ ${#TLS_EXTENSIONS[*]} -gt 0 ]]; then
1913619151
# Check whether there are any TLS extension which should not be available under <= Windows 2012 R2
19137-
for tls_ext in $TLS_EXTENSIONS; do
19152+
for tls_ext in "${TLS_EXTENSIONS[@]}"; do
1913819153
# We use the whole array, got to be careful when the array becomes bigger (unintended match)
1913919154
if [[ ${forbidden_tls_ext[@]} =~ $tls_ext ]]; then
1914019155
pr_svrty_best "not vulnerable (OK)"; outln " - TLS extension $tls_ext detected"
@@ -24376,7 +24391,7 @@ reset_hostdepended_vars() {
2437624391
NR_OSSL_FAIL=0
2437724392
NR_STARTTLS_FAIL=0
2437824393
NR_HEADER_FAIL=0
24379-
TLS_EXTENSIONS=""
24394+
TLS_EXTENSIONS=()
2438024395
TLS13_CERT_COMPRESS_METHODS=""
2438124396
CERTIFICATE_TRANSPARENCY_SOURCE=""
2438224397
PROTOS_OFFERED=""

0 commit comments

Comments
 (0)