mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-09-19 23:38:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

package2 verification and ini1 merging fixes (#125)

Browse source 
* fusee: Incremet offset while reading kip1s

* fusee: Pass package2 section data along with the decrypted metadata
This commit is contained in:
Max K 2018-06-04 23:04:44 +02:00 committed by SciresM
parent ec164b8606
commit 6b7da2887f
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fusee/fusee-secondary/Makefile
View file

@ -108,7 +108,7 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
.PHONY: $(BUILD) clean all .PHONY: $(BUILD) clean all
.PHONY: check_exosphere check_thermosphere check_exosphere .PHONY: check_exosphere check_thermosphere check_stratosphere
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(BUILD) all: $(BUILD)

9
fusee/fusee-secondary/src/package2.c
View file

@ -98,8 +98,7 @@ static void package2_crypt_ctr(unsigned int master_key_rev, void *dst, size_t ds
se_aes_ctr_crypt(KEYSLOT_SWITCH_PACKAGE2KEY, dst, dst_size, src, src_size, ctr, ctr_size); se_aes_ctr_crypt(KEYSLOT_SWITCH_PACKAGE2KEY, dst, dst_size, src, src_size, ctr, ctr_size);
} }
static bool package2_validate_metadata(package2_meta_t *metadata) { static bool package2_validate_metadata(package2_meta_t *metadata, uint8_t data[]) {
package2_header_t *package2 = (package2_header_t *)((uint8_t *)metadata - offsetof(package2_header_t, metadata));
if (metadata->magic != MAGIC_PK21) { if (metadata->magic != MAGIC_PK21) {
return false; return false;
} }
@ -160,7 +159,7 @@ static bool package2_validate_metadata(package2_meta_t *metadata) {
/* Validate section hashes. */ /* Validate section hashes. */
if (metadata->section_sizes[section]) { if (metadata->section_sizes[section]) {
void *section_data = package2->data + cur_section_offset; void *section_data = data + cur_section_offset;
uint8_t calculated_hash[0x20]; uint8_t calculated_hash[0x20];
se_calculate_sha256(calculated_hash, section_data, metadata->section_sizes[section]); se_calculate_sha256(calculated_hash, section_data, metadata->section_sizes[section]);
if (memcmp(calculated_hash, metadata->section_hashes[section], sizeof(metadata->section_hashes[section])) != 0) { if (memcmp(calculated_hash, metadata->section_hashes[section], sizeof(metadata->section_hashes[section])) != 0) {
@ -199,7 +198,7 @@ static uint32_t package2_decrypt_and_validate_header(package2_header_t *header,
/* Copy the ctr (which stores information) into the decrypted metadata. */ /* Copy the ctr (which stores information) into the decrypted metadata. */
memcpy(metadata.ctr, header->metadata.ctr, sizeof(header->metadata.ctr)); memcpy(metadata.ctr, header->metadata.ctr, sizeof(header->metadata.ctr));
/* See if this is the correct key. */ /* See if this is the correct key. */
if (package2_validate_metadata(&metadata)) { if (package2_validate_metadata(&metadata, header->data)) {
header->metadata = metadata; header->metadata = metadata;
return mkey_rev; return mkey_rev;
} }
@ -209,7 +208,7 @@ static uint32_t package2_decrypt_and_validate_header(package2_header_t *header,
if (mkey_rev > mkey_get_revision()) { if (mkey_rev > mkey_get_revision()) {
fatal_error("failed to decrypt the Package2 header (master key revision %u)!\n", mkey_get_revision()); fatal_error("failed to decrypt the Package2 header (master key revision %u)!\n", mkey_get_revision());
} }
} else if (!package2_validate_metadata(&header->metadata)) { } else if (!package2_validate_metadata(&header->metadata, header->data)) {
fatal_error("Failed to validate the Package2 header!\n"); fatal_error("Failed to validate the Package2 header!\n");
} }
return 0; return 0;

2
fusee/fusee-secondary/src/stratosphere.c
View file

@ -120,6 +120,8 @@ ini1_header_t *stratosphere_merge_inis(ini1_header_t **inis, size_t num_inis) {
fatal_error("INI1s[%zu][%zu] appears not to be a KIP1!\n", i, p); fatal_error("INI1s[%zu][%zu] appears not to be a KIP1!\n", i, p);
} }
offset += kip1_get_size_from_header(current_kip);
bool already_loaded = false; bool already_loaded = false;
for (uint32_t j = 0; j < merged->num_processes; j++) { for (uint32_t j = 0; j < merged->num_processes; j++) {
if (process_list[j] == current_kip->title_id) { if (process_list[j] == current_kip->title_id) {