cosmetic corrections (output)

This commit is contained in:
Dirk Wetter 2015-07-08 11:34:45 +02:00
parent 5944c35075
commit d3b8f8e0a2
1 changed files with 10 additions and 10 deletions

View File

@ -543,11 +543,11 @@ EOF
301|302|307|308) out ", redirecting to \"$(grep -a '^Location' $HEADERFILE | sed 's/Location: //' | tr -d '\r\n')\"" ;; 301|302|307|308) out ", redirecting to \"$(grep -a '^Location' $HEADERFILE | sed 's/Location: //' | tr -d '\r\n')\"" ;;
200) ;; 200) ;;
206) out " -- WTF?" ;; 206) out " -- WTF?" ;;
400) pr_litemagenta " (better try another URL)" ;; 400) pr_litemagenta " (Hint: better try another URL)" ;;
401) grep -aq "^WWW-Authenticate" $HEADERFILE && out " "; strip_lf "$(grep -a "^WWW-Authenticate" $HEADERFILE)" 401) grep -aq "^WWW-Authenticate" $HEADERFILE && out " "; strip_lf "$(grep -a "^WWW-Authenticate" $HEADERFILE)"
;; ;;
403) ;; 403) ;;
404) out " (Maybe supply a path which doesn't give a \"$status_code$msg_thereafter\")" ;; 404) out " (Hint: supply a path which doesn't give a \"$status_code$msg_thereafter\")" ;;
405) ;; 405) ;;
*) pr_litemagenta ". Oh, didn't expect a $status_code$msg_thereafter";; *) pr_litemagenta ". Oh, didn't expect a $status_code$msg_thereafter";;
esac esac
@ -772,7 +772,7 @@ server_banner() {
else else
emphasize_stuff_in_headers "$serverbanner" emphasize_stuff_in_headers "$serverbanner"
[[ "$serverbanner" = *Microsoft-IIS/6.* ]] && [[ $OSSL_VER == 1.0.2* ]] && \ [[ "$serverbanner" = *Microsoft-IIS/6.* ]] && [[ $OSSL_VER == 1.0.2* ]] && \
pr_litemagentaln " It's recommended to run another test w/ OpenSSL 1.01 !" pr_litemagentaln " It's recommended to run another test w/ OpenSSL 1.01 !"
# see https://github.com/PeterMosmans/openssl/issues/19#issuecomment-100897892 # see https://github.com/PeterMosmans/openssl/issues/19#issuecomment-100897892
fi fi
# mozilla.github.io/server-side-tls/ssl-config-generator/ # mozilla.github.io/server-side-tls/ssl-config-generator/
@ -907,12 +907,12 @@ more_flags() {
for f2t in $other_flags2test; do for f2t in $other_flags2test; do
result_str=$(grep -i "^$f2t" $TMPFILE) result_str=$(grep -i "^$f2t" $TMPFILE)
[ -z "$result_str" ] && continue [ -z "$result_str" ] && continue
if $first; then if ! $first; then
outln "$result_str" out "$spaces" # output leading spaces if the first header
first=false
else else
out "$blanks"; outln "$result_str" first=false
fi fi
outln "$result_str"
done done
fi fi
#TODO: I am not testing for the correctness or anything stupid yet, e.g. "X-Frame-Options: allowall" #TODO: I am not testing for the correctness or anything stupid yet, e.g. "X-Frame-Options: allowall"
@ -1461,7 +1461,7 @@ server_preference() {
*TLSv1) outln $default_proto ;; *TLSv1) outln $default_proto ;;
*SSLv2) pr_redln $default_proto ;; *SSLv2) pr_redln $default_proto ;;
*SSLv3) pr_redln $default_proto ;; *SSLv3) pr_redln $default_proto ;;
"") pr_litemagenta "default proto empty"; [[ $OSSL_VER == 1.0.2* ]] && outln "(IIS6+OpenSSL 1.02?)" ;; # maybe you can try to use openssl 1.01 here "") pr_litemagenta "default proto empty"; [[ $OSSL_VER == 1.0.2* ]] && outln " (Hint: if IIS6 give OpenSSL 1.01 a try)" ;;
*) outln "$default_proto" ;; *) outln "$default_proto" ;;
esac esac
@ -1474,7 +1474,7 @@ server_preference() {
*GCM*) pr_green "$default_cipher" ;; # best ones *GCM*) pr_green "$default_cipher" ;; # best ones
*CHACHA20*) pr_green "$default_cipher" ;; # best ones *CHACHA20*) pr_green "$default_cipher" ;; # best ones
ECDHE*AES*) pr_yellow "$default_cipher" ;; # it's CBC. --> lucky13 ECDHE*AES*) pr_yellow "$default_cipher" ;; # it's CBC. --> lucky13
"") pr_litemagenta "default cipher empty" ; [[ $OSSL_VER == 1.0.2* ]] && out "(IIS6+OpenSSL 1.02?)" ;; # maybe you can try to use openssl 1.01 here "") pr_litemagenta "default cipher empty" ; [[ $OSSL_VER == 1.0.2* ]] && out " (Hint: if IIS6 give OpenSSL 1.01 a try)" ;;
*) out "$default_cipher" ;; *) out "$default_cipher" ;;
esac esac
read_dhbits_from_file "$TMPFILE" read_dhbits_from_file "$TMPFILE"
@ -4373,4 +4373,4 @@ fi
exit $ret exit $ret
# $Id: testssl.sh,v 1.304 2015/07/07 20:59:30 dirkw Exp $ # $Id: testssl.sh,v 1.305 2015/07/08 09:26:59 dirkw Exp $