Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-18 03:31:31 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #66 from wheremyfoodat/dynapica

Browse source 
Fix false positives in crypto code hopefully
This commit is contained in:
wheremyfoodat 2023-07-03 17:53:47 +03:00 • committed by GitHub
commit ba0f4c5edd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/core/loader/ncch.cpp
View file

@ -44,15 +44,20 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
exheaderInfo.offset = info.offset + 0x200; exheaderInfo.offset = info.offset + 0x200;
exheaderInfo.size = exheaderSize; exheaderInfo.size = exheaderSize;
exheaderInfo.hashRegionSize = 0; exheaderInfo.hashRegionSize = 0;
exheaderInfo.encryptionInfo = std::nullopt;
exeFS.offset = info.offset + u64(*(u32*)&header[0x1A0]) * mediaUnit; exeFS.offset = info.offset + u64(*(u32*)&header[0x1A0]) * mediaUnit;
exeFS.size = u64(*(u32*)&header[0x1A4]) * mediaUnit; exeFS.size = u64(*(u32*)&header[0x1A4]) * mediaUnit;
exeFS.hashRegionSize = u64(*(u32*)&header[0x1A8]) * mediaUnit; exeFS.hashRegionSize = u64(*(u32*)&header[0x1A8]) * mediaUnit;
exeFS.encryptionInfo = std::nullopt;
romFS.offset = info.offset + u64(*(u32*)&header[0x1B0]) * mediaUnit; romFS.offset = info.offset + u64(*(u32*)&header[0x1B0]) * mediaUnit;
romFS.size = u64(*(u32*)&header[0x1B4]) * mediaUnit; romFS.size = u64(*(u32*)&header[0x1B4]) * mediaUnit;
romFS.hashRegionSize = u64(*(u32*)&header[0x1B8]) * mediaUnit; romFS.hashRegionSize = u64(*(u32*)&header[0x1B8]) * mediaUnit;
romFS.encryptionInfo = std::nullopt;
// Shows whether we got the primary and secondary keys correctly
bool gotCryptoKeys = true;
if (encrypted) { if (encrypted) {
Crypto::AESKey primaryKeyY; Crypto::AESKey primaryKeyY;
Crypto::AESKey secondaryKeyY; Crypto::AESKey secondaryKeyY;
@ -61,44 +66,36 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
if (!seedCrypto) { if (!seedCrypto) {
secondaryKeyY = primaryKeyY; secondaryKeyY = primaryKeyY;
} else { } else {
Helpers::panic("Seed crypto is not supported"); Helpers::warn("Seed crypto is not supported");
return false; gotCryptoKeys = false;
} }
auto primaryResult = getPrimaryKey(aesEngine, primaryKeyY); auto primaryResult = getPrimaryKey(aesEngine, primaryKeyY);
if (!primaryResult.first) {
Helpers::panic("getPrimaryKey failed!");
return false;
}
Crypto::AESKey primaryKey = primaryResult.second;
auto secondaryResult = getSecondaryKey(aesEngine, secondaryKeyY); auto secondaryResult = getSecondaryKey(aesEngine, secondaryKeyY);
if (!secondaryResult.first) { if (!primaryResult.first || !secondaryResult.first) {
Helpers::panic("getSecondaryKey failed!"); gotCryptoKeys = false;
return false; } else {
Crypto::AESKey primaryKey = primaryResult.second;
Crypto::AESKey secondaryKey = secondaryResult.second;
EncryptionInfo encryptionInfoTmp;
encryptionInfoTmp.normalKey = primaryKey;
encryptionInfoTmp.initialCounter.fill(0);
for (std::size_t i = 1; i <= sizeof(std::uint64_t) - 1; i++) {
encryptionInfoTmp.initialCounter[i] = header[0x108 + sizeof(std::uint64_t) - 1 - i];
}
encryptionInfoTmp.initialCounter[8] = 1;
exheaderInfo.encryptionInfo = encryptionInfoTmp;
encryptionInfoTmp.initialCounter[8] = 2;
exeFS.encryptionInfo = encryptionInfoTmp;
encryptionInfoTmp.normalKey = secondaryKey;
encryptionInfoTmp.initialCounter[8] = 3;
romFS.encryptionInfo = encryptionInfoTmp;
} }
Crypto::AESKey secondaryKey = secondaryResult.second;
EncryptionInfo encryptionInfoTmp;
encryptionInfoTmp.normalKey = primaryKey;
encryptionInfoTmp.initialCounter.fill(0);
for (std::size_t i = 1; i <= sizeof(std::uint64_t) - 1; i++) {
encryptionInfoTmp.initialCounter[i] = header[0x108 + sizeof(std::uint64_t) - 1 - i];
}
encryptionInfoTmp.initialCounter[8] = 1;
exheaderInfo.encryptionInfo = encryptionInfoTmp;
encryptionInfoTmp.initialCounter[8] = 2;
exeFS.encryptionInfo = encryptionInfoTmp;
encryptionInfoTmp.normalKey = secondaryKey;
encryptionInfoTmp.initialCounter[8] = 3;
romFS.encryptionInfo = encryptionInfoTmp;
} }
if (exheaderSize != 0) { if (exheaderSize != 0) {
@ -117,7 +114,13 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
if (u32(programID) == u32(jumpID) && encrypted) { if (u32(programID) == u32(jumpID) && encrypted) {
printf("NCSD is supposedly ecrypted but not actually encrypted\n"); printf("NCSD is supposedly ecrypted but not actually encrypted\n");
encrypted = false; encrypted = false;
// Cartridge is not actually encrypted, set all of our encryption info structures to nullopt
exheaderInfo.encryptionInfo = std::nullopt;
romFS.encryptionInfo = std::nullopt;
exeFS.encryptionInfo = std::nullopt;
} }
// If it's truly encrypted, we need to read section again. // If it's truly encrypted, we need to read section again.
if (encrypted) { if (encrypted) {
if (!aesEngine.haveKeys()) { if (!aesEngine.haveKeys()) {
@ -128,6 +131,11 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
return false; return false;
} }
if (!gotCryptoKeys) {
Helpers::panic("ROM is encrypted but it seems we couldn't get either the primary or the secondary key");
return false;
}
auto [success, bytes] = readFromFile(file, exheaderInfo, &exheader[0], 0, exheaderSize); auto [success, bytes] = readFromFile(file, exheaderInfo, &exheader[0], 0, exheaderSize);
if (!success || bytes != exheaderSize) { if (!success || bytes != exheaderSize) {
printf("Failed to read Extended NCCH header\n"); printf("Failed to read Extended NCCH header\n");