diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2020-09-29 10:10:50 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2020-09-29 10:10:50 +0000 |
| commit | 3ccf9c24eada821fc6a3c4478a8182e342d07ce5 (patch) | |
| tree | 9625b7fedd83074926baf8e2ee09242efa797c4d /security/testssl.sh/files/patch-testssl.sh | |
| parent | audio/gsequencer: Update 3.5.12 -> 3.5.13 (diff) | |
security/testssl.sh: Turn REINPLACEs into patches
While here, improve some text strings and general formatting.
Notes
Notes:
svn path=/head/; revision=550490
Diffstat (limited to 'security/testssl.sh/files/patch-testssl.sh')
| -rw-r--r-- | security/testssl.sh/files/patch-testssl.sh | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/security/testssl.sh/files/patch-testssl.sh b/security/testssl.sh/files/patch-testssl.sh index 3682b3941005..13c5e3bee4a2 100644 --- a/security/testssl.sh/files/patch-testssl.sh +++ b/security/testssl.sh/files/patch-testssl.sh @@ -1,12 +1,29 @@ ---- testssl.sh.orig 2019-12-11 11:41:31 UTC +--- testssl.sh.orig 2020-09-29 09:50:09 UTC +++ testssl.sh -@@ -190,6 +190,9 @@ TERM_CURRPOS=0 +@@ -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 ++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 +@@ -20128,7 +20131,6 @@ lets_roll() { + mybanner + check_proxy + check4openssl_oldfarts +- check_bsd_mount + + + if "$do_display_only"; then |