Re-do "Fix build error"

Author: Dutchman101

Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp

@@ -62,7 +62,7 @@ std::variant<std::string, bool> CLuaCryptDefs::Hash(lua_State* const luaVM, Hash
         switch (hashFunction)
         {
             case HashFunctionType::MD5:
-                return SharedUtil::Hash<CryptoPP::Weak::MD5>(strSourceData).ToLower();
+                return SharedUtil::Hash<CryptoPP::MD5>(strSourceData).ToLower();
 
             case HashFunctionType::SHA1:
                 return SharedUtil::Hash<CryptoPP::SHA1>(strSourceData).ToLower();
@@ -106,7 +106,7 @@ std::variant<std::string, bool> CLuaCryptDefs::Hash(lua_State* const luaVM, Hash
                 switch (hmacAlgorithm)
                 {
                     case HmacAlgorithm::MD5:
-                        return SharedUtil::Hmac<CryptoPP::Weak::MD5>(strSourceData, key).ToLower();
+                        return SharedUtil::Hmac<CryptoPP::MD5>(strSourceData, key).ToLower();
 
                     case HmacAlgorithm::SHA1:
                         return SharedUtil::Hmac<CryptoPP::SHA1>(strSourceData, key).ToLower();

Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp

@@ -918,7 +918,7 @@ std::optional<std::string> CLuaFileDefs::fileGetHash(lua_State* const luaVM, CSc
         switch (hashFunction)
         {
             case HashFunctionType::MD5:
-                result = ComputeScriptFileHash<CryptoPP::Weak::MD5>(scriptFile);
+                result = ComputeScriptFileHash<CryptoPP::MD5>(scriptFile);
                 break;
             case HashFunctionType::SHA1:
                 result = ComputeScriptFileHash<CryptoPP::SHA1>(scriptFile);
@@ -955,7 +955,7 @@ std::optional<std::string> CLuaFileDefs::fileGetHash(lua_State* const luaVM, CSc
                 switch (hmacAlgorithm)
                 {
                     case HmacAlgorithm::MD5:
-                        result = ComputeScriptFileHash<CryptoPP::HMAC<CryptoPP::Weak::MD5>>(scriptFile, key);
+                        result = ComputeScriptFileHash<CryptoPP::HMAC<CryptoPP::MD5>>(scriptFile, key);
                         break;
                     case HmacAlgorithm::SHA1:
                         result = ComputeScriptFileHash<CryptoPP::HMAC<CryptoPP::SHA1>>(scriptFile, key);

Shared/sdk/SharedUtil.Tests.hpp

@@ -789,7 +789,7 @@ void SharedUtil_Hash_Tests()
         switch (algorithm)
         {
             case HmacAlgorithm::MD5:
-                hmacResult = SharedUtil::Hmac<CryptoPP::Weak::MD5>(data, key);
+                hmacResult = SharedUtil::Hmac<CryptoPP::MD5>(data, key);
                 break;
             case HmacAlgorithm::SHA1:
                 hmacResult = SharedUtil::Hmac<CryptoPP::SHA1>(data, key);

vendor/cryptopp/config_asm.h

@@ -280,7 +280,7 @@
 # if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #  if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
       (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300) || \
-      (CRYPTOPP_MSC_VERSION >= 1916))
+      (CRYPTOPP_MSC_VERSION >= 1916)
 #   define CRYPTOPP_ARM_AES_AVAILABLE 1
 #  endif  // Compilers
 # endif  // Platforms
@@ -292,7 +292,7 @@
 # if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #  if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
       (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300) || \
-      (CRYPTOPP_MSC_VERSION >= 1916))
+      (CRYPTOPP_MSC_VERSION >= 1916)
 #   define CRYPTOPP_ARM_PMULL_AVAILABLE 1
 #  endif  // Compilers
 # endif  // Platforms
@@ -304,7 +304,7 @@
 # if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #  if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
       (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300) || \
-      (CRYPTOPP_MSC_VERSION >= 1916))
+      (CRYPTOPP_MSC_VERSION >= 1916)
 #   define CRYPTOPP_ARM_SHA1_AVAILABLE 1
 #   define CRYPTOPP_ARM_SHA2_AVAILABLE 1
 #  endif  // Compilers

vendor/cryptopp/md5.h

@@ -1,6 +1,5 @@
 #ifndef CRYPTOPP_MD5_H
 #define CRYPTOPP_MD5_H
-#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
 #include "iterhash.h"
 
@@ -11,7 +10,7 @@ namespace Weak1 {
 /// \brief MD5 message digest
 /// \sa <a href="http://www.cryptolounge.org/wiki/MD5">MD5</a>
 /// \since Crypto++ 1.0
-class Weak::MD5 : public IteratedHashWithStaticTransform<word32, LittleEndian, 64, 16, MD5>
+class MD5 : public IteratedHashWithStaticTransform<word32, LittleEndian, 64, 16, MD5>
 {
 public:
 	static void InitState(HashWordType *state);