moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AES: Fix fixed crypto key mode and CTR for versions 0 and 2

Browse Source
This commit is contained in:
wheremyfoodat
2024-07-20 01:01:15 +03:00
parent 801d14e463
commit 270f4b00a9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/loader/ncch.cpp
View File

@@ -88,8 +88,8 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
encryptionInfoTmp.normalKey = *primaryKey; encryptionInfoTmp.normalKey = *primaryKey;
encryptionInfoTmp.initialCounter.fill(0); encryptionInfoTmp.initialCounter.fill(0);
for (std::size_t i = 1; i <= sizeof(std::uint64_t) - 1; i++) { for (usize i = 0; i < 8; i++) {
encryptionInfoTmp.initialCounter[i] = header[0x108 + sizeof(std::uint64_t) - 1 - i]; encryptionInfoTmp.initialCounter[i] = header[0x108 + 7 - i];
} }
encryptionInfoTmp.initialCounter[8] = 1; encryptionInfoTmp.initialCounter[8] = 1;
exheaderInfo.encryptionInfo = encryptionInfoTmp; exheaderInfo.encryptionInfo = encryptionInfoTmp;
@@ -305,6 +305,7 @@ std::pair<bool, Crypto::AESKey> NCCH::getPrimaryKey(Crypto::AESEngine &aesEngine
if (encrypted) { if (encrypted) {
if (fixedCryptoKey) { if (fixedCryptoKey) {
result.fill(0);
return {true, result}; return {true, result};
} }
@@ -326,6 +327,7 @@ std::pair<bool, Crypto::AESKey> NCCH::getSecondaryKey(Crypto::AESEngine &aesEngi
if (encrypted) { if (encrypted) {
if (fixedCryptoKey) { if (fixedCryptoKey) {
result.fill(0);
return {true, result}; return {true, result};
} }