mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-05 19:51:45 +00:00
Code Issues Releases Activity

Refactor nxboot package2 reading, work around sdmmc issue, other changes

Browse source
This commit is contained in:
TuxSH 2018-05-17 23:18:33 +02:00
parent 9ed2f92cdc
commit ec6d05892c
5 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fusee/fusee-secondary/src/key_derivation.c
View file

@ -155,8 +155,7 @@ int derive_nx_keydata(uint32_t target_firmware, const nx_keyblob_t *keyblobs, ui
}
/* Setup master key revision, derive older master keys for use. */
mkey_detect_revision();
return 0;
return mkey_detect_revision();
}
/* Sets final keyslot flags, for handover to TZ/Exosphere. Setting these will prevent the BPMP from using the device key or master key. */

7
fusee/fusee-secondary/src/masterkey.c
View file

@ -43,7 +43,7 @@ bool check_mkey_revision(unsigned int revision) {
return true;
}
void mkey_detect_revision(void) {
int mkey_detect_revision(void) {
if (g_determined_mkey_revision) {
generic_panic();
}
@ -58,8 +58,9 @@ void mkey_detect_revision(void) {
/* We must have determined the master key, or we're not running on a Switch. */
if (!g_determined_mkey_revision) {
/* Panic in bright red. */
panic(0x00F00060);
return -1;
} else {
return 0;
}
}

2
fusee/fusee-secondary/src/masterkey.h
View file

@ -15,7 +15,7 @@
#define MASTERKEY_NUM_NEW_DEVICE_KEYS (MASTERKEY_REVISION_MAX - MASTERKEY_REVISION_400_410)
/* This should be called during initialization. */
void mkey_detect_revision(void);
int mkey_detect_revision(void);
unsigned int mkey_get_revision(void);

79
fusee/fusee-secondary/src/nxboot.c
View file

@ -34,7 +34,7 @@ static void nxboot_configure_exosphere(void) {
exosphere_config_t exo_cfg = {0};
exo_cfg.magic = MAGIC_EXOSPHERE_BOOTCONFIG;
exo_cfg.target_firmware = EXOSPHERE_TARGET_FIRMWARE_MAX;
exo_cfg.target_firmware = 0;
if (ini_parse_string(get_loader_ctx()->bct0, exosphere_ini_handler, &exo_cfg) < 0) {
printf("Error: Failed to parse BCT.ini!\n");
@ -82,7 +82,7 @@ void nxboot_main(void) {
package1_header_t *package1;
size_t package1_size;
uint32_t available_revision;
FILE *boot0;
FILE *boot0, *pk2file;
void *exosphere_memaddr;
/* TODO: How should we deal with bootconfig? */
@ -94,53 +94,55 @@ void nxboot_main(void) {
/* Read Package2 from a file, otherwise from its partition(s). */
if (loader_ctx->package2_path[0] != '\0') {
package2_size = get_file_size(loader_ctx->package2_path);
if (package2_size == 0) {
printf("Error: Could not read Package2 from %s!\n", loader_ctx->package2_path);
generic_panic();
} else if (package2_size > PACKAGE2_SIZE_MAX || package2_size <= sizeof(package2_header_t)) {
printf("Error: Package2 from %s is too big or too small!\n", loader_ctx->package2_path);
generic_panic();
}
if (read_from_file(package2, package2_size, loader_ctx->package2_path) != package2_size) {
printf("Error: Could not read Package2 from %s!\n", loader_ctx->package2_path);
generic_panic();
}
if (package2_meta_get_size(&package2->metadata) < package2_size) {
printf("Error: Package2 from %s is too small!\n", loader_ctx->package2_path);
pk2file = fopen(loader_ctx->package2_path, "rb");
if (pk2file == NULL) {
printf("Error: Failed to open Package2 from %s: %s!\n", loader_ctx->package2_path, strerror(errno));
generic_panic();
}
} else {
#ifdef I_KNOW_WHAT_IM_DOING_2
FILE *bcpkg21 = fopen("bcpkg21:/", "rb");
if (bcpkg21 == NULL || fseek(bcpkg21, 0x4000, SEEK_SET) != 0) {
printf("Error: Failed to read Package2 from NAND!\n");
pk2file = fopen("bcpkg21:/", "rb");
if (pk2file == NULL || fseek(pk2file, 0x4000, SEEK_SET) != 0) {
printf("Error: Failed to open Package2 from NAND: %s!\n", strerror(errno));
fclose(pk2file);
generic_panic();
}
if (fread(package2, sizeof(package2_header_t), 1, bcpkg21) < 1) {
printf("Error: Failed to read Package2 from NAND!\n");
generic_panic();
}
package2_size = package2_meta_get_size(&package2->metadata);
if (package2_size > PACKAGE2_SIZE_MAX || package2_size <= sizeof(package2_header_t)) {
printf("Error: Package2 from NAND is too big or too small!\n");
generic_panic();
}
if (fread(package2->data, package2_size - sizeof(package2_header_t), 1, bcpkg21) < 1) {
printf("Error: Failed to read Package2 from NAND!\n");
generic_panic();
}
fclose(bcpkg21);
#else
printf("Error: Package2 must be loaded from the SD card, unless you know what you are doing!\n");
generic_panic();
#endif
}
setvbuf(pk2file, NULL, _IONBF, 0); /* Workaround. */
if (fread(package2, sizeof(package2_header_t), 1, pk2file) < 1) {
printf("Error: Failed to read Package2!\n");
generic_panic();
}
package2_size = package2_meta_get_size(&package2->metadata);
if (package2_size > PACKAGE2_SIZE_MAX || package2_size <= sizeof(package2_header_t)) {
printf("Error: Package2 is too big or too small!\n");
generic_panic();
}
/*
if (fread(package2->data, package2_size - sizeof(package2_header_t), 1, pk2file) < 1) {
printf("Error: Failed to read Package2!\n");
generic_panic();
}
*/
for (size_t i = 0; i < package2_size - sizeof(package2_header_t); i += 512*32) {
/* TODO: check if we have read everything, eventually. */
size_t r = fread(package2->data + i, 1, 512, pk2file);
if (r == 0) {
printf("Error: Failed to read Package2!\n");
generic_panic();
} else if (r < 512) {
break;
}
}
fclose(pk2file);
printf("Read package2!\n");
/* Setup boot configuration for Exosphère. */
nxboot_configure_exosphere();
nxboot_adjust_exosphere_target_firmware(package2);
@ -150,6 +152,7 @@ void nxboot_main(void) {
generic_panic();
}
printf("Reading boot0...\n");
boot0 = fopen("boot0:/", "rb");
if (boot0 == NULL || package1_read_and_parse_boot0(&package1loader, &package1loader_size, g_keyblobs, &available_revision, boot0) == -1) {
printf("Error: Couldn't parse boot0: %s!\n", strerror(errno));
@ -229,8 +232,10 @@ void nxboot_main(void) {
}
}
printf("Rebuilding package2...\n");
/* Patch package2, adding Thermosphère + custom KIPs. */
package2_rebuild_and_copy(package2, MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware);
printf(u8"Loading Exosphère...\n");
/* Copy Exophère to a good location (or read it directly to it.) */
if (MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware <= EXOSPHERE_TARGET_FIRMWARE_400) {

6
fusee/fusee-secondary/src/utils.h
View file

@ -104,8 +104,8 @@ static inline bool check_32bit_address_range_in_program(uintptr_t addr, size_t s
void hexdump(const void* data, size_t size, uintptr_t addrbase);
void panic(uint32_t code);
void generic_panic(void);
void panic_predefined(uint32_t which);
__attribute__ ((noreturn)) void panic(uint32_t code);
__attribute__ ((noreturn)) void generic_panic(void);
__attribute__ ((noreturn)) void panic_predefined(uint32_t which);
#endif