diff --git a/exosphere/bootconfig.h b/exosphere/bootconfig.h index cfb5ba1df..f89191163 100644 --- a/exosphere/bootconfig.h +++ b/exosphere/bootconfig.h @@ -8,11 +8,16 @@ typedef struct { uint8_t unsigned_config[0x200]; uint8_t signature[0x100]; - uint8_t header[0x100]; - uint8_t signed_config[0x24]; + uint8_t signed_config[0x100]; + uint8_t unknown_config[0x240]; } bootconfig_t; -void bootconfig_load_and_verify(const bootconfig_t *bootconfig) +void bootconfig_load_and_verify(const bootconfig_t *bootconfig); void bootconfig_clear(void); + +/* Actual configuration getters. */ +int bootconfig_is_package2_plaintext(void); +void bootconfig_is_package2_unsigned(void); + #endif \ No newline at end of file diff --git a/exosphere/package2.c b/exosphere/package2.c index 583152cc6..0d7f28b7e 100644 --- a/exosphere/package2.c +++ b/exosphere/package2.c @@ -21,8 +21,8 @@ void setup_mmio_virtual_addresses(void) { /* TODO: Set UART-A address to 0x1F0085000. */ /* TODO: Set I2C-0 address to 0x1F00A5000. */ /* TODO: Set I2C-4 address to 0x1F00A1000. */ - /* TODO: Set MISC address to 0x70000000. */ - /* TODO: Set GPIO-1 address to 0x6000D000. */ + /* TODO: Set MISC address to 0x1F0098000. */ + /* TODO: Set GPIO-1 address to 0x1F00A3000. */ } /* Hardware init, sets up the RNG and SESSION keyslots, derives new DEVICE key. */ @@ -90,6 +90,109 @@ void setup_boot_config(void) { } } +int rsa_pss_verify(const void *signature, size_t signature_size, const void *modulus, size_t modulus_size, const void *data, size_t data_size) { + /* TODO: Implement RSA-PSS, using security engine for exponentiation. */ +} + +void package2_crypt_ctr(unsigned int master_key_rev, void *dst, size_t dst_size, const void *src, size_t src_size, const void *ctr, size_t ctr_size) { + /* Derive package2 key. */ + const uint8_t package2_key_source[0x10] = {0xFB, 0x8B, 0x6A, 0x9C, 0x79, 0x00, 0xC8, 0x49, 0xEF, 0xD2, 0x4D, 0x85, 0x4D, 0x30, 0xA0, 0xC7}; + flush_dcache_range((uint8_t *)dst, (uint8_t *)dst + dst_size); + flush_dcache_range((uint8_t *)src, (uint8_t *)src + src_size); + unsigned int keyslot = mkey_get_keyslot(master_key_rev); + decrypt_data_into_keyslot(KEYSLOT_SWITCH_PACKAGE2KEY, keyslot, package2_key_source, 0x10); + + /* Perform Encryption. */ + se_aes_ctr_crypt(KEYSLOT_SWITCH_PACKAGE2KEY, dst, dst_size, src, src_size, ctr, ctr_size); +} + + +void verify_header_signature(package2_header_t *header) { + const uint8_t *modulus; + + if (configitem_is_retail()) { + const uint8_t package2_modulus_retail[0x100] = { + 0x8D, 0x13, 0xA7, 0x77, 0x6A, 0xE5, 0xDC, 0xC0, 0x3B, 0x25, 0xD0, 0x58, 0xE4, 0x20, 0x69, 0x59, + 0x55, 0x4B, 0xAB, 0x70, 0x40, 0x08, 0x28, 0x07, 0xA8, 0xA7, 0xFD, 0x0F, 0x31, 0x2E, 0x11, 0xFE, + 0x47, 0xA0, 0xF9, 0x9D, 0xDF, 0x80, 0xDB, 0x86, 0x5A, 0x27, 0x89, 0xCD, 0x97, 0x6C, 0x85, 0xC5, + 0x6C, 0x39, 0x7F, 0x41, 0xF2, 0xFF, 0x24, 0x20, 0xC3, 0x95, 0xA6, 0xF7, 0x9D, 0x4A, 0x45, 0x74, + 0x8B, 0x5D, 0x28, 0x8A, 0xC6, 0x99, 0x35, 0x68, 0x85, 0xA5, 0x64, 0x32, 0x80, 0x9F, 0xD3, 0x48, + 0x39, 0xA2, 0x1D, 0x24, 0x67, 0x69, 0xDF, 0x75, 0xAC, 0x12, 0xB5, 0xBD, 0xC3, 0x29, 0x90, 0xBE, + 0x37, 0xE4, 0xA0, 0x80, 0x9A, 0xBE, 0x36, 0xBF, 0x1F, 0x2C, 0xAB, 0x2B, 0xAD, 0xF5, 0x97, 0x32, + 0x9A, 0x42, 0x9D, 0x09, 0x8B, 0x08, 0xF0, 0x63, 0x47, 0xA3, 0xE9, 0x1B, 0x36, 0xD8, 0x2D, 0x8A, + 0xD7, 0xE1, 0x54, 0x11, 0x95, 0xE4, 0x45, 0x88, 0x69, 0x8A, 0x2B, 0x35, 0xCE, 0xD0, 0xA5, 0x0B, + 0xD5, 0x5D, 0xAC, 0xDB, 0xAF, 0x11, 0x4D, 0xCA, 0xB8, 0x1E, 0xE7, 0x01, 0x9E, 0xF4, 0x46, 0xA3, + 0x8A, 0x94, 0x6D, 0x76, 0xBD, 0x8A, 0xC8, 0x3B, 0xD2, 0x31, 0x58, 0x0C, 0x79, 0xA8, 0x26, 0xE9, + 0xD1, 0x79, 0x9C, 0xCB, 0xD4, 0x2B, 0x6A, 0x4F, 0xC6, 0xCC, 0xCF, 0x90, 0xA7, 0xB9, 0x98, 0x47, + 0xFD, 0xFA, 0x4C, 0x6C, 0x6F, 0x81, 0x87, 0x3B, 0xCA, 0xB8, 0x50, 0xF6, 0x3E, 0x39, 0x5D, 0x4D, + 0x97, 0x3F, 0x0F, 0x35, 0x39, 0x53, 0xFB, 0xFA, 0xCD, 0xAB, 0xA8, 0x7A, 0x62, 0x9A, 0x3F, 0xF2, + 0x09, 0x27, 0x96, 0x3F, 0x07, 0x9A, 0x91, 0xF7, 0x16, 0xBF, 0xC6, 0x3A, 0x82, 0x5A, 0x4B, 0xCF, + 0x49, 0x50, 0x95, 0x8C, 0x55, 0x80, 0x7E, 0x39, 0xB1, 0x48, 0x05, 0x1E, 0x21, 0xC7, 0x24, 0x4F + }; + modulus = package2_modulus_retail; + } else { + const uint8_t package2_modulus_dev[0x100] = { + 0xB3, 0x65, 0x54, 0xFB, 0x0A, 0xB0, 0x1E, 0x85, 0xA7, 0xF6, 0xCF, 0x91, 0x8E, 0xBA, 0x96, 0x99, + 0x0D, 0x8B, 0x91, 0x69, 0x2A, 0xEE, 0x01, 0x20, 0x4F, 0x34, 0x5C, 0x2C, 0x4F, 0x4E, 0x37, 0xC7, + 0xF1, 0x0B, 0xD4, 0xCD, 0xA1, 0x7F, 0x93, 0xF1, 0x33, 0x59, 0xCE, 0xB1, 0xE9, 0xDD, 0x26, 0xE6, + 0xF3, 0xBB, 0x77, 0x87, 0x46, 0x7A, 0xD6, 0x4E, 0x47, 0x4A, 0xD1, 0x41, 0xB7, 0x79, 0x4A, 0x38, + 0x06, 0x6E, 0xCF, 0x61, 0x8F, 0xCD, 0xC1, 0x40, 0x0B, 0xFA, 0x26, 0xDC, 0xC0, 0x34, 0x51, 0x83, + 0xD9, 0x3B, 0x11, 0x54, 0x3B, 0x96, 0x27, 0x32, 0x9A, 0x95, 0xBE, 0x1E, 0x68, 0x11, 0x50, 0xA0, + 0x6B, 0x10, 0xA8, 0x83, 0x8B, 0xF5, 0xFC, 0xBC, 0x90, 0x84, 0x7A, 0x5A, 0x5C, 0x43, 0x52, 0xE6, + 0xC8, 0x26, 0xE9, 0xFE, 0x06, 0xA0, 0x8B, 0x53, 0x0F, 0xAF, 0x1E, 0xC4, 0x1C, 0x0B, 0xCF, 0x50, + 0x1A, 0xA4, 0xF3, 0x5C, 0xFB, 0xF0, 0x97, 0xE4, 0xDE, 0x32, 0x0A, 0x9F, 0xE3, 0x5A, 0xAA, 0xB7, + 0x44, 0x7F, 0x5C, 0x33, 0x60, 0xB9, 0x0F, 0x22, 0x2D, 0x33, 0x2A, 0xE9, 0x69, 0x79, 0x31, 0x42, + 0x8F, 0xE4, 0x3A, 0x13, 0x8B, 0xE7, 0x26, 0xBD, 0x08, 0x87, 0x6C, 0xA6, 0xF2, 0x73, 0xF6, 0x8E, + 0xA7, 0xF2, 0xFE, 0xFB, 0x6C, 0x28, 0x66, 0x0D, 0xBD, 0xD7, 0xEB, 0x42, 0xA8, 0x78, 0xE6, 0xB8, + 0x6B, 0xAE, 0xC7, 0xA9, 0xE2, 0x40, 0x6E, 0x89, 0x20, 0x82, 0x25, 0x8E, 0x3C, 0x6A, 0x60, 0xD7, + 0xF3, 0x56, 0x8E, 0xEC, 0x8D, 0x51, 0x8A, 0x63, 0x3C, 0x04, 0x78, 0x23, 0x0E, 0x90, 0x0C, 0xB4, + 0xE7, 0x86, 0x3B, 0x4F, 0x8E, 0x13, 0x09, 0x47, 0x32, 0x0E, 0x04, 0xB8, 0x4D, 0x5B, 0xB0, 0x46, + 0x71, 0xB0, 0x5C, 0xF4, 0xAD, 0x63, 0x4F, 0xC5, 0xE2, 0xAC, 0x1E, 0xC4, 0x33, 0x96, 0x09, 0x7B + }; + modulus = package2_modulus_dev; + } + + /* This is normally only allowed on dev units, but we'll allow it anywhere. */ + if (bootconfig_is_package2_unsigned() == 0 && rsa_pss_verify(header->signature, 0x100, modulus, 0x100, header->encrypted_header, 0x100) == 0) { + panic(); + } +} + +int validate_package2_metadata(package2_meta_t *metadata) { + if (metadata->magic != MAGIC_PK21) { + return 0; + } + + /* TODO: Validate size, sections. */ + + return 1; +} + +/* Decrypts package2 header, and returns the master key revision required. */ +uint32_t decrypt_and_validate_header(package2_header_t *header) { + package2_meta_t metadata; + + if (bootconfig_is_package2_plaintext() == 0) { + uint32_t mkey_rev; + + /* Try to decrypt for all possible master keys. */ + for (mkey_rev = 0; i < MASTERKEY_REVISION_MAX; i++) { + package2_crypt_ctr(mkey_rev, &metadata, sizeof(package2_meta_t), &header->metadata, sizeof(package2_meta_t), header->metadata.ctr, sizeof(header->metadata.ctr)); + /* Copy the ctr (which stores information) into the decrypted metadata. */ + memcpy(metadata.ctr, header->metadata.ctr, sizeof(header->metadata.ctr)); + /* See if this is the correct key. */ + if (validate_package2_metadata(&metadata)) { + memcpy(&header->metadata, metadata, sizeof(package2_meta_t)); + break; + } + } + + /* Ensure we successfully decrypted the header. */ + panic(); + } + return 0; +} + /* This function is called during coldboot crt0, and validates a package2. */ /* This package2 is read into memory by a concurrent BPMP bootloader. */ void load_package2(void) { @@ -134,6 +237,25 @@ void load_package2(void) { } } - /* TODO: Parse/load Package2. */ + /* Load header from NX_BOOTLOADER-initialized DRAM. */ + package2_header_t header; + flush_dcache_range((uint8_t *)NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS, (uint8_t *)NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS + sizeof(header)); + memcpy(&header, NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS, sizeof(header)); + flush_dcache_range((uint8_t *)&header, (uint8_t *)&header + sizeof(header)); + + /* Perform signature checks. */ + verify_header_signature(&header); + + /* Decrypt header, get key revision required. */ + uint32_t package2_mkey_rev = decrypt_and_validate_header(&header); + + /* TODO: Load Package2 Sections. */ + + /* Synchronize with NX BOOTLOADER. */ + if (MAILBOX_NX_BOOTLOADER_SETUP_STATE == NX_BOOTLOADER_STATE_LOADED_PACKAGE2) { + while (MAILBOX_NX_BOOTLOADER_SETUP_STATE < NX_BOOTLOADER_STATE_FINISHED) { + wait(1); + } + } } \ No newline at end of file diff --git a/exosphere/package2.h b/exosphere/package2.h index 54c585c76..83ccd615b 100644 --- a/exosphere/package2.h +++ b/exosphere/package2.h @@ -17,7 +17,41 @@ /* Physaddr 0x40002EFC */ #define MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE (*((volatile uint32_t *)(0x1F009FEFCULL))) -#define NX_BOOTLOADER_BOOTCONFIG_POINTER ((void *)(0x4003D000ULL)); +#define NX_BOOTLOADER_BOOTCONFIG_POINTER ((void *)(0x4003D000ULL)) + +#define NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS ((void *)(0xA9800000ULL)) + + +#define MAGIC_PK21 (0x31324B50) + +#pragma pack(push, 1) +typedef struct { + union { + uint8_t ctr[0x10]; + uint32_t ctr_dwords[0x4]; + }; + uint8_t section_ctrs[4][0x10]; + uint32_t magic; + uint32_t base_offset; + uint32_t _0x58; + uint8_t version_max; /* Must be > TZ value. */ + uint8_t version_min; /* Must be < TZ value. */ + uint16_t _0x5E; + uint32_t section_sizes[4]; + uint32_t section_offsets[4]; + uint8_t section_hashes[4][0x20]; +} package2_meta_t; +#pragma pack(pop) + +#pragma pack(push, 1) +typedef struct { + uint8_t signature[0x100]; + union { + package2_meta_t metadata; + uint8_t encrypted_header[0x100]; + }; +} package2_header_t; +#pragma pack(pop) void load_package2(void); diff --git a/exosphere/se.h b/exosphere/se.h index a93e65863..339218068 100644 --- a/exosphere/se.h +++ b/exosphere/se.h @@ -6,6 +6,7 @@ /* Exosphere driver for the Tegra X1 security engine. */ +#define KEYSLOT_SWITCH_PACKAGE2KEY 0x8 #define KEYSLOT_SWITCH_TEMPKEY 0x9 #define KEYSLOT_SWITCH_SESSIONKEY 0xA #define KEYSLOT_SWITCH_RNGKEY 0xB