diff --git a/security/testssl.sh/Makefile b/security/testssl.sh/Makefile index ce5f018d1a19..aaac5c9bd6ea 100644 --- a/security/testssl.sh/Makefile +++ b/security/testssl.sh/Makefile @@ -1,7 +1,6 @@ PORTNAME= testssl.sh DISTVERSIONPREFIX= v -DISTVERSION= 3.0.8 -PORTREVISION= 1 +DISTVERSION= 3.2rc3 CATEGORIES= security MAINTAINER= adamw@FreeBSD.org @@ -18,10 +17,9 @@ TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON USES= perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= drwetter - +USE_PERL5= test SHEBANG_FILES= testssl.sh utils/* -USE_PERL5= test TEST_ENV= TESTSSL_INSTALL_DIR=${WRKSRC} NO_ARCH= yes diff --git a/security/testssl.sh/distinfo b/security/testssl.sh/distinfo index b48ccd7ae247..320a7401a381 100644 --- a/security/testssl.sh/distinfo +++ b/security/testssl.sh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664409825 -SHA256 (drwetter-testssl.sh-v3.0.8_GH0.tar.gz) = 22c5dc6dfc7500db94b6f8a48775f72b5149d0a372b8552ed7666016ee79edf0 -SIZE (drwetter-testssl.sh-v3.0.8_GH0.tar.gz) = 9372229 +TIMESTAMP = 1710489439 +SHA256 (drwetter-testssl.sh-v3.2rc3_GH0.tar.gz) = 27a3db4060ac6c1e75c0d4aad9d9ef62c1306a6ceb0e1f318b1360bbd296cb96 +SIZE (drwetter-testssl.sh-v3.2rc3_GH0.tar.gz) = 9448376 diff --git a/security/testssl.sh/files/patch-testssl.sh b/security/testssl.sh/files/patch-testssl.sh index 46ad2069d189..58a526c50b02 100644 --- a/security/testssl.sh/files/patch-testssl.sh +++ b/security/testssl.sh/files/patch-testssl.sh @@ -1,25 +1,25 @@ ---- testssl.sh.orig 2022-02-19 20:34:21 UTC +--- testssl.sh.orig 2024-03-15 00:58:23 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 +@@ -149,6 +149,9 @@ ########### Defining (and presetting) variables which can be changed # - # Following variables make use of $ENV and can be used like "OPENSSL= ./testssl.sh " + # Following variables make use of $ENV and can also be used like "= ./testssl.sh " +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() { +@@ -192,7 +195,7 @@ + + ########### Tuning vars which cannot be set by a cmd line switch. Use instead e.g "HEADER_MAXSLEEP=10 ./testssl.sh " + # +-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 CA stores some place else + EXPERIMENTAL=${EXPERIMENTAL:-false} # a development hook which allows us to disable code + PROXY_WAIT=${PROXY_WAIT:-20} # waiting at max 20 seconds for socket reply through proxy +@@ -24072,7 +24075,6 @@ mybanner check_proxy check4openssl_oldfarts diff --git a/security/testssl.sh/pkg-plist b/security/testssl.sh/pkg-plist index a87771213426..5649dbfaee77 100644 --- a/security/testssl.sh/pkg-plist +++ b/security/testssl.sh/pkg-plist @@ -7,6 +7,7 @@ share/man/man1/testssl.1.gz %%DATADIR%%/etc/Microsoft.pem %%DATADIR%%/etc/Mozilla.pem %%DATADIR%%/etc/README.md +%%DATADIR%%/etc/SSLSocketClient.java %%DATADIR%%/etc/ca_hashes.txt %%DATADIR%%/etc/cipher-mapping.txt %%DATADIR%%/etc/client-simulation.txt @@ -28,6 +29,7 @@ share/man/man1/testssl.1.gz %%DATADIR%%/utils/gmap2testssl.sh %%DATADIR%%/utils/heartbleed.bash %%DATADIR%%/utils/hexstream2cipher.sh +%%DATADIR%%/utils/hexstream2curves.sh %%DATADIR%%/utils/make-openssl.sh %%DATADIR%%/utils/make-openssl111.sh %%DATADIR%%/utils/parse_client_ciphers.pl