From 53bb4684b425db674dfc666b80360ea318ea8c88 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Thu, 30 Jun 2016 11:37:05 +0100 Subject: [PATCH] Allow disabling use of cryptopp from code. Just comment out the definition of MAKE_SHA1_WITH_CRYPTOPP and the code will fall back to getting the sha1 from Redis. --- src/backends/redis/script_manager.cpp | 6 +++--- src/backends/redis/script_manager.hpp | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/backends/redis/script_manager.cpp b/src/backends/redis/script_manager.cpp index 1e86f54..ba1fb0d 100644 --- a/src/backends/redis/script_manager.cpp +++ b/src/backends/redis/script_manager.cpp @@ -19,13 +19,13 @@ #include "helpers/lexical_cast.hpp" #include "command.hpp" #include -#if defined(WITH_CRYPTOPP) +#if defined(MAKE_SHA1_WITH_CRYPTOPP) # include #endif namespace redis { namespace { -#if defined(WITH_CRYPTOPP) +#if defined(MAKE_SHA1_WITH_CRYPTOPP) struct LuaScriptHash { union { struct { @@ -44,7 +44,7 @@ namespace redis { assert(m_command); } -#if defined(WITH_CRYPTOPP) +#if defined(MAKE_SHA1_WITH_CRYPTOPP) boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) { assert(m_command->is_connected()); diff --git a/src/backends/redis/script_manager.hpp b/src/backends/redis/script_manager.hpp index 5cec852..39fe4c9 100644 --- a/src/backends/redis/script_manager.hpp +++ b/src/backends/redis/script_manager.hpp @@ -19,8 +19,11 @@ #define id8E124FF76DF449CDB8FBA806F8EF4E78 #include "redisConfig.h" -#include #if defined(WITH_CRYPTOPP) +# define MAKE_SHA1_WITH_CRYPTOPP +#endif +#include +#if defined(MAKE_SHA1_WITH_CRYPTOPP) # include #else # include @@ -44,7 +47,7 @@ namespace redis { boost::string_ref add_lua_script_ifn ( const std::string& parScript ); Command* m_command; -#if defined(WITH_CRYPTOPP) +#if defined(MAKE_SHA1_WITH_CRYPTOPP) std::set m_known_hashes; #else std::map m_known_scripts;