The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 02:36:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

NetPlay: use sha1 instead of md5

Browse Source
This commit is contained in:
Shawn Hoffman 2022-07-27 18:47:52 -07:00
parent c7ce035a7f
commit 403f3693da
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/NetPlayClient.cpp
View File

@ -16,11 +16,11 @@
#include <vector> #include <vector>
#include <fmt/format.h> #include <fmt/format.h>
#include <mbedtls/md5.h>
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Crypto/SHA1.h"
#include "Common/ENetUtil.h" #include "Common/ENetUtil.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
@ -2436,16 +2436,15 @@ bool NetPlayClient::DoAllPlayersHaveGame()
}); });
} }
static std::string MD5Sum(const std::string& file_path, std::function<bool(int)> report_progress) static std::string SHA1Sum(const std::string& file_path, std::function<bool(int)> report_progress)
{ {
std::vector<u8> data(8 * 1024 * 1024); std::vector<u8> data(8 * 1024 * 1024);
u64 read_offset = 0; u64 read_offset = 0;
mbedtls_md5_context ctx;
std::unique_ptr<DiscIO::BlobReader> file(DiscIO::CreateBlobReader(file_path)); std::unique_ptr<DiscIO::BlobReader> file(DiscIO::CreateBlobReader(file_path));
u64 game_size = file->GetDataSize(); u64 game_size = file->GetDataSize();
mbedtls_md5_starts_ret(&ctx); auto ctx = Common::SHA1::CreateContext();
while (read_offset < game_size) while (read_offset < game_size)
{ {
@ -2453,7 +2452,7 @@ static std::string MD5Sum(const std::string& file_path, std::function<bool(int)>
if (!file->Read(read_offset, read_size, data.data())) if (!file->Read(read_offset, read_size, data.data()))
return ""; return "";
mbedtls_md5_update_ret(&ctx, data.data(), read_size); ctx->Update(data.data(), read_size);
read_offset += read_size; read_offset += read_size;
int progress = int progress =
@ -2462,11 +2461,8 @@ static std::string MD5Sum(const std::string& file_path, std::function<bool(int)>
return ""; return "";
} }
std::array<u8, 16> output;
mbedtls_md5_finish_ret(&ctx, output.data());
// Convert to hex // Convert to hex
return fmt::format("{:02x}", fmt::join(output, "")); return fmt::format("{:02x}", fmt::join(ctx->Finish(), ""));
} }
void NetPlayClient::ComputeGameDigest(const SyncIdentifier& sync_identifier) void NetPlayClient::ComputeGameDigest(const SyncIdentifier& sync_identifier)
@ -2495,7 +2491,7 @@ void NetPlayClient::ComputeGameDigest(const SyncIdentifier& sync_identifier)
if (m_game_digest_thread.joinable()) if (m_game_digest_thread.joinable())
m_game_digest_thread.join(); m_game_digest_thread.join();
m_game_digest_thread = std::thread([this, file]() { m_game_digest_thread = std::thread([this, file]() {
std::string sum = MD5Sum(file, [&](int progress) { std::string sum = SHA1Sum(file, [&](int progress) {
sf::Packet packet; sf::Packet packet;
packet << MessageID::GameDigestProgress; packet << MessageID::GameDigestProgress;
packet << progress; packet << progress;

2
Source/Core/DolphinQt/NetPlay/GameDigestDialog.cpp
View File

@ -40,7 +40,7 @@ GameDigestDialog::GameDigestDialog(QWidget* parent) : QDialog(parent)
{ {
CreateWidgets(); CreateWidgets();
ConnectWidgets(); ConnectWidgets();
setWindowTitle(tr("MD5 Checksum")); setWindowTitle(tr("SHA1 Digest"));
setWindowFlags(Qt::Sheet | Qt::Dialog); setWindowFlags(Qt::Sheet | Qt::Dialog);
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);
} }