Merge pull request #796 from sdann/mysql_standard_cipher
Catch MySQL (yaSSL) server bug when testing standard cipher categories
This commit is contained in:
commit
90cd8cd3e2
13
testssl.sh
13
testssl.sh
|
@ -2317,6 +2317,17 @@ std_cipherlists() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [[ $sclient_success -ne 0 ]] && $BAD_SERVER_HELLO_CIPHER; then
|
||||||
|
# If server failed with a known error, raise it to the user.
|
||||||
|
if [[ $STARTTLS_PROTOCOL == "mysql" ]]; then
|
||||||
|
pr_warning "SERVER_ERROR: test inconclusive due to MySQL Community Edition (yaSSL) bug."
|
||||||
|
fileout "std_$4" "WARN" "SERVER_ERROR: test inconclusive due to MySQL Community Edition (yaSSL) bug."
|
||||||
|
else
|
||||||
|
pr_warning "SERVER_ERROR: test inconclusive."
|
||||||
|
fileout "std_$4" "WARN" "SERVER_ERROR: test inconclusive."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Otherwise the error means the server doesn't support that cipher list.
|
||||||
case $3 in
|
case $3 in
|
||||||
2) if [[ $sclient_success -eq 0 ]]; then
|
2) if [[ $sclient_success -eq 0 ]]; then
|
||||||
# Strong is excellent to offer
|
# Strong is excellent to offer
|
||||||
|
@ -2352,6 +2363,7 @@ std_cipherlists() {
|
||||||
pr_svrty_high "offered (NOT ok)"
|
pr_svrty_high "offered (NOT ok)"
|
||||||
fileout "std_$4" "HIGH" "$2 offered - bad"
|
fileout "std_$4" "HIGH" "$2 offered - bad"
|
||||||
else
|
else
|
||||||
|
# need a check for -eq 1 here
|
||||||
pr_done_good "not offered (OK)"
|
pr_done_good "not offered (OK)"
|
||||||
fileout "std_$4" "OK" "$2 not offered"
|
fileout "std_$4" "OK" "$2 not offered"
|
||||||
fi
|
fi
|
||||||
|
@ -2370,6 +2382,7 @@ std_cipherlists() {
|
||||||
fileout "std_$4" "WARN" "return condition $3 unclear"
|
fileout "std_$4" "WARN" "return condition $3 unclear"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
tmpfile_handle $FUNCNAME.$debugname.txt
|
tmpfile_handle $FUNCNAME.$debugname.txt
|
||||||
[[ $DEBUG -ge 1 ]] && tm_out " -- $1"
|
[[ $DEBUG -ge 1 ]] && tm_out " -- $1"
|
||||||
outln
|
outln
|
||||||
|
|
Loading…
Reference in New Issue