Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-11-03 23:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2167 from drwetter/fix_banner

Browse Source 
Minor changes to banner
This commit is contained in:
Dirk Wetter
2022-05-04 10:48:18 +02:00
committed by GitHub
parent 0329eba688 34cc20b0df
commit 859da96ad0
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testssl.sh
View File

@@ -1526,7 +1526,7 @@ html_banner() {
if "$CHILD_MASS_TESTING" && "$HTMLHEADER"; then if "$CHILD_MASS_TESTING" && "$HTMLHEADER"; then
html_out "## Scan started as: \"$PROG_NAME $CMDLINE\"\n" html_out "## Scan started as: \"$PROG_NAME $CMDLINE\"\n"
html_out "## at $HNAME:$OPENSSL_LOCATION\n" html_out "## at $HNAME:$OPENSSL_LOCATION\n"
html_out "## version testssl: $VERSION ${GIT_REL_SHORT:-$CVS_REL_SHORT} from $REL_DATE\n" html_out "## version testssl: $VERSION ${GIT_REL_SHORT} from $REL_DATE\n"
html_out "## version openssl: \"$OSSL_NAME $OSSL_VER\" from \"$OSSL_BUILD_DATE\")\n\n" html_out "## version openssl: \"$OSSL_NAME $OSSL_VER\" from \"$OSSL_BUILD_DATE\")\n\n"
fi fi
} }
@@ -1577,7 +1577,7 @@ prepare_logging() {
fi fi
tmln_out "## Scan started as: \"$PROG_NAME $CMDLINE\"" >>"$LOGFILE" tmln_out "## Scan started as: \"$PROG_NAME $CMDLINE\"" >>"$LOGFILE"
tmln_out "## at $HNAME:$OPENSSL_LOCATION" >>"$LOGFILE" tmln_out "## at $HNAME:$OPENSSL_LOCATION" >>"$LOGFILE"
tmln_out "## version testssl: $VERSION ${GIT_REL_SHORT:-$CVS_REL_SHORT} from $REL_DATE" >>"$LOGFILE" tmln_out "## version testssl: $VERSION ${GIT_REL_SHORT} from $REL_DATE" >>"$LOGFILE"
tmln_out "## version openssl: \"$OSSL_VER\" from \"$OSSL_BUILD_DATE\")\n" >>"$LOGFILE" tmln_out "## version openssl: \"$OSSL_VER\" from \"$OSSL_BUILD_DATE\")\n" >>"$LOGFILE"
exec > >(tee -a -i "$LOGFILE") exec > >(tee -a -i "$LOGFILE")
} }
@@ -20064,7 +20064,6 @@ prepare_debug() {
cat >$TEMPDIR/environment.txt << EOF cat >$TEMPDIR/environment.txt << EOF
CVS_REL: $CVS_REL
GIT_REL: $GIT_REL GIT_REL: $GIT_REL
PID: $$ PID: $$
@@ -20221,15 +20220,11 @@ prepare_arrays() {
mybanner() { mybanner() {
local idtag
local bb1 bb2 bb3 local bb1 bb2 bb3
"$QUIET" && return "$QUIET" && return
"$CHILD_MASS_TESTING" && return "$CHILD_MASS_TESTING" && return
OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL')") OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL')")
[[ -z "$GIT_REL" ]] && \
idtag="$CVS_REL" || \
idtag="$GIT_REL -- $CVS_REL_SHORT"
bb1=$(cat <<EOF bb1=$(cat <<EOF
########################################################### ###########################################################
@@ -20252,11 +20247,9 @@ EOF
) )
pr_bold "$bb1 " pr_bold "$bb1 "
pr_boldurl "$SWURL"; outln pr_boldurl "$SWURL"; outln
if [[ -n "$idtag" ]]; then if [[ -n "$GIT_REL" ]]; then
#FIXME: if we run it not off the git dir we miss the version tag.
# at least we don't want to display empty brackets here...
pr_bold " (" pr_bold " ("
pr_grey "$idtag" pr_litegrey "$GIT_REL"
prln_bold ")" prln_bold ")"
fi fi
pr_bold "$bb2 " pr_bold "$bb2 "