Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-03 00:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncch: Fix Secure1 with seed

Browse Source 
Citra's code was wrong here.
This commit is contained in:
zhupengfei
2020-08-06 23:03:19 +08:00
parent ac6f95c067
commit bf3fe550f8
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ncch/ncch_container.cpp
+14 -19
View File
@@ -101,37 +101,32 @@ ResultStatus NCCHContainer::Load() {
} }
primary_key = Key::GetNormalKey(Key::NCCHSecure1); primary_key = Key::GetNormalKey(Key::NCCHSecure1);
const auto SetSecondaryKey = [this, &failed_to_decrypt,
&key_y_secondary](Key::KeySlotID slot) {
Key::SetKeyY(slot, key_y_secondary);
if (!Key::IsNormalKeyAvailable(slot)) {
LOG_ERROR(Service_FS, "{:#04X} KeyX missing", slot);
failed_to_decrypt = true;
}
secondary_key = Key::GetNormalKey(slot);
};
switch (ncch_header.secondary_key_slot) { switch (ncch_header.secondary_key_slot) {
case 0: case 0:
LOG_DEBUG(Service_FS, "Secure1 crypto"); LOG_DEBUG(Service_FS, "Secure1 crypto");
secondary_key = primary_key; SetSecondaryKey(Key::NCCHSecure1);
break; break;
case 1: case 1:
LOG_DEBUG(Service_FS, "Secure2 crypto"); LOG_DEBUG(Service_FS, "Secure2 crypto");
Key::SetKeyY(Key::NCCHSecure2, key_y_secondary); SetSecondaryKey(Key::NCCHSecure2);
if (!Key::IsNormalKeyAvailable(Key::NCCHSecure2)) {
LOG_ERROR(Service_FS, "Secure2 KeyX missing");
failed_to_decrypt = true;
}
secondary_key = Key::GetNormalKey(Key::NCCHSecure2);
break; break;
case 10: case 10:
LOG_DEBUG(Service_FS, "Secure3 crypto"); LOG_DEBUG(Service_FS, "Secure3 crypto");
Key::SetKeyY(Key::NCCHSecure3, key_y_secondary); SetSecondaryKey(Key::NCCHSecure3);
if (!Key::IsNormalKeyAvailable(Key::NCCHSecure3)) {
LOG_ERROR(Service_FS, "Secure3 KeyX missing");
failed_to_decrypt = true;
}
secondary_key = Key::GetNormalKey(Key::NCCHSecure3);
break; break;
case 11: case 11:
LOG_DEBUG(Service_FS, "Secure4 crypto"); LOG_DEBUG(Service_FS, "Secure4 crypto");
Key::SetKeyY(Key::NCCHSecure4, key_y_secondary); SetSecondaryKey(Key::NCCHSecure4);
if (!Key::IsNormalKeyAvailable(Key::NCCHSecure4)) {
LOG_ERROR(Service_FS, "Secure4 KeyX missing");
failed_to_decrypt = true;
}
secondary_key = Key::GetNormalKey(Key::NCCHSecure4);
break; break;
} }
} }