Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-07 09:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2170 from drwetter/fix_banner_3.0

Browse Source 
Fix banner and remove STARTTLS NNTP CI check
This commit is contained in:
Dirk Wetter 2022-05-04 12:12:39 +02:00 committed by GitHub
commit 41deaf908d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/25_baseline_starttls.t
View File

@ -130,24 +130,8 @@ unlike($openssl_out, qr/$openssl_regex_bl/, "");
$tests++; $tests++;
$uri="140.238.219.117:119";
# unlink "tmp.json";
printf "\n%s\n", "STARTTLS NNTP unit tests via sockets --> $uri ...";
$socket_out = `./testssl.sh $check2run -t nntp $uri 2>&1`;
# $socket_json = json('tmp.json');
unlike($socket_out, qr/$socket_regex_bl/, "");
$tests++;
printf "\n%s\n", "STARTTLS NNTP unit tests via OpenSSL --> $uri ...";
$openssl_out = `./testssl.sh --ssl-native $check2run -t nntp $uri 2>&1`;
# $openssl_json = json('tmp.json');
unlike($openssl_out, qr/$openssl_regex_bl/, "");
$tests++;
# IRC: missing # IRC: missing
# LTMP, mysql, postgres # LTMP, mysql, postgres, NNTP, telnet

8
testssl.sh
View File

@ -17665,13 +17665,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')")
[[ -n "$GIT_REL" ]] && idtag="$GIT_REL"
bb1=$(cat <<EOF bb1=$(cat <<EOF
########################################################### ###########################################################
@ -17694,11 +17692,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 "