diff options
| -rw-r--r-- | src/server/game/Addons/AddonMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Addons/AddonMgr.h | 5 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp index 0597d1a8744..b77f3e0721e 100644 --- a/src/server/game/Addons/AddonMgr.cpp +++ b/src/server/game/Addons/AddonMgr.cpp @@ -16,11 +16,11 @@ */ #include "AddonMgr.h" +#include "CryptoHash.h" #include "DatabaseEnv.h" #include "DBCStores.h" #include "Log.h" #include "Timer.h" -#include <openssl/md5.h> namespace AddonMgr { @@ -82,8 +82,8 @@ void LoadFromDB() std::string name = fields[1].GetString(); std::string version = fields[2].GetString(); - MD5(reinterpret_cast<uint8 const*>(name.c_str()), name.length(), addon.NameMD5); - MD5(reinterpret_cast<uint8 const*>(version.c_str()), version.length(), addon.VersionMD5); + addon.NameMD5 = Trinity::Crypto::MD5::GetDigestOf(name); + addon.VersionMD5 = Trinity::Crypto::MD5::GetDigestOf(version); m_bannedAddons.push_back(addon); diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index 455dd72c12a..57490c1951d 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -19,6 +19,7 @@ #define _ADDONMGR_H #include "Define.h" +#include <array> #include <string> #include <vector> @@ -36,8 +37,8 @@ struct SavedAddon struct BannedAddon { uint32 Id; - uint8 NameMD5[16]; - uint8 VersionMD5[16]; + std::array<uint8, 16> NameMD5; + std::array<uint8, 16> VersionMD5; uint32 Timestamp; }; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 363d404befa..968e3149894 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1206,8 +1206,8 @@ void WorldSession::SendAddonsInfo() for (; itr != bannedAddons->end(); ++itr) { data << uint32(itr->Id); - data.append(itr->NameMD5, sizeof(itr->NameMD5)); - data.append(itr->VersionMD5, sizeof(itr->VersionMD5)); + data.append(itr->NameMD5); + data.append(itr->VersionMD5); data << uint32(itr->Timestamp); data << uint32(1); // IsBanned bannedAddonCount++; |