Skip to content

Commit fab67d0

Browse files
committed
Remove CR in server banner
... which caused a problem in t/32_isHTML_valid.t. Also the test for an empty server banner was simplified
1 parent d298b41 commit fab67d0

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

testssl.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,16 +3129,18 @@ run_server_banner() {
31293129
grep -ai '^Server' $HEADERFILE >$TMPFILE
31303130
if [[ $? -eq 0 ]]; then
31313131
serverbanner=$(sed -e 's/^Server: //' -e 's/^server: //' $TMPFILE)
3132-
if [[ "$serverbanner" == $'\n' ]] || [[ "$serverbanner" == $'\r' ]] || [[ "$serverbanner" == $'\n\r' ]] || [[ -z "$serverbanner" ]]; then
3132+
serverbanner=${serverbanner//$'\r'}
3133+
serverbanner=${serverbanner//$'\n'}
3134+
if [[ -z "$serverbanner" ]]; then
31333135
outln "exists but empty string"
31343136
fileout "$jsonID" "INFO" "Server banner is empty"
31353137
else
31363138
emphasize_stuff_in_headers "$serverbanner"
31373139
fileout "$jsonID" "INFO" "$serverbanner"
31383140
if [[ "$serverbanner" == *Microsoft-IIS/6.* ]] && [[ $OSSL_VER == 1.0.2* ]]; then
3139-
prln_warning " It's recommended to run another test w/ OpenSSL 1.0.1 !"
3141+
prln_warning " It's recommended to run another test w/ OpenSSL >= 1.0.1 !"
31403142
# see https://github.com/PeterMosmans/openssl/issues/19#issuecomment-100897892
3141-
fileout "${jsonID}" "WARN" "IIS6_openssl_mismatch: Recommended to rerun this test w/ OpenSSL 1.0.1. See https://github.com/PeterMosmans/openssl/issues/19#issuecomment-100897892"
3143+
fileout "${jsonID}" "WARN" "IIS6_openssl_mismatch: Recommended to rerun this test w/ OpenSSL >= 1.0.1. See https://github.com/PeterMosmans/openssl/issues/19#issuecomment-100897892"
31423144
fi
31433145
fi
31443146
# mozilla.github.io/server-side-tls/ssl-config-generator/

0 commit comments

Comments
 (0)