From b8992d1fdc162f399311e2f773677f075dc2163b Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Mon, 18 Apr 2022 23:59:25 +0200 Subject: [PATCH] Follow latest Switchbrew changes. --- include/core/nca.h | 16 ++++++++-------- include/core/npdm.h | 18 ++++++++++-------- source/core/keys.c | 22 +++++++++++----------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/include/core/nca.h b/include/core/nca.h index 2d3e392..93e4e5a 100644 --- a/include/core/nca.h +++ b/include/core/nca.h @@ -85,7 +85,7 @@ typedef enum { NcaKeyGeneration_Since910NUP = 11, ///< 9.1.0 - 12.0.3. NcaKeyGeneration_Since1210NUP = 12, ///< 12.1.0. NcaKeyGeneration_Since1300NUP = 13, ///< 13.0.0 - 13.2.1. - NcaKeyGeneration_Since1400NUP = 14, ///< 14.0.0. + NcaKeyGeneration_Since1400NUP = 14, ///< 14.0.0 - 14.1.0. NcaKeyGeneration_Current = NcaKeyGeneration_Since1400NUP, NcaKeyGeneration_Max = 32 } NcaKeyGeneration; @@ -97,13 +97,13 @@ typedef enum { NcaKeyAreaEncryptionKeyIndex_Count = 3 } NcaKeyAreaEncryptionKeyIndex; -/// 'NcaMainSignatureKeyGeneration_Current' will always point to the last known key generation value. +/// 'NcaSignatureKeyGeneration_Current' will always point to the last known key generation value. typedef enum { - NcaMainSignatureKeyGeneration_Since100NUP = 0, ///< 1.0.0 - 8.1.1. - NcaMainSignatureKeyGeneration_Since900NUP = 1, ///< 9.0.0 - 13.2.1. - NcaMainSignatureKeyGeneration_Current = NcaMainSignatureKeyGeneration_Since900NUP, - NcaMainSignatureKeyGeneration_Max = (NcaMainSignatureKeyGeneration_Current + 1) -} NcaMainSignatureKeyGeneration; + NcaSignatureKeyGeneration_Since100NUP = 0, ///< 1.0.0 - 8.1.1. + NcaSignatureKeyGeneration_Since900NUP = 1, ///< 9.0.0 - 14.1.0. + NcaSignatureKeyGeneration_Current = NcaSignatureKeyGeneration_Since900NUP, + NcaSignatureKeyGeneration_Max = (NcaSignatureKeyGeneration_Current + 1) +} NcaSignatureKeyGeneration; typedef struct { u32 start_sector; ///< Expressed in NCA_FS_SECTOR_SIZE sectors. @@ -148,7 +148,7 @@ typedef struct { u32 content_index; SdkAddOnVersion sdk_addon_version; u8 key_generation; ///< NcaKeyGeneration. Uses NcaKeyGeneration_Since301NUP or greater values. - u8 main_signature_key_generation; ///< NcaMainSignatureKeyGeneration. + u8 main_signature_key_generation; ///< NcaSignatureKeyGeneration. u8 reserved[0xE]; FsRightsId rights_id; ///< Used for titlekey crypto. NcaFsInfo fs_info[NCA_FS_HEADER_COUNT]; ///< Start and end sectors for each NCA FS section. diff --git a/include/core/npdm.h b/include/core/npdm.h index 69d947e..181d2e9 100644 --- a/include/core/npdm.h +++ b/include/core/npdm.h @@ -39,13 +39,13 @@ extern "C" { #define NPDM_SYSTEM_RESOURCE_MAX_SIZE 0x1FE00000 #define NPDM_MAIN_THREAD_STACK_SIZE_ALIGNMENT 0x1000 -/// 'NpdmAcidSignatureKeyGeneration_Current' will always point to the last known key generation value. +/// 'NpdmSignatureKeyGeneration_Current' will always point to the last known key generation value. typedef enum { - NpdmAcidSignatureKeyGeneration_Since100NUP = 0, ///< 1.0.0 - 8.1.1. - NpdmAcidSignatureKeyGeneration_Since900NUP = 1, ///< 9.0.0 - 13.2.1. - NpdmAcidSignatureKeyGeneration_Current = NpdmAcidSignatureKeyGeneration_Since900NUP, - NpdmAcidSignatureKeyGeneration_Max = (NpdmAcidSignatureKeyGeneration_Current + 1) -} NpdmAcidSignatureKeyGeneration; + NpdmSignatureKeyGeneration_Since100NUP = 0, ///< 1.0.0 - 8.1.1. + NpdmSignatureKeyGeneration_Since900NUP = 1, ///< 9.0.0 - 14.1.0. + NpdmSignatureKeyGeneration_Current = NpdmSignatureKeyGeneration_Since900NUP, + NpdmSignatureKeyGeneration_Max = (NpdmSignatureKeyGeneration_Current + 1) +} NpdmSignatureKeyGeneration; typedef enum { NpdmProcessAddressSpace_AddressSpace32Bit = 0, @@ -68,7 +68,7 @@ NXDT_ASSERT(NpdmMetaFlags, 0x1); /// This is followed by ACID and ACI0 sections, both with variable offsets and sizes. typedef struct { u32 magic; ///< "NPDM". - u8 acid_signature_key_generation; ///< NpdmAcidSignatureKeyGeneration. + u8 acid_signature_key_generation; ///< NpdmSignatureKeyGeneration. u8 reserved_1[0x7]; NpdmMetaFlags flags; u8 reserved_2; @@ -116,7 +116,9 @@ typedef struct { u8 public_key[0x100]; ///< RSA public key used to verify the ACID signature from the Program NCA header. u32 magic; ///< "ACID". u32 size; ///< Must be equal to ACID section size from the META header minus 0x100 (ACID signature size). - u8 reserved_1[0x4]; + u8 version; ///< 9.0.0+. + u8 unknown; ///< 14.0.0+. + u8 reserved_1[0x2]; NpdmAcidFlags flags; u64 program_id_min; u64 program_id_max; diff --git a/source/core/keys.c b/source/core/keys.c index 2c66673..e6f71fd 100644 --- a/source/core/keys.c +++ b/source/core/keys.c @@ -55,8 +55,8 @@ typedef struct { u8 nca_header_key[AES_128_KEY_SIZE * 2]; ///< Generated from nca_header_kek_sealed and nca_header_key_source. ///< RSA-2048-PSS moduli used to verify the main signature from NCA headers. - u8 nca_main_signature_moduli_prod[NcaMainSignatureKeyGeneration_Max][RSA2048_PUBKEY_SIZE]; ///< Moduli used in retail units. Retrieved from the .rodata segment in the FS sysmodule. - u8 nca_main_signature_moduli_dev[NcaMainSignatureKeyGeneration_Max][RSA2048_PUBKEY_SIZE]; ///< Moduli used in development units. Retrieved from the .rodata segment in the FS sysmodule. + u8 nca_main_signature_moduli_prod[NcaSignatureKeyGeneration_Max][RSA2048_PUBKEY_SIZE]; ///< Moduli used in retail units. Retrieved from the .rodata segment in the FS sysmodule. + u8 nca_main_signature_moduli_dev[NcaSignatureKeyGeneration_Max][RSA2048_PUBKEY_SIZE]; ///< Moduli used in development units. Retrieved from the .rodata segment in the FS sysmodule. ///< AES-128-ECB keys needed to handle key area crypto from NCA headers. u8 nca_kaek_sources[NcaKeyAreaEncryptionKeyIndex_Count][AES_128_KEY_SIZE]; ///< Retrieved from the .rodata segment in the FS sysmodule. @@ -162,8 +162,8 @@ static KeysMemoryInfo g_fsRodataMemoryInfo = { 0xF9, 0x2E, 0x84, 0x98, 0x17, 0x2C, 0xAF, 0x9C, 0x20, 0xE3, 0xF1, 0xF7, 0xD3, 0xE7, 0x2C, 0x62, 0x50, 0xA9, 0x40, 0x7A, 0xE7, 0x84, 0xE0, 0x03, 0x58, 0x07, 0x85, 0xA5, 0x68, 0x0B, 0x80, 0x33 }, - .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_prod[NcaMainSignatureKeyGeneration_Since100NUP]), - .dst = g_ncaKeyset.nca_main_signature_moduli_prod[NcaMainSignatureKeyGeneration_Since100NUP], + .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_prod[NcaSignatureKeyGeneration_Since100NUP]), + .dst = g_ncaKeyset.nca_main_signature_moduli_prod[NcaSignatureKeyGeneration_Since100NUP], .mandatory_func = &keysIsProductionModulus1xMandatory }, { @@ -172,8 +172,8 @@ static KeysMemoryInfo g_fsRodataMemoryInfo = { 0x5F, 0x6B, 0xE3, 0x1C, 0x31, 0x6E, 0x7C, 0xB2, 0x1C, 0xA7, 0xB9, 0xA1, 0x70, 0x6A, 0x9D, 0x58, 0x04, 0xEB, 0x90, 0x53, 0x72, 0xEF, 0xCB, 0x56, 0xD1, 0x93, 0xF2, 0xAF, 0x9E, 0x8A, 0xD1, 0xFA }, - .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_prod[NcaMainSignatureKeyGeneration_Since900NUP]), - .dst = g_ncaKeyset.nca_main_signature_moduli_prod[NcaMainSignatureKeyGeneration_Since900NUP], + .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_prod[NcaSignatureKeyGeneration_Since900NUP]), + .dst = g_ncaKeyset.nca_main_signature_moduli_prod[NcaSignatureKeyGeneration_Since900NUP], .mandatory_func = &keysIsProductionModulus9xMandatory }, { @@ -182,8 +182,8 @@ static KeysMemoryInfo g_fsRodataMemoryInfo = { 0x50, 0xF8, 0x26, 0xBB, 0x13, 0xFE, 0xB2, 0x6D, 0x83, 0xCF, 0xFF, 0xD8, 0x38, 0x45, 0xC3, 0x51, 0x4D, 0xCB, 0x06, 0x91, 0x83, 0x52, 0x06, 0x35, 0x7A, 0xC1, 0xDA, 0x6B, 0xF1, 0x60, 0x9F, 0x18 }, - .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_dev[NcaMainSignatureKeyGeneration_Since100NUP]), - .dst = g_ncaKeyset.nca_main_signature_moduli_dev[NcaMainSignatureKeyGeneration_Since100NUP], + .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_dev[NcaSignatureKeyGeneration_Since100NUP]), + .dst = g_ncaKeyset.nca_main_signature_moduli_dev[NcaSignatureKeyGeneration_Since100NUP], .mandatory_func = &keysIsDevelopmentModulus1xMandatory }, { @@ -192,8 +192,8 @@ static KeysMemoryInfo g_fsRodataMemoryInfo = { 0x56, 0xF5, 0x06, 0xEF, 0x8E, 0xCA, 0x2A, 0x29, 0x6F, 0x65, 0x45, 0xE1, 0x87, 0x60, 0x01, 0x11, 0xBC, 0xC7, 0x38, 0x56, 0x99, 0x16, 0xAD, 0xA5, 0xDD, 0x89, 0xF2, 0xE9, 0xAB, 0x28, 0x5B, 0x18 }, - .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_dev[NcaMainSignatureKeyGeneration_Since900NUP]), - .dst = g_ncaKeyset.nca_main_signature_moduli_dev[NcaMainSignatureKeyGeneration_Since900NUP], + .size = sizeof(g_ncaKeyset.nca_main_signature_moduli_dev[NcaSignatureKeyGeneration_Since900NUP]), + .dst = g_ncaKeyset.nca_main_signature_moduli_dev[NcaSignatureKeyGeneration_Since900NUP], .mandatory_func = &keysIsDevelopmentModulus9xMandatory }, { @@ -325,7 +325,7 @@ const u8 *keysGetNcaHeaderKey(void) const u8 *keysGetNcaMainSignatureModulus(u8 key_generation) { - if (key_generation > NcaMainSignatureKeyGeneration_Current) + if (key_generation > NcaSignatureKeyGeneration_Current) { LOG_MSG("Unsupported key generation value! (0x%02X).", key_generation); return NULL;