Skip to content

Commit a773f00

Browse files
committed
Fix banner and remove STARTTLS NNTP CI check
On macOS in dark mode the git tag in grey wasn't visible. It was changed now to light grey. It also works at least on Linux using a light terminal background. The NNTP server which we used for STARTTLS checks seems ofen not to work. Thus this PR removes that for the 3.0 branch.
1 parent 980ec6b commit a773f00

2 files changed

Lines changed: 3 additions & 23 deletions

File tree

t/25_baseline_starttls.t

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -130,24 +130,8 @@ unlike($openssl_out, qr/$openssl_regex_bl/, "");
130130
$tests++;
131131

132132

133-
$uri="140.238.219.117:119";
134-
135-
# unlink "tmp.json";
136-
printf "\n%s\n", "STARTTLS NNTP unit tests via sockets --> $uri ...";
137-
$socket_out = `./testssl.sh $check2run -t nntp $uri 2>&1`;
138-
# $socket_json = json('tmp.json');
139-
unlike($socket_out, qr/$socket_regex_bl/, "");
140-
$tests++;
141-
142-
printf "\n%s\n", "STARTTLS NNTP unit tests via OpenSSL --> $uri ...";
143-
$openssl_out = `./testssl.sh --ssl-native $check2run -t nntp $uri 2>&1`;
144-
# $openssl_json = json('tmp.json');
145-
unlike($openssl_out, qr/$openssl_regex_bl/, "");
146-
$tests++;
147-
148-
149133
# IRC: missing
150-
# LTMP, mysql, postgres
134+
# LTMP, mysql, postgres, NNTP, telnet
151135

152136

153137

testssl.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17665,13 +17665,11 @@ prepare_arrays() {
1766517665

1766617666

1766717667
mybanner() {
17668-
local idtag
1766917668
local bb1 bb2 bb3
1767017669

1767117670
"$QUIET" && return
1767217671
"$CHILD_MASS_TESTING" && return
1767317672
OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL:@STRENGTH' 'ALL')")
17674-
[[ -n "$GIT_REL" ]] && idtag="$GIT_REL"
1767517673
bb1=$(cat <<EOF
1767617674

1767717675
###########################################################
@@ -17694,11 +17692,9 @@ EOF
1769417692
)
1769517693
pr_bold "$bb1 "
1769617694
pr_boldurl "$SWURL"; outln
17697-
if [[ -n "$idtag" ]]; then
17698-
#FIXME: if we run it not off the git dir we miss the version tag.
17699-
# at least we don't want to display empty brackets here...
17695+
if [[ -n "$GIT_REL" ]]; then
1770017696
pr_bold " ("
17701-
pr_grey "$idtag"
17697+
pr_litegrey "$GIT_REL"
1770217698
prln_bold ")"
1770317699
fi
1770417700
pr_bold "$bb2 "

0 commit comments

Comments
 (0)