citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-25 18:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1199 from Gareth422/encryption-check

Browse source 
Loader: Implement NCCH encryption check
This commit is contained in:
bunnei 2015-10-20 10:17:31 -04:00
parent 04325e5980 721475420d
commit c717d1551d
3 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/loader/loader.h
View file

@ -71,6 +71,7 @@ enum class ResultStatus {
ErrorNotUsed, ErrorNotUsed,
ErrorAlreadyLoaded, ErrorAlreadyLoaded,
ErrorMemoryAllocationFailed, ErrorMemoryAllocationFailed,
ErrorEncrypted,
}; };
static inline u32 MakeMagic(char a, char b, char c, char d) { static inline u32 MakeMagic(char a, char b, char c, char d) {

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

@ -128,9 +128,8 @@ ResultStatus AppLoader_NCCH::LoadExec() {
if (ResultStatus::Success == ReadCode(code)) { if (ResultStatus::Success == ReadCode(code)) {
std::string process_name = Common::StringFromFixedZeroTerminatedBuffer( std::string process_name = Common::StringFromFixedZeroTerminatedBuffer(
(const char*)exheader_header.codeset_info.name, 8); (const char*)exheader_header.codeset_info.name, 8);
u64 program_id = *reinterpret_cast<u64_le const*>(&ncch_header.program_id[0]);
SharedPtr<CodeSet> codeset = CodeSet::Create(process_name, program_id); SharedPtr<CodeSet> codeset = CodeSet::Create(process_name, ncch_header.program_id);
codeset->code.offset = 0; codeset->code.offset = 0;
codeset->code.addr = exheader_header.codeset_info.text.address; codeset->code.addr = exheader_header.codeset_info.text.address;
@ -266,6 +265,11 @@ ResultStatus AppLoader_NCCH::Load() {
LOG_DEBUG(Loader, "Thread priority: 0x%X" , priority); LOG_DEBUG(Loader, "Thread priority: 0x%X" , priority);
LOG_DEBUG(Loader, "Resource limit category: %d" , resource_limit_category); 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... // Read ExeFS...
exefs_offset = ncch_header.exefs_offset * kBlockSize; exefs_offset = ncch_header.exefs_offset * kBlockSize;

36
src/core/loader/ncch.h
View file

@ -17,31 +17,31 @@
struct NCCH_Header { struct NCCH_Header {
u8 signature[0x100]; u8 signature[0x100];
u32 magic; u32_le magic;
u32 content_size; u32_le content_size;
u8 partition_id[8]; u8 partition_id[8];
u16 maker_code; u16_le maker_code;
u16 version; u16_le version;
u8 reserved_0[4]; u8 reserved_0[4];
u8 program_id[8]; u64_le program_id;
u8 reserved_1[0x10]; u8 reserved_1[0x10];
u8 logo_region_hash[0x20]; u8 logo_region_hash[0x20];
u8 product_code[0x10]; u8 product_code[0x10];
u8 extended_header_hash[0x20]; u8 extended_header_hash[0x20];
u32 extended_header_size; u32_le extended_header_size;
u8 reserved_2[4]; u8 reserved_2[4];
u8 flags[8]; u8 flags[8];
u32 plain_region_offset; u32_le plain_region_offset;
u32 plain_region_size; u32_le plain_region_size;
u32 logo_region_offset; u32_le logo_region_offset;
u32 logo_region_size; u32_le logo_region_size;
u32 exefs_offset; u32_le exefs_offset;
u32 exefs_size; u32_le exefs_size;
u32 exefs_hash_region_size; u32_le exefs_hash_region_size;
u8 reserved_3[4]; u8 reserved_3[4];
u32 romfs_offset; u32_le romfs_offset;
u32 romfs_size; u32_le romfs_size;
u32 romfs_hash_region_size; u32_le romfs_hash_region_size;
u8 reserved_4[4]; u8 reserved_4[4];
u8 exefs_super_block_hash[0x20]; u8 exefs_super_block_hash[0x20];
u8 romfs_super_block_hash[0x20]; u8 romfs_super_block_hash[0x20];
@ -109,8 +109,8 @@ struct ExHeader_StorageInfo {
}; };
struct ExHeader_ARM11_SystemLocalCaps { struct ExHeader_ARM11_SystemLocalCaps {
u8 program_id[8]; u64_le program_id;
u32 core_version; u32_le core_version;
u8 reserved_flags[2]; u8 reserved_flags[2];
union { union {
u8 flags0; u8 flags0;