mirror of https://github.com/CISOfy/lynis.git
fix: HostID generation on OpenWrt
To reduce the size of the system, OpenWrt contains only one hashing command - `sha256sum`. SHA-256 hash truncation to SHA1 length is allowed by NIST, see: <https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf>.
This commit is contained in:
parent
4f7a333a35
commit
580c7a3e2c
|
@ -940,7 +940,7 @@
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! "${SHA1SUMBINARY}" = "" -o ! "${OPENSSLBINARY}" = "" -o ! "${CSUMBINARY}" = "" ]; then
|
if [ ! "${SHA1SUMBINARY}" = "" -o ! "${SHA256SUMBINARY}" = "" -o ! "${OPENSSLBINARY}" = "" -o ! "${CSUMBINARY}" = "" ]; then
|
||||||
LogText "Info: found hashing tool, start generation of HostID"
|
LogText "Info: found hashing tool, start generation of HostID"
|
||||||
case "${OS}" in
|
case "${OS}" in
|
||||||
|
|
||||||
|
@ -1068,7 +1068,12 @@
|
||||||
# Check if we found a MAC address to generate the HostID
|
# Check if we found a MAC address to generate the HostID
|
||||||
if HasData "${FIND}"; then
|
if HasData "${FIND}"; then
|
||||||
LogText "Info: using hardware address '${FIND}' to create HostID"
|
LogText "Info: using hardware address '${FIND}' to create HostID"
|
||||||
|
if [ -n "${SHA1SUMBINARY}" ]; then
|
||||||
HOSTID=$(echo ${FIND} | ${SHA1SUMBINARY} | awk '{ print $1 }')
|
HOSTID=$(echo ${FIND} | ${SHA1SUMBINARY} | awk '{ print $1 }')
|
||||||
|
elif [ -n "${SHA256SUMBINARY}" ]; then
|
||||||
|
# Truncate hash to match SHA1 length
|
||||||
|
HOSTID=$(echo ${FIND} | ${SHA256SUMBINARY} | awk '{ print $1 }' | head -c 40)
|
||||||
|
fi
|
||||||
LogText "Result: Found HostID: ${HOSTID}"
|
LogText "Result: Found HostID: ${HOSTID}"
|
||||||
else
|
else
|
||||||
ReportException "GetHostID" "HostID could not be generated"
|
ReportException "GetHostID" "HostID could not be generated"
|
||||||
|
@ -1155,7 +1160,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
ReportException "GetHostID" "Can't create HOSTID as there is no SHA1 hash tool available (sha1, sha1sum, openssl)"
|
ReportException "GetHostID" "Can't create HOSTID as there is no hash tool available (sha1, sha1sum, openssl, truncated sha256sum)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Search machine ID
|
# Search machine ID
|
||||||
|
|
Loading…
Reference in New Issue