Merge branch '2.9dev' of github.com:/drwetter/testssl.sh into 2.9dev
This commit is contained in:
commit
68540c5ee8
36
testssl.sh
36
testssl.sh
|
@ -17405,19 +17405,18 @@ determine_optimal_proto_sockets_helper() {
|
||||||
local proto=""
|
local proto=""
|
||||||
local optimal_proto=""
|
local optimal_proto=""
|
||||||
local starttls="$1"
|
local starttls="$1"
|
||||||
|
local -i ret
|
||||||
|
|
||||||
for proto in 03 01 04 00 02 22; do
|
for proto in 03 01 04 00 02 22; do
|
||||||
case $proto in
|
case $proto in
|
||||||
03) tls_sockets "$proto" "$TLS12_CIPHER"
|
03) tls_sockets "$proto" "$TLS12_CIPHER"
|
||||||
if [[ $? -eq 0 ]]; then
|
ret=$?
|
||||||
add_tls_offered tls1_2 yes; optimal_proto="-tls1_2"
|
if [[ $ret -eq 0 ]] || [[ $ret -eq 2 ]]; then
|
||||||
all_failed=false
|
case $DETECTED_TLS_VERSION in
|
||||||
break
|
0303) add_tls_offered tls1_2 yes; optimal_proto="-tls1_2" ;;
|
||||||
elif [[ $? -eq 2 ]]; then
|
0302) add_tls_offered tls1_1 yes; optimal_proto="-tls1_1" ;;
|
||||||
case $(get_protocol "$TEMPDIR/$NODEIP.parse_tls_serverhello.txt") in
|
0301) add_tls_offered tls1 yes; optimal_proto="-tls1" ;;
|
||||||
*1.1) add_tls_offered tls1_1 yes; optimal_proto="-tls1_1" ;;
|
0300) add_tls_offered ssl3 yes; optimal_proto="-ssl3" ;;
|
||||||
TLSv1) add_tls_offered tls1 yes; optimal_proto="-tls1" ;;
|
|
||||||
SSLv3) add_tls_offered ssl3 yes; optimal_proto="-ssl3" ;;
|
|
||||||
esac
|
esac
|
||||||
all_failed=false
|
all_failed=false
|
||||||
break
|
break
|
||||||
|
@ -17429,19 +17428,12 @@ determine_optimal_proto_sockets_helper() {
|
||||||
break
|
break
|
||||||
fi ;;
|
fi ;;
|
||||||
01|00|02) tls_sockets "$proto" "$TLS_CIPHER" "" "" "true"
|
01|00|02) tls_sockets "$proto" "$TLS_CIPHER" "" "" "true"
|
||||||
if [[ $? -eq 0 ]]; then
|
ret=$?
|
||||||
case $proto in
|
if [[ $ret -eq 0 ]] || [[ $ret -eq 2 ]]; then
|
||||||
01) add_tls_offered tls1 yes; optimal_proto="-tls1" ;;
|
case $DETECTED_TLS_VERSION in
|
||||||
00) add_tls_offered ssl3 yes; optimal_proto="-ssl3" ;;
|
0302) add_tls_offered tls1_1 yes; optimal_proto="-tls1_1" ;;
|
||||||
02) add_tls_offered tls1_1 yes; optimal_proto="-tls1_1" ;;
|
0301) add_tls_offered tls1 yes; optimal_proto="-tls1" ;;
|
||||||
esac
|
0300) add_tls_offered ssl3 yes; optimal_proto="-ssl3" ;;
|
||||||
all_failed=false
|
|
||||||
break
|
|
||||||
elif [[ $? -eq 2 ]]; then
|
|
||||||
case $(get_protocol "$TEMPDIR/$NODEIP.parse_tls_serverhello.txt") in
|
|
||||||
*1.1) add_tls_offered tls1_1 yes; optimal_proto="-tls1_1" ;;
|
|
||||||
TLSv1) add_tls_offered tls1 yes; optimal_proto="-tls1" ;;
|
|
||||||
SSLv3) add_tls_offered ssl3 yes; optimal_proto="-ssl3" ;;
|
|
||||||
esac
|
esac
|
||||||
all_failed=false
|
all_failed=false
|
||||||
break
|
break
|
||||||
|
|
|
@ -132,7 +132,7 @@ case $(uname) in
|
||||||
case $(uname -m) in
|
case $(uname -m) in
|
||||||
# No Kerberos (yet?) for Darwin. Static doesn't work for Darwin (#1204)
|
# No Kerberos (yet?) for Darwin. Static doesn't work for Darwin (#1204)
|
||||||
x86_64) clean || echo "nothing to clean"
|
x86_64) clean || echo "nothing to clean"
|
||||||
./config $openssldir_option $STDOPTIONS enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc
|
./Configure $openssldir_option $STDOPTIONS enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc
|
||||||
[ $? -ne 0 ] && error "configuring"
|
[ $? -ne 0 ] && error "configuring"
|
||||||
;;
|
;;
|
||||||
i386) clean || echo "nothing to clean"
|
i386) clean || echo "nothing to clean"
|
||||||
|
|
Loading…
Reference in New Issue