Skip to content

HLE: fix global context for md5 and sha1 #21497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GermanAizek wants to merge 2 commits into
base: master
Choose a base branch
from
+45 −20
Open

HLE: fix global context for md5 and sha1 #21497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
305084f
HLE: fix global context for md5 and sha1
GermanAizek Mar 29, 2026
20d393d
HLE: fix write to memory without considering size contexts
GermanAizek Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions Core/HLE/sceMd5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.

#include <map>
#include "Common/Crypto/md5.h"
#include "Common/Crypto/sha1.h"
#include "Common/Data/Random/Rng.h"
Expand Down Expand Up @@ -50,7 +51,7 @@ u32 sceKernelUtilsMt19937UInt(u32 ctx) {

// TODO: This MD5 stuff needs tests!

static md5_context md5_ctx;
static std::map<u32, md5_context> md5_contexts;

static int sceMd5Digest(u32 dataAddr, u32 len, u32 digestAddr) {
DEBUG_LOG(Log::HLE, "sceMd5Digest(%08x, %d, %08x)", dataAddr, len, digestAddr);
Expand All @@ -67,10 +68,9 @@ static int sceMd5BlockInit(u32 ctxAddr) {
if (!Memory::IsValidAddress(ctxAddr))
return -1;

// TODO: Until I know how large a context is, we just go all lazy and use a global context,
// which will work just fine unless games do several MD5 concurrently.

ppsspp_md5_starts(&md5_ctx);
md5_context ctx;
ppsspp_md5_starts(&ctx);
md5_contexts[ctxAddr] = ctx;
return 0;
}

Expand All @@ -79,7 +79,11 @@ static int sceMd5BlockUpdate(u32 ctxAddr, u32 dataPtr, u32 len) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(dataPtr))
return -1;

ppsspp_md5_update(&md5_ctx, Memory::GetPointerWriteUnchecked(dataPtr), (int)len);
auto it = md5_contexts.find(ctxAddr);
if (it == md5_contexts.end()) {
return -1;
}
ppsspp_md5_update(&it->second, Memory::GetPointerWriteUnchecked(dataPtr), (int)len);
return 0;
}

Expand All @@ -88,7 +92,12 @@ static int sceMd5BlockResult(u32 ctxAddr, u32 digestAddr) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(digestAddr))
return -1;

ppsspp_md5_finish(&md5_ctx, Memory::GetPointerWriteUnchecked(digestAddr));
auto it = md5_contexts.find(ctxAddr);
if (it == md5_contexts.end()) {
return -1;
}
ppsspp_md5_finish(&it->second, Memory::GetPointerWriteUnchecked(digestAddr));
md5_contexts.erase(it);
return 0;
}

Expand All @@ -107,10 +116,9 @@ int sceKernelUtilsMd5BlockInit(u32 ctxAddr) {
if (!Memory::IsValidAddress(ctxAddr))
return -1;

// TODO: Until I know how large a context is, we just go all lazy and use a global context,
// which will work just fine unless games do several MD5 concurrently.

ppsspp_md5_starts(&md5_ctx);
md5_context ctx;
ppsspp_md5_starts(&ctx);
md5_contexts[ctxAddr] = ctx;
return 0;
}

Expand All @@ -119,7 +127,11 @@ int sceKernelUtilsMd5BlockUpdate(u32 ctxAddr, u32 dataPtr, int len) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(dataPtr))
return -1;

ppsspp_md5_update(&md5_ctx, Memory::GetPointerWriteUnchecked(dataPtr), (int)len);
auto it = md5_contexts.find(ctxAddr);
if (it == md5_contexts.end()) {
return -1;
}
ppsspp_md5_update(&it->second, Memory::GetPointerWriteUnchecked(dataPtr), (int)len);
return 0;
}

Expand All @@ -128,12 +140,17 @@ int sceKernelUtilsMd5BlockResult(u32 ctxAddr, u32 digestAddr) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(digestAddr))
return -1;

ppsspp_md5_finish(&md5_ctx, Memory::GetPointerWriteUnchecked(digestAddr));
auto it = md5_contexts.find(ctxAddr);
if (it == md5_contexts.end()) {
return -1;
}
ppsspp_md5_finish(&it->second, Memory::GetPointerWriteUnchecked(digestAddr));
md5_contexts.erase(it);
return 0;
}


static sha1_context sha1_ctx;
static std::map<u32, sha1_context> sha1_contexts;

int sceKernelUtilsSha1Digest(u32 dataAddr, int len, u32 digestAddr) {
DEBUG_LOG(Log::HLE, "sceKernelUtilsSha1Digest(%08x, %d, %08x)", dataAddr, len, digestAddr);
Expand All @@ -150,10 +167,9 @@ int sceKernelUtilsSha1BlockInit(u32 ctxAddr) {
if (!Memory::IsValidAddress(ctxAddr))
return -1;

// TODO: Until I know how large a context is, we just go all lazy and use a global context,
// which will work just fine unless games do several MD5 concurrently.

sha1_starts(&sha1_ctx);
sha1_context ctx;
sha1_starts(&ctx);
sha1_contexts[ctxAddr] = ctx;

return 0;
}
Expand All @@ -163,7 +179,11 @@ int sceKernelUtilsSha1BlockUpdate(u32 ctxAddr, u32 dataAddr, int len) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(dataAddr))
return -1;

sha1_update(&sha1_ctx, Memory::GetPointerWriteUnchecked(dataAddr), (int)len);
auto it = sha1_contexts.find(ctxAddr);
if (it == sha1_contexts.end()) {
return -1;
}
sha1_update(&it->second, Memory::GetPointerWriteUnchecked(dataAddr), (int)len);
return 0;
}

Expand All @@ -172,7 +192,12 @@ int sceKernelUtilsSha1BlockResult(u32 ctxAddr, u32 digestAddr) {
if (!Memory::IsValidAddress(ctxAddr) || !Memory::IsValidAddress(digestAddr))
return -1;

sha1_finish(&sha1_ctx, Memory::GetPointerWriteUnchecked(digestAddr));
auto it = sha1_contexts.find(ctxAddr);
if (it == sha1_contexts.end()) {
return -1;
}
sha1_finish(&it->second, Memory::GetPointerWriteUnchecked(digestAddr));
sha1_contexts.erase(it);
return 0;
}

Expand Down
Loading