33e5fc630e
Changes: Fix "ID resumption test failed" bug under Darwin Fix "locale error message when en_US.UTF-8 isn't available" bug Fix "Darwin / LibreSSL startup problem" which leads to a question upfront Make upfront handshake tests more compatible by adding </dev/null (David) Take 'HTTP Age' HTTP header into account when determine HTTP time (Wahnes) Fix JSON header (structured JSON output) name (David) Robustness: Update reset_hostdepended_vars() for mass tests (David) Simplify determination of git stuff (Matthias) Fix "newline to spaces" in JSON and CSV findings (David) Fix "Bad file descriptor with --connect-timeout option" SSLv2 fixes, OpenSSL fixes 3.X (David) Improve cipher_pref_check() for detecting prioritization of ChaCha ciphers Simplify + speed up pre-check Addressing lame DNS responses on WSL Fix big serial # issue in certs Fix invalid JSON when certificate issuer containing non-ASCII chars
29 lines
1.6 KiB
Bash
29 lines
1.6 KiB
Bash
--- testssl.sh.orig 2022-02-19 20:34:21 UTC
|
|
+++ testssl.sh
|
|
@@ -132,7 +132,7 @@ declare -r RUN_DIR="$(dirname "$0")"
|
|
declare -r SYSTEM="$(uname -s)"
|
|
declare -r SYSTEMREV="$(uname -r)"
|
|
SYSTEM2="" # currently only being used for WSL = bash on windows
|
|
-TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}" # If you run testssl.sh and it doesn't find it necessary file automagically set TESTSSL_INSTALL_DIR
|
|
+TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-"%%DATADIR%%"}" # If you run testssl.sh and it doesn't find it necessary file automagically set TESTSSL_INSTALL_DIR
|
|
CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # You can have your stores some place else
|
|
ADDITIONAL_CA_FILES="${ADDITIONAL_CA_FILES:-""}" # single file with a CA in PEM format or comma separated lists of them
|
|
CIPHERS_BY_STRENGTH_FILE=""
|
|
@@ -187,6 +187,9 @@ TERM_CURRPOS=0
|
|
########### Defining (and presetting) variables which can be changed
|
|
#
|
|
# Following variables make use of $ENV and can be used like "OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <URI>"
|
|
+if [[ -z "$OPENSSL" ]]; then
|
|
+ OPENSSL="%%PREFIX%%/openssl-unsafe/bin/openssl"
|
|
+fi
|
|
declare -x OPENSSL
|
|
OPENSSL_TIMEOUT=${OPENSSL_TIMEOUT:-""} # Default connect timeout with openssl before we call the server side unreachable
|
|
CONNECT_TIMEOUT=${CONNECT_TIMEOUT:-""} # Default connect timeout with sockets before we call the server side unreachable
|
|
@@ -20345,7 +20348,6 @@ lets_roll() {
|
|
mybanner
|
|
check_proxy
|
|
check4openssl_oldfarts
|
|
- check_bsd_mount
|
|
setup_lc_collate
|
|
|
|
if "$do_display_only"; then
|