From 757905f0a449baf3b828ac944a5111adae1ab80d Mon Sep 17 00:00:00 2001 From: drrtuy Date: Wed, 29 Nov 2023 18:34:41 +0200 Subject: [PATCH] Fix/mcol 5611 5612 fedora build issues dev 6 (#3040) * fix(build): include dequeue to satisfy fc39 compiler * fix(build): MCOL-5612 const func pointer assignement must happen after func definition to satisfy modern compilers static analyzer --------- Co-authored-by: Roman Nozdrin --- storage-manager/src/S3Storage.h | 1 + tools/passwd/secrets.cpp | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/storage-manager/src/S3Storage.h b/storage-manager/src/S3Storage.h index 338de2f6b..a7ff7a441 100644 --- a/storage-manager/src/S3Storage.h +++ b/storage-manager/src/S3Storage.h @@ -18,6 +18,7 @@ #ifndef S3STORAGE_H_ #define S3STORAGE_H_ +#include #include #include #include "CloudStorage.h" diff --git a/tools/passwd/secrets.cpp b/tools/passwd/secrets.cpp index aac32ffa5..f4c1d80cf 100644 --- a/tools/passwd/secrets.cpp +++ b/tools/passwd/secrets.cpp @@ -35,12 +35,11 @@ using std::string; - #ifdef OPENSSL_VERSION_PREREQ -#if OPENSSL_VERSION_PREREQ(3,0) - #define EVP_CIPHER_key_length EVP_CIPHER_get_key_length - #define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length - #define EVP_CIPHER_blocksize EVP_CIPHER_get_blocksize +#if OPENSSL_VERSION_PREREQ(3, 0) +#define EVP_CIPHER_key_length EVP_CIPHER_get_key_length +#define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length +#define EVP_CIPHER_blocksize EVP_CIPHER_get_blocksize #endif #endif @@ -96,10 +95,6 @@ void CSPasswdLogging::log(int priority, const char* format, ...) namespace { using HexLookupTable = std::array; -HexLookupTable init_hex_lookup_table() noexcept; - -// Hex char -> byte val lookup table. -const HexLookupTable hex_lookup_table = init_hex_lookup_table(); /* used in the bin2hex function */ const char hex_upper[] = "0123456789ABCDEF"; @@ -134,6 +129,9 @@ HexLookupTable init_hex_lookup_table() noexcept return rval; } +// Hex char -> byte val lookup table. +const HexLookupTable hex_lookup_table = init_hex_lookup_table(); + bool hex2bin(const char* in, unsigned int in_len, uint8_t* out) { // Input length must be multiple of two.