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

Merge pull request #1201 from dcooper16/fix_check_tls12_pref

Browse Source 
Fix check_tls12_pref()
This commit is contained in:
Dirk Wetter 2019-02-18 10:39:20 +01:00 committed by GitHub
commit 2124f51b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testssl.sh
View File

@ -6270,7 +6270,7 @@ run_server_preference() {
check_tls12_pref() { check_tls12_pref() {
local batchremoved="-CAMELLIA:-IDEA:-KRB5:-PSK:-SRP:-aNULL:-eNULL" local batchremoved="-CAMELLIA:-IDEA:-KRB5:-PSK:-SRP:-aNULL:-eNULL"
local batchremoved_success=false local batchremoved_success=false
local tested_cipher="" local tested_cipher="" cipher ciphers_to_test
local order="" local order=""
local -i nr_ciphers_found_r1=0 nr_ciphers_found_r2=0 local -i nr_ciphers_found_r1=0 nr_ciphers_found_r2=0
@ -6309,11 +6309,15 @@ check_tls12_pref() {
if "$batchremoved_success"; then if "$batchremoved_success"; then
# now we combine the two cipher sets from both while loops # now we combine the two cipher sets from both while loops
[[ "${order:0:1}" == " " ]] && order="${order:1}" combined_ciphers="$order"
combined_ciphers="${order// /:}"
order="" ; tested_cipher="" order="" ; tested_cipher=""
while true; do while true; do
$OPENSSL s_client $(s_client_options "$STARTTLS -tls1_2 $BUGS -cipher "$combined_ciphers$tested_cipher" -connect $NODEIP:$PORT $PROXY $SNI") </dev/null 2>>$ERRFILE >$TMPFILE ciphers_to_test=""
for cipher in $combined_ciphers; do
[[ ! "$tested_cipher:" =~ :-$cipher: ]] && ciphers_to_test+=":$cipher"
done
[[ -z "$ciphers_to_test" ]] && break
$OPENSSL s_client $(s_client_options "$STARTTLS -tls1_2 $BUGS -cipher "${ciphers_to_test:1}" -connect $NODEIP:$PORT $PROXY $SNI") </dev/null 2>>$ERRFILE >$TMPFILE
if sclient_connect_successful $? $TMPFILE ; then if sclient_connect_successful $? $TMPFILE ; then
cipher=$(get_cipher $TMPFILE) cipher=$(get_cipher $TMPFILE)
order+=" $cipher" order+=" $cipher"
@ -6321,7 +6325,7 @@ check_tls12_pref() {
nr_ciphers_found_r2+=1 nr_ciphers_found_r2+=1
"$FAST" && break "$FAST" && break
else else
# nothing left, we're done # This shouldn't happen.
break break
fi fi
done done