fix missing check for ENABLE_TCL_SSL compilation directive; properly flag crypto as hard disabled if ENABLE_TCL_SSL isn't set;

pull/86/head
Bryan Biedenkapp 11 months ago
parent 78f034511f
commit 676a112313

@ -24,7 +24,7 @@
#if defined(ENABLE_TCP_SSL)
#include <openssl/bio.h>
#include <openssl/evp.h>
#endif
#endif // ENABLE_TCP_SSL
using namespace crypto;
@ -38,6 +38,7 @@ using namespace crypto;
// Global Functions
// ---------------------------------------------------------------------------
#if defined(ENABLE_TCP_SSL)
/**
* @brief Calculates the length of a decoded base64 string.
* @param b64input String containing the base64 encoded data.
@ -84,6 +85,7 @@ int base64Decode(char* b64message, uint8_t** buffer)
return decodeLen;
}
#endif // ENABLE_TCP_SSL
/**
* @brief

@ -356,6 +356,9 @@ bool HostFNE::readParams()
yaml::Node cryptoContainer = masterConf["crypto_container"];
bool cryptoContainerEnabled = cryptoContainer["enabled"].as<bool>(false);
#if !defined(ENABLE_TCP_SSL)
cryptoContainerEnabled = false;
#endif // ENABLE_TCP_SSL
std::string cryptoContainerEKC = cryptoContainer["file"].as<std::string>();
std::string cryptoContainerPassword = cryptoContainer["password"].as<std::string>();
uint32_t cryptoContainerReload = cryptoContainer["time"].as<uint32_t>(30U);

Loading…
Cancel
Save

Powered by TurnKey Linux.