ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1084 from ergo720/nxdk_signature_crash 

Fix nxdk built xbe crash when the signature is all zeros
This commit is contained in:
PatrickvL 2018-04-22 15:11:22 +02:00 committed by GitHub
parent 4fcbb49407 7a0ced29d1
commit cbf68f1470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/Xbe.cpp
View File

@ -583,6 +583,7 @@ void Xbe::ConstructorInit()
m_XAPILibraryVersion = 0; m_XAPILibraryVersion = 0;
m_TLS = 0; m_TLS = 0;
m_bzSection = 0; m_bzSection = 0;
m_SignatureHeader = 0;
} }
// better time // better time
@ -821,6 +822,15 @@ const wchar_t *Xbe::GetUnicodeFilenameAddr()
bool Xbe::CheckXbeSignature() bool Xbe::CheckXbeSignature()
{ {
// Workaround for nxdk (and possibly oxdk?): xbe's built with nxdk have the digital signature set to all zeros, which will lead
// to a crash during its decryption in RSAdecrypt. Detect this condition and skip the check if true
{
UCHAR Dummy[256] = { 0 };
if (memcmp(m_Header.pbDigitalSignature, Dummy, 256) == 0) {
return false;
}
}
DWORD HeaderDigestSize = m_Header.dwSizeofHeaders - (sizeof(m_Header.dwMagic) + sizeof(m_Header.pbDigitalSignature)); DWORD HeaderDigestSize = m_Header.dwSizeofHeaders - (sizeof(m_Header.dwMagic) + sizeof(m_Header.pbDigitalSignature));
UCHAR SHADigest[A_SHA_DIGEST_LEN]; UCHAR SHADigest[A_SHA_DIGEST_LEN];
unsigned char crypt_buffer[256]; unsigned char crypt_buffer[256];