From a9b7c5e1157e14efa8ed4f03e4152cdfef714452 Mon Sep 17 00:00:00 2001 From: vdutta Date: Tue, 7 Jun 2022 20:50:40 +0530 Subject: [PATCH] Updated cmake defaults --- CMakeLists.txt | 2 +- dmdiagnostics.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8f437bc..ba6b6931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ OPTION(BBF_DOTSO_PLUGIN "build with dotso plugin" ON) OPTION(BBF_JSON_PLUGIN "build with json plugin" ON) OPTION(BBF_VENDOR_EXTENSION "build with vendor extension enabled" ON) OPTION(WITH_WOLFSSL "build with lib wolfssl" OFF) -OPTION(WITH_OPENSSL "build with lib openssl" ON) +OPTION(WITH_OPENSSL "build with lib openssl" OFF) OPTION(WITH_MBEDTLS "build with lib mbedtls" OFF) SET(BBF_API_SOURCES libbbf_api/dmbbf.c diff --git a/dmdiagnostics.c b/dmdiagnostics.c index 4fe66a7c..97caecf2 100644 --- a/dmdiagnostics.c +++ b/dmdiagnostics.c @@ -268,13 +268,15 @@ end: #if defined(LOPENSSL) #define SHA224_DLEN SHA256_DIGEST_LENGTH #define SHA224_CTX_t SHA256_CTX +#define SHA224_INIT SHA224_Init #define SHA224_UPDATE SHA224_Update #define SHA224_FINAL SHA224_Final #elif defined(LWOLFSSL) -#define SHA224_DLEN SHA224_DIGEST_LENGTH -#define SHA224_CTX_t SHA224_CTX -#define SHA224_UPDATE SHA224_Update -#define SHA224_FINAL SHA224_Final +#define SHA224_DLEN SHA256_DIGEST_LENGTH +#define SHA224_CTX_t SHA256_CTX +#define SHA224_INIT SHA256_Init +#define SHA224_UPDATE SHA256_Update +#define SHA224_FINAL SHA256_Final #else #define SHA224_DLEN (32) #define SHA224_CTX_t mbedtls_sha256_context @@ -295,7 +297,7 @@ const bool validate_sha224sum_value(const char *file_path, const char *checksum) return false; #if defined(LOPENSSL) || defined(LWOLFSSL) - if (!SHA224_Init(&ctx)) + if (!SHA224_INIT(&ctx)) goto end; #else mbedtls_sha256_init(&ctx);