Misc: buildfix
This commit is contained in:
1 parent
66da3c4c17
commit
0f41e34aa1
3 files changed
+6
-6
No files matched your search
@@ -39,12 +39,12 @@ ScriptReloadMgr* ScriptReloadMgr::instance()
|
||||
|
||||
#include "BuiltInConfig.h"
|
||||
#include "Config.h"
|
||||
#include "CryptoHash.h"
|
||||
#include "GitRevision.h"
|
||||
#include "Log.h"
|
||||
#include "MPSCQueue.h"
|
||||
#include "Regex.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "SHA1.h"
|
||||
#include "StartProcess.h"
|
||||
#include "Timer.h"
|
||||
#include "World.h"
|
||||
@@ -756,7 +756,7 @@ private:
|
||||
auto path = fs::temp_directory_path();
|
||||
path /= Trinity::StringFormat("tc_script_cache_%s_%s",
|
||||
GitRevision::GetBranch(),
|
||||
CalculateSHA1Hash(sConfigMgr->GetFilename()).c_str());
|
||||
ByteArrayToHexStr(Trinity::Crypto::SHA1::GetDigestOf(sConfigMgr->GetFilename())).c_str());
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
*/
|
||||
|
||||
#include "Helper.hpp"
|
||||
#include "CryptoHash.h"
|
||||
#include "IoContext.h"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
@@ -24,7 +25,6 @@
|
||||
#include <boost/beast.hpp>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <SHA256.h>
|
||||
#include <stdexcept>
|
||||
#include <Util.h>
|
||||
|
||||
@@ -38,11 +38,11 @@ namespace ClientLauncher
|
||||
{
|
||||
std::string GetFileChecksum(std::vector<unsigned char> const& data)
|
||||
{
|
||||
SHA256Hash h;
|
||||
Trinity::Crypto::SHA256 h;
|
||||
h.UpdateData(data.data(), data.size());
|
||||
h.Finalize();
|
||||
|
||||
std::string checksum = ByteArrayToHexStr(h.GetDigest(), h.GetLength());
|
||||
std::string checksum = ByteArrayToHexStr(h.GetDigest());
|
||||
boost::algorithm::to_lower(checksum);
|
||||
return checksum;
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace Connection_Patcher
|
||||
h.UpdateData(data.data(), data.size());
|
||||
h.Finalize();
|
||||
|
||||
return Trinity::Impl::ByteArrayToHexStr(h.GetDigest().data(), h.GetDigest().size());
|
||||
return ByteArrayToHexStr(h.GetDigest());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user