diff --git a/arm9/Makefile b/arm9/Makefile index f202795..19e8757 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -19,7 +19,7 @@ #TARGET := $(notdir $(CURDIR)) BUILD := build SOURCES := ../source ../source/hardware ../source/arm9 ../source/arm9/hardware ../thirdparty/fatfs -DATA := data +DATA := INCLUDES := ../include ../thirdparty DEFINES := -DARM9 -D_3DS -DVERS_STRING=\"$(VERS_STRING)\" \ -DVERS_MAJOR=$(VERS_MAJOR) -DVERS_MINOR=$(VERS_MINOR) diff --git a/arm9/data/fastboot3DS_pubkey.bin b/arm9/data/fastboot3DS_pubkey.bin deleted file mode 100644 index 4b705b9..0000000 --- a/arm9/data/fastboot3DS_pubkey.bin +++ /dev/null Binary files differ diff --git a/source/arm9/firmwriter.c b/source/arm9/firmwriter.c index d012f68..992b742 100644 --- a/source/arm9/firmwriter.c +++ b/source/arm9/firmwriter.c @@ -27,10 +27,9 @@ #include "arm9/hardware/cfg9.h" #include "util.h" #include "arm9/hardware/crypto.h" -#include "fastboot3DS_pubkey_bin.h" -const u8 sighaxNandSigs[2][256] = +alignas(4) static const u8 sighaxNandSigs[2][256] = { { // Sighax NAND retail signature. @@ -74,6 +73,27 @@ } }; +alignas(4) static const u8 fastboot3DS_pubkey[256] = +{ + // RSA2048 public key for fastboot3DS updates + 0xDF, 0x0F, 0xF0, 0xC3, 0xFD, 0x77, 0xE9, 0x41, 0x05, 0x8E, 0xC1, 0xD6, 0x21, 0xF1, 0x45, 0x5C, + 0x30, 0xD5, 0x95, 0x26, 0xB4, 0x74, 0xF3, 0x59, 0x40, 0xC4, 0x8C, 0x1E, 0x53, 0x0E, 0xE7, 0xE1, + 0x3E, 0x89, 0x0E, 0xB5, 0x5F, 0x9E, 0x75, 0x5E, 0xFB, 0xA6, 0x17, 0x34, 0x77, 0x6B, 0x1E, 0xF1, + 0x6E, 0x2C, 0x3F, 0xB4, 0x2A, 0x26, 0x8C, 0x0D, 0x4A, 0x72, 0xD8, 0x6D, 0xBF, 0x4D, 0xA3, 0x34, + 0x46, 0x72, 0x15, 0xF8, 0xA3, 0x0F, 0xB5, 0x71, 0x63, 0xE1, 0x6F, 0xFD, 0xB7, 0x3A, 0xF5, 0xFD, + 0xC9, 0x97, 0xF5, 0x0B, 0xD5, 0x69, 0xE8, 0xE4, 0x61, 0xD9, 0x1D, 0xD8, 0x8B, 0x78, 0xF2, 0x14, + 0x21, 0x14, 0x4D, 0x63, 0x5D, 0x3A, 0x32, 0x22, 0x18, 0xEF, 0xEC, 0x42, 0x0F, 0x95, 0x50, 0x41, + 0xE9, 0x56, 0xD9, 0xA9, 0xD9, 0xE3, 0x78, 0x17, 0xDE, 0xF4, 0x26, 0x8E, 0xEC, 0x80, 0x2A, 0xEA, + 0xE9, 0x5D, 0x3A, 0xC7, 0x45, 0x4B, 0xEE, 0xF3, 0x20, 0x93, 0x5B, 0x36, 0xB3, 0x3A, 0x14, 0x37, + 0x13, 0xBA, 0xFD, 0xCE, 0x4D, 0x40, 0x2C, 0xBC, 0xDD, 0xDE, 0xD9, 0xC3, 0x85, 0xAF, 0xCB, 0x6F, + 0x99, 0xD7, 0x7A, 0xC3, 0xEE, 0x60, 0xBF, 0x44, 0x61, 0x4F, 0x09, 0x84, 0xDE, 0x69, 0xA8, 0xA4, + 0x81, 0xD7, 0x52, 0xAB, 0xC1, 0x8C, 0xF5, 0xA4, 0x85, 0x43, 0x98, 0x5B, 0xD0, 0xDB, 0x8B, 0x94, + 0x35, 0x54, 0xE1, 0xC3, 0x33, 0x01, 0xE8, 0x7E, 0x18, 0xF7, 0x13, 0xA2, 0x15, 0x25, 0x7C, 0xE6, + 0x60, 0x0B, 0x07, 0xE3, 0x02, 0x53, 0x9D, 0x10, 0x6F, 0xF0, 0xAF, 0xB8, 0xB4, 0x79, 0xB4, 0x58, + 0x03, 0xA2, 0x55, 0xC8, 0x02, 0x0E, 0x95, 0x24, 0xF8, 0xFC, 0x15, 0x9A, 0xE7, 0xD0, 0x23, 0x03, + 0xD4, 0xC8, 0x59, 0x8E, 0x37, 0x60, 0xC6, 0xFE, 0xE6, 0xE2, 0xC5, 0xDD, 0xDF, 0x2C, 0x9C, 0x8F +}; + s32 writeFirmPartition(const char *const part, bool replaceSig) @@ -129,7 +149,7 @@ u32 *updateBuffer = (u32*)FIRM_LOAD_ADDR; #ifdef NDEBUG // Verify signature - if(!RSA_setKey2048(3, fastboot3DS_pubkey_bin, 0x01000100) || + if(!RSA_setKey2048(3, (u32*)fastboot3DS_pubkey, 0x01000100) || !RSA_verify2048(updateBuffer + 0x40, updateBuffer, 0x100)) return UPDATE_ERR_INVALID_SIG; #endif