From b7e75095e62ee1b0040bef9c63d1fe70f6908b67 Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 24 Aug 2020 16:11:21 +0200 Subject: [PATCH] build(userspace): avoid openssl dep for engine fields verification Signed-off-by: Leonardo Grasso --- userspace/falco/CMakeLists.txt | 2 +- userspace/falco/verify_engine_fields.sh | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index 0da26aea..f52fd2aa 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -154,7 +154,7 @@ configure_file(config_falco.h.in config_falco.h) add_custom_command( TARGET falco - COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/verify_engine_fields.sh ${CMAKE_SOURCE_DIR} ${OPENSSL_BINARY} + COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/verify_engine_fields.sh ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Comparing engine fields checksum in falco_engine.h to actual fields") diff --git a/userspace/falco/verify_engine_fields.sh b/userspace/falco/verify_engine_fields.sh index 37b3189c..09fe939f 100644 --- a/userspace/falco/verify_engine_fields.sh +++ b/userspace/falco/verify_engine_fields.sh @@ -3,14 +3,8 @@ set -euo pipefail SOURCE_DIR=$1 -OPENSSL=$2 -if ! command -v "${OPENSSL}" version > /dev/null 2>&1; then - echo "No openssl command at ${OPENSSL}" - exit 1 -fi - -NEW_CHECKSUM=$(./falco --list -N | ${OPENSSL} dgst -sha256 | awk '{print $2}') +NEW_CHECKSUM=$(./falco --list -N | sha256sum | awk '{print $1}') CUR_CHECKSUM=$(grep FALCO_FIELDS_CHECKSUM "${SOURCE_DIR}/userspace/engine/falco_engine_version.h" | awk '{print $3}' | sed -e 's/"//g')