external hash-library fixes (#31)

Author: kp-cat

src/configservice.cpp

@@ -3,7 +3,6 @@
 #include "configcat/timeutils.h"
 #include "configcatlogger.h"
 #include "configfetcher.h"
-#include <hash-library/sha1.h>
 #include <iostream>
 
 using namespace std;
@@ -119,7 +118,7 @@ void ConfigService::setOffline() {
 }
 
 string ConfigService::generateCacheKey(const string& sdkKey) {
-    return SHA1()(sdkKey + "_" + ConfigFetcher::kConfigJsonName + "_" + ConfigEntry::kSerializationFormatVersion);
+    return sha1(sdkKey + "_" + ConfigFetcher::kConfigJsonName + "_" + ConfigEntry::kSerializationFormatVersion);
 }
 tuple<shared_ptr<const ConfigEntry>, std::optional<std::string>, std::exception_ptr> ConfigService::fetchIfOlder(double threshold, bool preferCached) {
     {

src/utils.cpp

@@ -2,10 +2,10 @@
 
 #include "utils.h"
 
-#ifndef CONFIGCAT_EXTERNAL_SHA
+#ifndef CONFIGCAT_EXTERNAL_SHA_ENABLED
 #include <hash-library/sha1.h>
 #include <hash-library/sha256.h>
-#endif // CONFIGCAT_EXTERNAL_SHA
+#endif // CONFIGCAT_EXTERNAL_SHA_ENABLED
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/EPSILON
 #define JS_NUMBER_EPSILON 2.2204460492503130808472633361816e-16
@@ -178,7 +178,7 @@ std::optional<long long> integer_from_string(const std::string& str) {
     return value;
 }
 
-#ifndef CONFIGCAT_EXTERNAL_SHA
+#ifndef CONFIGCAT_EXTERNAL_SHA_ENABLED
 SHA1 sha1Calculator;
 SHA256 sha256Calculator;
 
@@ -189,7 +189,7 @@ std::string sha1(const std::string& input) {
 std::string sha256(const std::string& input) {
     return sha256Calculator(input);
 }
-#endif // CONFIGCAT_EXTERNAL_SHA
+#endif // CONFIGCAT_EXTERNAL_SHA_ENABLED
 
 
 } // namespace configcat

src/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIGCAT_VERSION "4.0.2"
+#define CONFIGCAT_VERSION "4.0.3"