citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4862 from leoetlino/exheader-override-fix 

ncch_container: Assume override exheaders are decrypted
This commit is contained in:
James Rowe 2019-08-14 09:31:54 -06:00 committed by GitHub
parent fa6b5709a7 a2cde6e075
commit 84b40f2da6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/file_sys/ncch_container.cpp
View File

@ -326,13 +326,19 @@ Loader::ResultStatus NCCHContainer::Load() {
}; };
FileUtil::IOFile exheader_override_file{filepath + ".exheader", "rb"}; FileUtil::IOFile exheader_override_file{filepath + ".exheader", "rb"};
if (read_exheader(exheader_override_file)) { const bool has_exheader_override = read_exheader(exheader_override_file);
if (has_exheader_override) {
if (exheader_header.system_info.jump_id !=
exheader_header.arm11_system_local_caps.program_id) {
LOG_WARNING(Service_FS, "Jump ID and Program ID don't match. "
"The override exheader might not be decrypted.");
}
is_tainted = true; is_tainted = true;
} else if (!read_exheader(file)) { } else if (!read_exheader(file)) {
return Loader::ResultStatus::Error; return Loader::ResultStatus::Error;
} }
if (is_encrypted) { if (!has_exheader_override && is_encrypted) {
// This ID check is masked to low 32-bit as a toleration to ill-formed ROM created // This ID check is masked to low 32-bit as a toleration to ill-formed ROM created
// by merging games and its updates. // by merging games and its updates.
if ((exheader_header.system_info.jump_id & 0xFFFFFFFF) == if ((exheader_header.system_info.jump_id & 0xFFFFFFFF) ==