see #401, part 2

This commit is contained in:
Dirk 2016-07-04 23:52:52 +02:00
parent 251e3f9a3b
commit 2bba19360f
1 changed files with 4 additions and 4 deletions

View File

@ -4071,7 +4071,7 @@ certificate_info() {
fi fi
else else
cn="no CN field in subject" cn="no CN field in subject"
pr_warning "($cn)" outln "($cn)"
cnfinding="$cn" cnfinding="$cn"
cnok="INFO" cnok="INFO"
fi fi
@ -4378,7 +4378,7 @@ run_server_defaults() {
fi fi
i=$((i + 1)) i=$((i + 1))
done done
if ! $match_found && [[ $n -ge 8 ]] && [[ $certs_found -ne 0 ]]; then if ! "$match_found" && [[ $n -ge 8 ]] && [[ $certs_found -ne 0 ]]; then
# A new certificate was found using TLSv1.1 without SNI. # A new certificate was found using TLSv1.1 without SNI.
# Check to see if the new certificate should be displayed. # Check to see if the new certificate should be displayed.
# It should be displayed if it is either a match for the # It should be displayed if it is either a match for the
@ -4416,7 +4416,7 @@ run_server_defaults() {
# that the new certificate will not be included in the output. # that the new certificate will not be included in the output.
[[ ${success[n]} -ne 0 ]] && match_found=true [[ ${success[n]} -ne 0 ]] && match_found=true
fi fi
if ! $match_found ; then if ! "$match_found"; then
certs_found=$(($certs_found + 1)) certs_found=$(($certs_found + 1))
cipher[certs_found]=${ciphers_to_test[n]} cipher[certs_found]=${ciphers_to_test[n]}
keysize[certs_found]=$(grep -aw "^Server public key is" $TMPFILE | sed -e 's/^Server public key is //' -e 's/bit//' -e 's/ //') keysize[certs_found]=$(grep -aw "^Server public key is" $TMPFILE | sed -e 's/^Server public key is //' -e 's/bit//' -e 's/ //')
@ -8270,4 +8270,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.515 2016/07/04 21:05:11 dirkw Exp $ # $Id: testssl.sh,v 1.517 2016/07/04 21:52:51 dirkw Exp $