replace some "echo $x" by HERE statement "<<<"

This commit is contained in:
Dirk 2017-03-18 21:01:55 +01:00
parent c618b9a954
commit 8be47e484b
1 changed files with 5 additions and 5 deletions

View File

@ -2365,7 +2365,7 @@ std_cipherlists() {
tmpfile_handle $FUNCNAME.$debugname.txt tmpfile_handle $FUNCNAME.$debugname.txt
[[ $DEBUG -ge 1 ]] && out " -- $1" || outln #FIXME: should be in standard output at some time [[ $DEBUG -ge 1 ]] && out " -- $1" || outln #FIXME: should be in standard output at some time
else else
singlespaces=$(echo "$2" | sed -e 's/ \+/ /g' -e 's/^ //' -e 's/ $//g' -e 's/ //g') singlespaces=$(sed -e 's/ \+/ /g' -e 's/^ //' -e 's/ $//g' -e 's/ //g' <<< "$2")
if [[ "$OPTIMAL_PROTO" == "-ssl2" ]]; then if [[ "$OPTIMAL_PROTO" == "-ssl2" ]]; then
prln_local_problem "No $singlespaces for SSLv2 configured in $OPENSSL" prln_local_problem "No $singlespaces for SSLv2 configured in $OPENSSL"
else else
@ -5969,7 +5969,7 @@ certificate_info() {
fi fi
expire=$($OPENSSL x509 -in $HOSTCERT -checkend 1 2>>$ERRFILE) expire=$($OPENSSL x509 -in $HOSTCERT -checkend 1 2>>$ERRFILE)
if ! echo $expire | grep -qw not; then if ! grep -qw not <<< "$expire" ; then
pr_svrty_critical "expired!" pr_svrty_critical "expired!"
expfinding="expired!" expfinding="expired!"
expok="CRITICAL" expok="CRITICAL"
@ -6247,8 +6247,8 @@ run_server_defaults() {
outln "(none)" outln "(none)"
fileout "session_ticket" "INFO" "TLS session tickes RFC 5077 not supported" fileout "session_ticket" "INFO" "TLS session tickes RFC 5077 not supported"
else else
lifetime=$(echo $sessticket_str | grep -a lifetime | sed 's/[A-Za-z:() ]//g') lifetime=$(grep -a lifetime <<< "$sessticket_str" | sed 's/[A-Za-z:() ]//g')
unit=$(echo $sessticket_str | grep -a lifetime | sed -e 's/^.*'"$lifetime"'//' -e 's/[ ()]//g') unit=$(grep -a lifetime <<< "$sessticket_str" | sed -e 's/^.*'"$lifetime"'//' -e 's/[ ()]//g')
out "$lifetime $unit " out "$lifetime $unit "
prln_svrty_low "(PFS requires session ticket keys to be rotated <= daily)" prln_svrty_low "(PFS requires session ticket keys to be rotated <= daily)"
fileout "session_ticket" "LOW" "TLS session tickes RFC 5077 valid for $lifetime $unit (PFS requires session ticket keys to be rotated at least daily)" fileout "session_ticket" "LOW" "TLS session tickes RFC 5077 valid for $lifetime $unit (PFS requires session ticket keys to be rotated at least daily)"
@ -6669,7 +6669,7 @@ run_spdy() {
ret=1 ret=1
else else
# now comes a strange thing: "Protocols advertised by server:" is empty but connection succeeded # now comes a strange thing: "Protocols advertised by server:" is empty but connection succeeded
if echo $tmpstr | egrep -aq "h2|spdy|http" ; then if egrep -aq "h2|spdy|http" <<< $tmpstr ; then
out "$tmpstr" out "$tmpstr"
outln " (advertised)" outln " (advertised)"
fileout "spdy_npn" "INFO" "SPDY/NPN : $tmpstr (advertised)" fileout "spdy_npn" "INFO" "SPDY/NPN : $tmpstr (advertised)"