Merge pull request #1194 from dcooper16/fix_determine_optimal_proto

Fix determine_optimal_proto()
This commit is contained in:
Dirk Wetter 2019-02-13 13:31:39 +01:00 committed by GitHub
commit e8a5ab60cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17164,11 +17164,11 @@ determine_optimal_proto() {
break break
fi ;; fi ;;
22) sslv2_sockets 22) sslv2_sockets
[[ $? -eq 0 ]] && all_failed=false && add_tls_offered ssl2 yes && OPTIMAL_PROTO="-ssl2" [[ $? -eq 3 ]] && all_failed=false && add_tls_offered ssl2 yes && OPTIMAL_PROTO="-ssl2"
;; ;;
esac esac
done done
cp $TEMPDIR/$NODEIP.parse_tls_serverhello.txt $TMPFILE [[ "$proto" != 22 ]] && cp $TEMPDIR/$NODEIP.parse_tls_serverhello.txt $TMPFILE
debugme echo "proto: $proto" debugme echo "proto: $proto"
else else
# no sockets # no sockets
@ -17213,7 +17213,7 @@ determine_optimal_proto() {
ignore_no_or_lame " Type \"yes\" to proceed and accept false negatives or positives" "yes" ignore_no_or_lame " Type \"yes\" to proceed and accept false negatives or positives" "yes"
[[ $? -ne 0 ]] && exit $ERR_CLUELESS [[ $? -ne 0 ]] && exit $ERR_CLUELESS
fi fi
grep -q '^Server Temp Key' $TMPFILE && HAS_DH_BITS=true # FIX #190 [[ "$proto" != 22 ]] && grep -q '^Server Temp Key' $TMPFILE && HAS_DH_BITS=true # FIX #190
fi fi
if "$all_failed"; then if "$all_failed"; then