From 886adae4efaeda3bf5d04a47fa28da3c6e0a926e Mon Sep 17 00:00:00 2001 From: Zachary Lee Andrews Date: Fri, 23 Jul 2021 22:38:31 -0400 Subject: [PATCH] Use posix egrep options, fixing issue #1166 --- include/tests_crypto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_crypto b/include/tests_crypto index 227401c3..89ad1e62 100644 --- a/include/tests_crypto +++ b/include/tests_crypto @@ -80,7 +80,7 @@ if [ ${CANREAD} -eq 1 ]; then # Only check the files that are not installed by a package, unless enabled by profile if [ ${SSL_CERTIFICATE_INCLUDE_PACKAGES} -eq 1 ] || ! FileInstalledByPackage "${FILE}"; then - echo ${FILE} | ${EGREPBINARY} --quiet ".cer$|.der$" + echo ${FILE} | ${EGREPBINARY} -q ".cer$|.der$" CER_DER=$? OUTPUT=$(${GREPBINARY} -q 'BEGIN CERT' "${FILE}") if [ $? -eq 0 -o ${CER_DER} -eq 0 ]; then @@ -200,7 +200,7 @@ LogText "Result: Found LUKS encrypted swap device: ${BLOCK_DEV}" ENCRYPTED_SWAPS=$((ENCRYPTED_SWAPS + 1)) Report "encrypted_swap[]=${BLOCK_DEV},LUKS" - elif ${CRYPTSETUPBINARY} status "${BLOCK_DEV}" 2> /dev/null | ${GREPBINARY} --quiet "cipher:"; then + elif ${CRYPTSETUPBINARY} status "${BLOCK_DEV}" 2> /dev/null | ${GREPBINARY} -q "cipher:"; then LogText "Result: Found non-LUKS encrypted swap device: ${BLOCK_DEV}" ENCRYPTED_SWAPS=$((ENCRYPTED_SWAPS + 1)) Report "encrypted_swap[]=${BLOCK_DEV},other"