Merge pull request #450 from dcooper16/determine_optimal_proto_fix

Fix SSLv2-only test in determine_optimal_proto()
This commit is contained in:
Dirk Wetter 2016-08-28 18:08:01 +02:00 committed by GitHub
commit a76e67cbbe
1 changed files with 2 additions and 0 deletions

View File

@ -7846,6 +7846,7 @@ determine_optimal_proto() {
fi fi
all_failed=0 all_failed=0
done done
[[ $all_failed -eq 0 ]] && STARTTLS_OPTIMAL_PROTO=""
debugme echo "STARTTLS_OPTIMAL_PROTO: $STARTTLS_OPTIMAL_PROTO" debugme echo "STARTTLS_OPTIMAL_PROTO: $STARTTLS_OPTIMAL_PROTO"
else else
for OPTIMAL_PROTO in '' -tls1_2 -tls1 -ssl3 -tls1_1 -ssl2; do for OPTIMAL_PROTO in '' -tls1_2 -tls1 -ssl3 -tls1_1 -ssl2; do
@ -7857,6 +7858,7 @@ determine_optimal_proto() {
fi fi
all_failed=0 all_failed=0
done done
[[ $all_failed -eq 0 ]] && OPTIMAL_PROTO=""
debugme echo "OPTIMAL_PROTO: $OPTIMAL_PROTO" debugme echo "OPTIMAL_PROTO: $OPTIMAL_PROTO"
if [[ "$OPTIMAL_PROTO" == "-ssl2" ]]; then if [[ "$OPTIMAL_PROTO" == "-ssl2" ]]; then
pr_magentaln "$NODEIP:$PORT appears to only support SSLv2." pr_magentaln "$NODEIP:$PORT appears to only support SSLv2."