fix for double line and double application banner

This commit is contained in:
Dirk 2015-01-23 12:17:27 +01:00
parent f3eb84c078
commit 84caf9ffd1

View File

@ -495,9 +495,8 @@ applicationbanner() {
egrep -ai '^X-Powered-By|^X-AspNet-Version|^X-Runtime|^X-Version' $HEADERFILE >$TMPFILE egrep -ai '^X-Powered-By|^X-AspNet-Version|^X-Runtime|^X-Version' $HEADERFILE >$TMPFILE
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
#cat $TMPFILE | sed 's/^.*:/:/' | sed -e :a -e '$!N;s/\n:/ \n\ +/;ta' -e 'P;D' | sed 's/://g' #cat $TMPFILE | sed 's/^.*:/:/' | sed -e :a -e '$!N;s/\n:/ \n\ +/;ta' -e 'P;D' | sed 's/://g'
sed 's/^/ /g' $TMPFILE | tr -t '\n\r' ' ' | sed "s/\([0-9]\)/$red\1$off/g" #sed 's/^/ /g' $TMPFILE | tr -t '\n\r' ' ' | sed "s/\([0-9]\)/$red\1$off/g"
emphasize_numbers_in_headers "$(sed 's/^/ /g' $TMPFILE | tr -t '\n\r' ' ')" emphasize_numbers_in_headers "$(sed 's/^/ /g' $TMPFILE | tr -t '\n\r' ' ')"
outln
#i=0 #i=0
#cat $TMPFILE | sed 's/^/ /' | while read line; do #cat $TMPFILE | sed 's/^/ /' | while read line; do
# out "$line" # out "$line"
@ -1952,7 +1951,7 @@ EOF
` `
bold "$bb" bold "$bb"
outln "\n" outln "\n"
outln " Using \"$osslver\" [$nr_ciphers ciphers] on outln " Using \"$osslver\" [~$nr_ciphers ciphers] on
$hn:$osslpath $hn:$osslpath
(built: \"$OSSL_BUILD_DATE\", platform: \"$OSSL_VER_PLATFORM\")\n" (built: \"$OSSL_BUILD_DATE\", platform: \"$OSSL_VER_PLATFORM\")\n"
@ -2018,6 +2017,7 @@ cleanup () {
outln outln
} }
# for now only GOST engine
initialize_engine(){ initialize_engine(){
if uname -s | grep -q BSD || ! $OPENSSL engine gost -vvvv -t -c 2>&1 >/dev/null; then if uname -s | grep -q BSD || ! $OPENSSL engine gost -vvvv -t -c 2>&1 >/dev/null; then
litemagenta "No engine or GOST support via engine with your $OPENSSL"; outln "\n" litemagenta "No engine or GOST support via engine with your $OPENSSL"; outln "\n"
@ -2391,6 +2391,6 @@ case "$1" in
exit $ret ;; exit $ret ;;
esac esac
# $Id: testssl.sh,v 1.171 2015/01/23 11:01:31 dirkw Exp $ # $Id: testssl.sh,v 1.172 2015/01/23 11:17:26 dirkw Exp $
# vim:ts=5:sw=5 # vim:ts=5:sw=5