diff options
| author | Gareth Poole <Gareth422@users.noreply.github.com> | 2015-10-11 03:50:10 +0200 |
|---|---|---|
| committer | Gareth Poole <Gareth422@users.noreply.github.com> | 2015-10-11 04:34:17 +0200 |
| commit | 2706394384afea55069848d5b337e60fbe81c336 (patch) | |
| tree | 4bc9ebb08be7da995a3a16a6de84976b08377383 /src/core | |
| parent | Merge pull request #1195 from Gareth422/secondary (diff) | |
| download | yuzu-2706394384afea55069848d5b337e60fbe81c336.tar yuzu-2706394384afea55069848d5b337e60fbe81c336.tar.gz yuzu-2706394384afea55069848d5b337e60fbe81c336.tar.bz2 yuzu-2706394384afea55069848d5b337e60fbe81c336.tar.lz yuzu-2706394384afea55069848d5b337e60fbe81c336.tar.xz yuzu-2706394384afea55069848d5b337e60fbe81c336.tar.zst yuzu-2706394384afea55069848d5b337e60fbe81c336.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/loader/loader.h | 1 | ||||
| -rw-r--r-- | src/core/loader/ncch.cpp | 5 | ||||
| -rw-r--r-- | src/core/loader/ncch.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 8de95dacf..a7f2715ba 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -71,6 +71,7 @@ enum class ResultStatus { ErrorNotUsed, ErrorAlreadyLoaded, ErrorMemoryAllocationFailed, + ErrorEncrypted, }; static inline u32 MakeMagic(char a, char b, char c, char d) { diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 094d74100..c67d25b55 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -266,6 +266,11 @@ ResultStatus AppLoader_NCCH::Load() { LOG_DEBUG(Loader, "Thread priority: 0x%X" , priority); LOG_DEBUG(Loader, "Resource limit category: %d" , resource_limit_category); + if (exheader_header.arm11_system_local_caps.program_id != ncch_header.program_id) { + LOG_ERROR(Loader, "ExHeader Program ID mismatch: the ROM is probably encrypted."); + return ResultStatus::ErrorEncrypted; + } + // Read ExeFS... exefs_offset = ncch_header.exefs_offset * kBlockSize; diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index d875e4cf3..fd7c65814 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -23,7 +23,7 @@ struct NCCH_Header { u16 maker_code; u16 version; u8 reserved_0[4]; - u8 program_id[8]; + u64_le program_id; u8 reserved_1[0x10]; u8 logo_region_hash[0x20]; u8 product_code[0x10]; @@ -109,7 +109,7 @@ struct ExHeader_StorageInfo { }; struct ExHeader_ARM11_SystemLocalCaps { - u8 program_id[8]; + u64_le program_id; u32 core_version; u8 reserved_flags[2]; union { |