Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-06 00:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TKCERT/testssl.sh into TKCERT-master

Browse Source
This commit is contained in:
Dirk 2016-09-27 21:48:43 +02:00
commit bf4dd76995
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testssl.sh
View File

@ -134,7 +134,7 @@ TERM_CURRPOS=0 # custom line wrapping ne
# following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host> # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host>
# 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help
declare -x OPENSSL declare -x OPENSSL OPENSSL_TIMEOUT
COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all
COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output
SHOW_EACH_C=${SHOW_EACH_C:-false} # where individual ciphers are tested show just the positively ones tested SHOW_EACH_C=${SHOW_EACH_C:-false} # where individual ciphers are tested show just the positively ones tested
@ -7284,6 +7284,10 @@ find_openssl_binary() {
grep -q '\-xmpp' $s_client_has && \ grep -q '\-xmpp' $s_client_has && \
HAS_XMPP=true HAS_XMPP=true
if [[ "$OPENSSL_TIMEOUT" != "" ]]; then
OPENSSL="timeout --preserve-status $OPENSSL_TIMEOUT $OPENSSL"
fi
return 0 return 0
} }
@ -7689,7 +7693,7 @@ parse_hn_port() {
prepare_logging() { prepare_logging() {
local fname_prefix="$1" local fname_prefix="$1"
[[ -z "$fname_prefix" ]] && fname_prefix="$NODE" [[ -z "$fname_prefix" ]] && fname_prefix="$NODE:$PORT"
if "$do_logging"; then if "$do_logging"; then
if [[ -z "$LOGFILE" ]]; then if [[ -z "$LOGFILE" ]]; then
@ -8654,6 +8658,10 @@ parse_cmd_line() {
OPENSSL=$(parse_opt_equal_sign "$1" "$2") OPENSSL=$(parse_opt_equal_sign "$1" "$2")
[[ $? -eq 0 ]] && shift [[ $? -eq 0 ]] && shift
;; ;;
--openssl-timeout|--openssl-timeout=*)
OPENSSL_TIMEOUT=$(parse_opt_equal_sign "$1" "$2")
[[ $? -eq 0 ]] && shift
;;
--mapping|--mapping=*) --mapping|--mapping=*)
local cipher_mapping local cipher_mapping
cipher_mapping=$(parse_opt_equal_sign "$1" "$2") cipher_mapping=$(parse_opt_equal_sign "$1" "$2")