Merge pull request #2508 from drwetter/make_rel3.0

Prepare for release 3.0
This commit is contained in:
Dirk Wetter 2024-06-13 18:32:28 +02:00 committed by GitHub
commit 4f9bfbc47c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions

View File

@ -1,12 +1,12 @@
Please make sure that you provide enough information so that we understand what your issue is about. Please make sure that you provide enough information so that we understand what your issue is about.
1. uname -a 1. ``uname -a``
2. testssl version from the banner: testssl.sh -b 2>/dev/null | head -4 | tail -2
3. git log | head -1 (if running from git repo). Important: If in doubt check the git log and/or check whether you run the lastest 3.0 version from the git repo. 2. testssl version from the banner: ``testssl.sh -b 2>/dev/null | head -4 | tail -2``
4. openssl version used by testssl.sh: testssl.sh -b 2>/dev/null | awk -F':' '/openssl/ { print $2}' 3. ``git log | head -1`` (if running from git repo). Important: If in doubt check the git log and/or check whether you run the lastest 3.0 version from the git repo.
4. openssl and bash version used by testssl.sh: ``testssl.sh -b 2>/dev/null | grep Using``
5. steps to reproduce: testssl.sh or docker command line, if possible incl. host 5. steps to reproduce: testssl.sh or docker command line, if possible incl. host

View File

@ -117,7 +117,7 @@ trap "child_error" USR1
########### Internal definitions ########### Internal definitions
# #
declare -r VERSION="3.0.8" declare -r VERSION="3.0.9"
declare -r SWCONTACT="dirk aet testssl dot sh" declare -r SWCONTACT="dirk aet testssl dot sh"
grep -E -q "dev|rc|beta" <<< "$VERSION" && \ grep -E -q "dev|rc|beta" <<< "$VERSION" && \
SWURL="https://testssl.sh/dev/" || SWURL="https://testssl.sh/dev/" ||
@ -17725,22 +17725,21 @@ mybanner() {
OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL')") OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL')")
bb1=$(cat <<EOF bb1=$(cat <<EOF
########################################################### #####################################################################
$PROG_NAME $VERSION from $PROG_NAME version $VERSION from
EOF EOF
) )
bb2=$(cat <<EOF bb2=$(cat <<EOF
This program is free software. Distribution and This program is free software. Distribution and modification under
modification under GPLv2 permitted. GPLv2 permitted. USAGE w/o ANY WARRANTY. USE IT AT YOUR OWN RISK!
USAGE w/o ANY WARRANTY. USE IT AT YOUR OWN RISK!
Please file bugs @ Please file bugs @
EOF EOF
) )
bb3=$(cat <<EOF bb3=$(cat <<EOF
########################################################### #####################################################################
EOF EOF
) )
pr_bold "$bb1 " pr_bold "$bb1 "
@ -17754,10 +17753,11 @@ EOF
pr_boldurl "https://testssl.sh/bugs/"; outln pr_boldurl "https://testssl.sh/bugs/"; outln
pr_bold "$bb3" pr_bold "$bb3"
outln "\n" outln "\n"
outln " Using \"$($OPENSSL version 2>/dev/null)\" [~$OPENSSL_NR_CIPHERS ciphers]" out " Using "; pr_italic "bash ${BASH_VERSINFO[0]}.${BASH_VERSINFO[1]}.${BASH_VERSINFO[2]}"; out ". "
out " on $HNAME:" pr_italic "$($OPENSSL version 2>/dev/null)"; outln " [~$OPENSSL_NR_CIPHERS ciphers]"
out " on $HNAME:"
outln "$OPENSSL_LOCATION" outln "$OPENSSL_LOCATION"
outln " (built: \"$OSSL_BUILD_DATE\", platform: \"$OSSL_VER_PLATFORM\")\n" out " (built: "; pr_italic "$OSSL_BUILD_DATE"; out ", platform: "; pr_italic "$OSSL_VER_PLATFORM"; outln ")"
} }
calc_scantime() { calc_scantime() {