Skip to content

Commit aaf7bf8

Browse files
author
David Cooper
committed
Backport #2157, #2160, #2162
This commit backports PR #2157, #2160, and #2162 from the 3.1dev branch to the 3.0 branch.
1 parent 793eaa3 commit aaf7bf8

2 files changed

Lines changed: 67 additions & 17 deletions

File tree

‎etc/tls_data.txt‎

100755100644
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,22 @@ c0,1c, c0,1b, c0,1a, c0,17, 00,1b, 00,93, 00,8b, 00,1f,
4545
c0,3b, c0,3a, c0,39, 00,b9, 00,b8, 00,b5, 00,b4, 00,2e,
4646
00,2d, 00,b1, 00,b0, 00,2c, 00,3b, 00,02, 00,01, 00,ff"
4747

48+
# 97 less common ciphers for TLS 1.2 and SPDY/NPN HTTP2/ALPN
49+
readonly TLS12_CIPHER_3RD_TRY="
50+
c0,3d, c0,3f, c0,41, c0,43, c0,45, c0,47, c0,49, c0,4b,
51+
c0,4d, c0,4f, c0,51, c0,53, c0,55, c0,57, c0,59, c0,5b,
52+
c0,5d, c0,5f, c0,61, c0,63, c0,65, c0,67, c0,69, c0,6b,
53+
c0,6d, c0,6f, c0,71, c0,7b, c0,7d, c0,7f, c0,81, c0,83,
54+
c0,85, c0,87, c0,89, c0,8b, c0,8d, c0,8f, c0,91, c0,93,
55+
16,b7, 16,b8, 16,b9, 16,ba, c0,3c, c0,3e, c0,40, c0,42,
56+
c0,44, c0,46, c0,48, c0,4a, c0,4c, c0,4e, c0,50, c0,52,
57+
c0,54, c0,56, c0,58, c0,5a, c0,5c, c0,5e, c0,60, c0,62,
58+
c0,64, c0,66, c0,68, c0,6a, c0,6c, c0,6e, c0,70, c0,7a,
59+
c0,7c, c0,7e, c0,80, c0,82, c0,84, c0,86, c0,88, c0,8a,
60+
c0,8c, c0,8e, c0,90, c0,92, fe,ff, ff,e0, 00,1e, 00,22,
61+
fe,fe, ff,e1, 00,27, 00,26, 00,2a, 00,29, 00,28, 00,2b,
62+
ff,87, 00,ff"
63+
4864
# 76 standard cipher + 4x GOST for SSLv3, TLS 1, TLS 1.1
4965
readonly TLS_CIPHER="
5066
c0,14, c0,0a, c0,22, c0,21, c0,20, 00,39, 00,38, 00,37,

‎testssl.sh‎

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,14 +1226,22 @@ count_ciphers() {
12261226
#arg3: options (e.g., -V)
12271227
actually_supported_osslciphers() {
12281228
local tls13_ciphers="$TLS13_OSSL_CIPHERS"
1229+
local options="$3 "
12291230

12301231
[[ "$2" != ALL ]] && tls13_ciphers="$2"
1232+
# With OpenSSL 1.0.2 the only way to exclude SSLv2 ciphers is to use the -tls1 option.
1233+
# However, with newer versions of OpenSSL, the -tls1 option excludes TLSv1.2 ciphers.
1234+
if "$HAS_SSL2"; then
1235+
options="${options//-no_ssl2 /-tls1 }"
1236+
else
1237+
options="${options//-no_ssl2 /}"
1238+
fi
12311239
if "$HAS_CIPHERSUITES"; then
1232-
$OPENSSL ciphers $3 $OSSL_CIPHERS_S -ciphersuites "$tls13_ciphers" "$1" 2>/dev/null || echo ""
1240+
$OPENSSL ciphers $options $OSSL_CIPHERS_S -ciphersuites "$tls13_ciphers" "$1" 2>/dev/null || echo ""
12331241
elif [[ -n "$tls13_ciphers" ]]; then
1234-
$OPENSSL ciphers $3 $OSSL_CIPHERS_S "$tls13_ciphers:$1" 2>/dev/null || echo ""
1242+
$OPENSSL ciphers $options $OSSL_CIPHERS_S "$tls13_ciphers:$1" 2>/dev/null || echo ""
12351243
else
1236-
$OPENSSL ciphers $OSSL_CIPHERS_S $3 "$1" 2>/dev/null || echo ""
1244+
$OPENSSL ciphers $OSSL_CIPHERS_S $options "$1" 2>/dev/null || echo ""
12371245
fi
12381246
}
12391247

@@ -3241,6 +3249,8 @@ openssl2hexcode() {
32413249
if [[ $TLS_NR_CIPHERS -eq 0 ]]; then
32423250
if "$HAS_CIPHERSUITES"; then
32433251
hexc="$($OPENSSL ciphers -V -ciphersuites "$TLS13_OSSL_CIPHERS" 'ALL:COMPLEMENTOFALL:@STRENGTH' | awk '/ '"$1"' / { print $1 }')"
3252+
elif "$HAS_SSL2"; then
3253+
hexc="$($OPENSSL ciphers -V -tls1 'ALL:COMPLEMENTOFALL:@STRENGTH' | awk '/ '"$1"' / { print $1 }')"
32443254
else
32453255
hexc="$($OPENSSL ciphers -V 'ALL:COMPLEMENTOFALL:@STRENGTH' | awk '/ '"$1"' / { print $1 }')"
32463256
fi
@@ -4898,10 +4908,11 @@ run_prototest_openssl() {
48984908
# arg2: available (yes) or not (no)
48994909
add_tls_offered() {
49004910
# the ":" is mandatory here (and @ other places), otherwise e.g. tls1 will match tls1_2
4901-
if [[ "$PROTOS_OFFERED" =~ $1: ]]; then
4902-
# we got that protocol already
4903-
:
4904-
else
4911+
if [[ "$2" == yes ]] && [[ "$PROTOS_OFFERED" =~ $1:no ]]; then
4912+
# In rare cases, a protocol may be marked as not available even though it is
4913+
# (e.g., the connection fails with tls_sockets() but succeeds with $OPENSSL.
4914+
PROTOS_OFFERED="${PROTOS_OFFERED/$1:no/$1:$2}"
4915+
elif [[ ! "$PROTOS_OFFERED" =~ $1: ]]; then
49054916
PROTOS_OFFERED+="${1}:$2 "
49064917
fi
49074918
}
@@ -6364,7 +6375,7 @@ run_server_preference() {
63646375
[[ $DEBUG -ge 4 ]] && echo -e "\n Forward: ${list_fwd}"
63656376
$OPENSSL s_client $(s_client_options "$STARTTLS -cipher $list_fwd $BUGS -connect $NODEIP:$PORT $PROXY $addcmd2") </dev/null 2>$ERRFILE >$TMPFILE
63666377
if ! sclient_connect_successful $? $TMPFILE; then
6367-
list_fwd="$(actually_supported_osslciphers $list_fwd '' '-tls1')"
6378+
list_fwd="$(actually_supported_osslciphers $list_fwd '' '-no_ssl2')"
63686379
pr_warning "no matching cipher in this list found (pls report this): "
63696380
outln "$list_fwd . "
63706381
fileout "$jsonID" "WARN" "Could not determine server cipher order, no matching cipher in list found (pls report this): $list_fwd"
@@ -17623,11 +17634,7 @@ prepare_arrays() {
1762317634

1762417635
if [[ -e "$CIPHERS_BY_STRENGTH_FILE" ]]; then
1762517636
"$HAS_SSL2" && ossl_supported_sslv2="$($OPENSSL ciphers -ssl2 -V 'ALL:COMPLEMENTOFALL:@STRENGTH' 2>$ERRFILE)"
17626-
if "$HAS_SSL2"; then
17627-
ossl_supported_tls="$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL' "-tls1 -V")"
17628-
else
17629-
ossl_supported_tls="$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL' "-V")"
17630-
fi
17637+
ossl_supported_tls="$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL' "-no_ssl2 -V")"
1763117638
TLS13_OSSL_CIPHERS=""
1763217639
while read hexc n TLS_CIPHER_OSSL_NAME[i] TLS_CIPHER_RFC_NAME[i] TLS_CIPHER_SSLVERS[i] TLS_CIPHER_KX[i] TLS_CIPHER_AUTH[i] TLS_CIPHER_ENC[i] mac TLS_CIPHER_EXPORT[i]; do
1763317640
TLS_CIPHER_HEXCODE[i]="$hexc"
@@ -18411,7 +18418,7 @@ sclient_auth() {
1841118418
# This information can be used by determine_optimal_proto() to help distinguish between a server
1841218419
# that is not TLS/SSL enabled and one that is not compatible with the version of OpenSSL being used.
1841318420
determine_optimal_sockets_params() {
18414-
local -i ret1=1 ret2=1
18421+
local -i ret1=1 ret2=1 ret3=1
1841518422
local i proto cipher_offered
1841618423
local all_failed=true
1841718424

@@ -18480,8 +18487,6 @@ determine_optimal_sockets_params() {
1848018487
add_tls_offered tls1_2 yes
1848118488
TLS12_CIPHER="$TLS12_CIPHER_2ND_TRY"
1848218489
all_failed=false
18483-
else
18484-
add_tls_offered tls1_2 no
1848518490
fi
1848618491
if [[ $ret2 -eq 2 ]]; then
1848718492
case $DETECTED_TLS_VERSION in
@@ -18493,7 +18498,32 @@ determine_optimal_sockets_params() {
1849318498
all_failed=false
1849418499
fi
1849518500
fi
18496-
if [[ $ret1 -eq 0 ]] || [[ $ret2 -eq 0 ]]; then
18501+
# Try a third time with cipher suites not in $TLS12_CIPHER or
18502+
# $TLS12_CIPHER_2ND_TRY. If using these cipher suites results in a
18503+
# successful connection, then change $TLS12_CIPHER to these
18504+
# cipher suites so that later tests will use this list of cipher
18505+
# suites.
18506+
if [[ $ret1 -ne 0 ]] && [[ $ret2 -ne 0 ]]; then
18507+
tls_sockets "03" "$TLS12_CIPHER_3RD_TRY"
18508+
ret3=$?
18509+
if [[ $ret3 -eq 0 ]]; then
18510+
add_tls_offered tls1_2 yes
18511+
TLS12_CIPHER="$TLS12_CIPHER_3RD_TRY"
18512+
all_failed=false
18513+
else
18514+
add_tls_offered tls1_2 no
18515+
fi
18516+
if [[ $ret3 -eq 2 ]]; then
18517+
case $DETECTED_TLS_VERSION in
18518+
0302) add_tls_offered tls1_1 yes ;;
18519+
0301) add_tls_offered tls1 yes ;;
18520+
0300) add_tls_offered ssl3 yes ;;
18521+
esac
18522+
[[ $ret1 -ne 2 ]] && [[ $ret2 -ne 2 ]] && TLS12_CIPHER="$TLS12_CIPHER_3RD_TRY"
18523+
all_failed=false
18524+
fi
18525+
fi
18526+
if [[ $ret1 -eq 0 ]] || [[ $ret2 -eq 0 ]] || [[ $ret3 -eq 0 ]]; then
1849718527
cipher_offered="$(get_cipher "$TEMPDIR/$NODEIP.parse_tls_serverhello.txt")"
1849818528
if [[ "$cipher_offered" == TLS_* ]] || [[ "$cipher_offered" == SSL_* ]]; then
1849918529
cipher_offered="$(rfc2hexcode "$cipher_offered")"
@@ -18614,6 +18644,10 @@ determine_optimal_proto() {
1861418644
[[ "$(has_server_protocol "tls1_1")" -ne 0 ]] && [[ "$(has_server_protocol "tls1")" -ne 0 ]] &&
1861518645
[[ "$(has_server_protocol "ssl3")" -ne 0 ]]; then
1861618646
TLS13_ONLY=true
18647+
elif [[ -z "$TLS12_CIPHER_OFFERED" ]] && [[ "$(has_server_protocol "tls1_2")" -eq 0 ]] && [[ "$(get_protocol $TMPFILE)" == TLSv1.2 ]]; then
18648+
TLS12_CIPHER_OFFERED="$(get_cipher $TMPFILE)"
18649+
TLS12_CIPHER_OFFERED="$(openssl2hexcode "$TLS12_CIPHER_OFFERED")"
18650+
[[ ${#TLS12_CIPHER_OFFERED} -eq 9 ]] && TLS12_CIPHER_OFFERED="${TLS12_CIPHER_OFFERED:2:2},${TLS12_CIPHER_OFFERED:7:2}" || TLS12_CIPHER_OFFERED=""
1861718651
fi
1861818652

1861918653
if [[ "$optimal_proto" == -ssl2 ]]; then

0 commit comments

Comments
 (0)