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

Merge branch '2.9dev' into openssl_location

Browse Source
This commit is contained in:
David Cooper 2017-04-11 13:17:22 -04:00
commit 91695fe07e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testssl.sh
View File

@ -10386,7 +10386,7 @@ get_install_dir() {
ignore_no_or_lame "Type \"yes\" to ignore this warning and proceed at your own risk" "yes" ignore_no_or_lame "Type \"yes\" to ignore this warning and proceed at your own risk" "yes"
[[ $? -ne 0 ]] && exit -2 [[ $? -ne 0 ]] && exit -2
else else
. $TLS_DATA_FILE : # see #705, in a nutshell: not portable to initialize a global array inside a function. Thus it'll be done in main part below
fi fi
} }
@ -12451,6 +12451,8 @@ lets_roll() {
json_header json_header
csv_header csv_header
get_install_dir get_install_dir
# see #705, we need to source TLS_DATA_FILE here instead of in get_install_dir(), see #705
[[ -r "$TLS_DATA_FILE" ]] && . $TLS_DATA_FILE
set_color_functions set_color_functions
maketempf maketempf
find_openssl_binary find_openssl_binary