Skip to content

Commit 3ad9c6e

Browse files
drwetterdrwetter
authored
Merge pull request #2243 from ghen2/grep-3.8
 Fix grep 3.8 warnings on unneeded escapes of hyphen, slash, space.
2 parents 6e68763 + ffcf07f commit 3ad9c6e

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎testssl.sh‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ check_revocation_crl() {
17651765
fileout "$jsonID" "WARN" "conversion of CRL to PEM format failed"
17661766
return 1
17671767
fi
1768-
if grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TEMPDIR/intermediatecerts.pem; then
1768+
if grep -qe "-----BEGIN CERTIFICATE-----" $TEMPDIR/intermediatecerts.pem; then
17691769
$OPENSSL verify -crl_check -CAfile <(cat $ADDITIONAL_CA_FILES "$GOOD_CA_BUNDLE" "${tmpfile%%.crl}.pem") -untrusted $TEMPDIR/intermediatecerts.pem $HOSTCERT &> "${tmpfile%%.crl}.err"
17701770
else
17711771
$OPENSSL verify -crl_check -CAfile <(cat $ADDITIONAL_CA_FILES "$GOOD_CA_BUNDLE" "${tmpfile%%.crl}.pem") $HOSTCERT &> "${tmpfile%%.crl}.err"
@@ -1813,7 +1813,7 @@ check_revocation_ocsp() {
18131813
fileout "$jsonID" "WARN" "Revocation not tested as openssl ocsp doesn't support a proxy"
18141814
return 0
18151815
fi
1816-
grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TEMPDIR/intermediatecerts.pem || return 0
1816+
grep -qe "-----BEGIN CERTIFICATE-----" $TEMPDIR/intermediatecerts.pem || return 0
18171817
tmpfile=$TEMPDIR/${NODE}-${NODEIP}.${uri##*\/} || exit $ERR_FCREATE
18181818
if [[ -n "$stapled_response" ]]; then
18191819
asciihex_to_binary "$stapled_response" > "$TEMPDIR/stapled_ocsp_response.dd"
@@ -2078,7 +2078,7 @@ service_detection() {
20782078
printf "$GET_REQ11" | $OPENSSL s_client $(s_client_options "$1 -quiet $BUGS -connect $NODEIP:$PORT $PROXY $SNI") >$TMPFILE 2>$ERRFILE &
20792079
wait_kill $! $HEADER_MAXSLEEP
20802080
was_killed=$?
2081-
head $TMPFILE | grep -aq '^HTTP\/' && SERVICE=HTTP
2081+
head $TMPFILE | grep -aq '^HTTP/' && SERVICE=HTTP
20822082
[[ -z "$SERVICE" ]] && head $TMPFILE | grep -waq "SMTP|ESMTP|Exim|IdeaSmtpServer|Kerio Connect|Postfix" && SERVICE=SMTP # I know some overlap here
20832083
[[ -z "$SERVICE" ]] && head $TMPFILE | grep -Ewaq "POP|Gpop|MailEnable POP3 Server|OK Dovecot|Cyrus POP3" && SERVICE=POP # I know some overlap here
20842084
[[ -z "$SERVICE" ]] && head $TMPFILE | grep -Ewaq "IMAP|IMAP4|Cyrus IMAP4IMAP4rev1|IMAP4REV1|Gimap" && SERVICE=IMAP # I know some overlap here
@@ -2405,7 +2405,7 @@ match_httpheader_key() {
24052405
pr_svrty_medium " ${nr}x"
24062406
outln " -- checking first one only"
24072407
out "$spaces"
2408-
HEADERVALUE="$(fgrep -Fai "$key:" $HEADERFILE | head -1)"
2408+
HEADERVALUE="$(grep -Fai "$key:" $HEADERFILE | head -1)"
24092409
HEADERVALUE="${HEADERVALUE#*:}"
24102410
HEADERVALUE="$(strip_lf "$HEADERVALUE")"
24112411
HEADERVALUE="$(strip_leading_space "$HEADERVALUE")"
@@ -3620,7 +3620,7 @@ run_cipher_match(){
36203620
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
36213621
kx[i]="${kx[i]} $dhlen"
36223622
fi
3623-
"$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
3623+
"$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
36243624
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
36253625
done
36263626
done
@@ -3899,7 +3899,7 @@ run_allciphers() {
38993899
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
39003900
kx[i]="${kx[i]} $dhlen"
39013901
fi
3902-
"$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
3902+
"$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
39033903
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
39043904
done
39053905
done
@@ -4183,7 +4183,7 @@ ciphers_by_strength() {
41834183
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
41844184
kx[i]="${kx[i]} $dhlen"
41854185
fi
4186-
"$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
4186+
"$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
41874187
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
41884188
fi
41894189
fi
@@ -7040,7 +7040,7 @@ determine_trust() {
70407040
local code
70417041
local ca_bundles=""
70427042
local spaces=" "
7043-
local -i certificates_provided=1+$(grep -c "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TEMPDIR/intermediatecerts.pem)
7043+
local -i certificates_provided=1+$(grep -ce "-----BEGIN CERTIFICATE-----" $TEMPDIR/intermediatecerts.pem)
70447044
local addtl_warning
70457045

70467046
# If $json_postfix is not empty, then there is more than one certificate
@@ -8575,7 +8575,7 @@ certificate_info() {
85758575
cnfinding=""
85768576

85778577
if [[ -n "$sni_used" ]]; then
8578-
if grep -q "\-\-\-\-\-BEGIN" "$HOSTCERT.nosni"; then
8578+
if grep -qe "-----BEGIN" "$HOSTCERT.nosni"; then
85798579
cn_nosni="$(get_cn_from_cert "$HOSTCERT.nosni")"
85808580
[[ -z "$cn_nosni" ]] && cn_nosni="no CN field in subject"
85818581
fi
@@ -8944,7 +8944,7 @@ certificate_info() {
89448944
fileout "cert_validityPeriod${json_postfix}" "INFO" "No finding"
89458945
fi
89468946

8947-
certificates_provided=1+$(grep -c "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TEMPDIR/intermediatecerts.pem)
8947+
certificates_provided=1+$(grep -ce "-----BEGIN CERTIFICATE-----" $TEMPDIR/intermediatecerts.pem)
89488948
out "$indent"; pr_bold " # of certificates provided"; out " $certificates_provided"
89498949
fileout "certs_countServer${json_postfix}" "INFO" "${certificates_provided}"
89508950
if "$certificate_list_ordering_problem"; then
@@ -9729,7 +9729,7 @@ run_pfs() {
97299729
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
97309730
kx[i]="${kx[i]} $dhlen"
97319731
fi
9732-
"$WIDE" && "$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
9732+
"$WIDE" && "$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
97339733
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
97349734
done
97359735
done
@@ -11234,7 +11234,7 @@ derive-handshake-traffic-keys() {
1123411234
[[ ! -s "$pub_file" ]] && return 1
1123511235

1123611236
priv_file="$(mktemp "$TEMPDIR/privkey.XXXXXX")" || return 7
11237-
if grep -q "\-\-\-\-\-BEGIN EC PARAMETERS" "$tmpfile"; then
11237+
if grep -qe "-----BEGIN EC PARAMETERS" "$tmpfile"; then
1123811238
awk '/-----BEGIN EC PARAMETERS/,/-----END EC PRIVATE KEY/ { print $0 }' \
1123911239
"$tmpfile" > "$priv_file"
1124011240
else
@@ -15884,7 +15884,7 @@ run_beast(){
1588415884
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
1588515885
kx[i]="${kx[i]} $dhlen"
1588615886
fi
15887-
"$WIDE" && "$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
15887+
"$WIDE" && "$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
1588815888
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
1588915889
done
1589015890
if "$using_sockets"; then
@@ -16239,7 +16239,7 @@ run_rc4() {
1623916239
dhlen=$(read_dhbits_from_file "$TMPFILE" quiet)
1624016240
kx[i]="${kx[i]} $dhlen"
1624116241
fi
16242-
"$WIDE" && "$SHOW_SIGALGO" && grep -q "\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-" $TMPFILE && \
16242+
"$WIDE" && "$SHOW_SIGALGO" && grep -qe "-----BEGIN CERTIFICATE-----" $TMPFILE && \
1624316243
sigalg[i]="$(read_sigalg_from_file "$TMPFILE")"
1624416244
done
1624516245
done
@@ -17227,11 +17227,11 @@ find_openssl_binary() {
1722717227
# For the following we feel safe enough to query the s_client help functions.
1722817228
# That was not good enough for the previous lookups
1722917229
$OPENSSL s_client -help 2>$s_client_has
17230-
grep -qw '\-alpn' $s_client_has && HAS_ALPN=true
17231-
grep -qw '\-nextprotoneg' $s_client_has && HAS_NPN=true
17232-
grep -qw '\-fallback_scsv' $s_client_has && HAS_FALLBACK_SCSV=true
17233-
grep -q '\-proxy' $s_client_has && HAS_PROXY=true
17234-
grep -q '\-xmpp' $s_client_has && HAS_XMPP=true
17230+
grep -qwe '-alpn' $s_client_has && HAS_ALPN=true
17231+
grep -qwe '-nextprotoneg' $s_client_has && HAS_NPN=true
17232+
grep -qwe '-fallback_scsv' $s_client_has && HAS_FALLBACK_SCSV=true
17233+
grep -qe '-proxy' $s_client_has && HAS_PROXY=true
17234+
grep -qe '-xmpp' $s_client_has && HAS_XMPP=true
1723517235

1723617236
$OPENSSL s_client -starttls foo </dev/null 2>$s_client_starttls_has
1723717237
grep -q 'postgres' $s_client_starttls_has && HAS_POSTGRES=true
@@ -18037,7 +18037,7 @@ check_resolver_bins() {
1803718037
fi
1803818038
if "$HAS_DIG"; then
1803918039
# Old dig versions don't have an option to ignore $HOME/.digrc
18040-
if ! dig -h | grep -qE '\-r.*~/.digrc'; then
18040+
if ! dig -h | grep -qEe '-r.*~/.digrc'; then
1804118041
HAS_DIG_R=false
1804218042
DIG_R=""
1804318043
fi
@@ -19216,7 +19216,7 @@ nmap_to_plain_file() {
1921619216
if [[ "$(head -1 "$FNAME")" =~ ( -oG )(.*) ]] || [[ "$(head -1 "$FNAME")" =~ ( -oA )(.*) ]] ; then
1921719217
# yes, greppable
1921819218
if [[ $(grep -c Status "$FNAME") -ge 1 ]]; then
19219-
[[ $(grep -c '\/open\/' "$FNAME") -eq 0 ]] && \
19219+
[[ $(grep -c '/open/' "$FNAME") -eq 0 ]] && \
1922019220
fatal "Nmap file $FNAME should contain at least one open port" $ERR_FNAMEPARSE
1922119221
else
1922219222
fatal "strange, nmap grepable misses \"Status\"" -1

0 commit comments

Comments
 (0)