diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras index 2764c6e145..5c624e5d73 100644 --- a/.wolfssl_known_macro_extras +++ b/.wolfssl_known_macro_extras @@ -684,7 +684,7 @@ WIFI_101 WIFI_AVAILABLE WIFI_NINA WIN_REUSE_CRYPT_HANDLE -WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE_SUPPORT +WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE WOLFSENTRY_H WOLFSENTRY_NO_JSON WOLFSSL_32BIT_MILLI_TIME diff --git a/linuxkm/linuxkm-fips-hash-wrapper.sh b/linuxkm/linuxkm-fips-hash-wrapper.sh index eac6954e90..8be522e470 100755 --- a/linuxkm/linuxkm-fips-hash-wrapper.sh +++ b/linuxkm/linuxkm-fips-hash-wrapper.sh @@ -47,20 +47,20 @@ fi if [[ ! -v COREKEY ]]; then if [[ ! -v LIBWOLFSSL ]]; then - LIBWOLFSSL=./libwolfssl-user-build/src/.libs/libwolfssl.so + LIBWOLFSSL=./libwolfssl-user-build/src/.libs/libwolfssl.so fi read -a coreKey_a < <("${READELF-readelf}" --symbols --wide "$LIBWOLFSSL" | grep --max-count=1 -E -e '[[:space:]]coreKey$') || exit $? if [[ ${#coreKey_a[@]} != 8 || "${coreKey_a[2]}" != "65" ]]; then - echo "unexpected readelf output: \"${coreKey_a[*]}\" (${#coreKey_a[@]})" >&2 - exit 1 + echo "unexpected readelf output: \"${coreKey_a[*]}\" (${#coreKey_a[@]})" >&2 + exit 1 fi coreKey_offset=$((0x${coreKey_a[1]})) COREKEY=$(dd if="$LIBWOLFSSL" bs=64 iflag=skip_bytes,count_bytes skip="$coreKey_offset" count=64 status=none) || exit $? if [[ "$COREKEY" =~ ^[0-9A-Fa-f]{64}$ ]]; then - : + : else - echo "unexpected value for coreKey \"${COREKEY}\"." >&2 - exit 1 + echo "unexpected value for coreKey \"${COREKEY}\"." >&2 + exit 1 fi fi