diff --git a/include/arm9/hardware/crypto.h b/include/arm9/hardware/crypto.h index ea99708..a873e6c 100644 --- a/include/arm9/hardware/crypto.h +++ b/include/arm9/hardware/crypto.h @@ -310,4 +310,14 @@ */ bool RSA_decrypt2048(void *const decSig, const void *const encSig); -//bool RSA_verify2048(const void *const encSig, const void *const data, u32 size); +/** + * @brief Verifies a RSA 2048 SHA 256 signature. + * + * @param[in] encSig Pointer to encrypted source signature. + * @param[in] data Pointer to the data to hash. + * @param[in] size The hash data size. + * @param[in] keyslot The RSA keyslot to use. Must be <4. + * + * @return Returns true if the signature is valid, false otherwise. + */ +bool RSA_verify2048(const u32 *const encSig, const u32 *const data, u32 size, u8 keyslot); diff --git a/source/arm9/hardware/crypto.c b/source/arm9/hardware/crypto.c index f32e2f8..2e29c8f 100644 --- a/source/arm9/hardware/crypto.c +++ b/source/arm9/hardware/crypto.c @@ -23,6 +23,7 @@ #include "arm9/hardware/crypto.h" #include "arm9/hardware/interrupt.h" #include "arm9/hardware/ndma.h" +#include "arm9/fmt.h" @@ -674,6 +675,34 @@ void RSA_init(void) { REG_RSA_UNK_F0 = 0; + + /*static const u8 firmRetailmod[256] = + { + 0xDE, 0xCF, 0xB6, 0xFC, 0x3D, 0x33, 0xE9, 0x55, 0xFD, 0xAC, 0x90, 0xE8, + 0x88, 0x17, 0xB0, 0x03, 0xA1, 0x6B, 0x9A, 0xAB, 0x72, 0x70, 0x79, 0x32, + 0xA2, 0xA0, 0x8C, 0xBB, 0x33, 0x6F, 0xB0, 0x76, 0x96, 0x2E, 0xC4, 0xE9, + 0x2E, 0xD8, 0x8F, 0x92, 0xC0, 0x2D, 0x4D, 0x41, 0x0F, 0xDE, 0x45, 0x1B, + 0x25, 0x3C, 0xBE, 0x37, 0x6B, 0x45, 0x82, 0x21, 0xE6, 0x4D, 0xB1, 0x23, + 0x81, 0x82, 0xB6, 0x81, 0x62, 0xB7, 0x30, 0xF4, 0x60, 0x4B, 0xC7, 0xF7, + 0xF0, 0x17, 0x0C, 0xB5, 0x75, 0x88, 0x77, 0x93, 0x52, 0x63, 0x70, 0xF0, + 0x0B, 0xC6, 0x73, 0x43, 0x41, 0xEE, 0xE4, 0xF0, 0x71, 0xEC, 0xC8, 0xC1, + 0x32, 0xC4, 0xDC, 0xA9, 0x99, 0x1D, 0x31, 0xB8, 0xA4, 0x7E, 0xDD, 0x19, + 0x04, 0x0F, 0x02, 0xA8, 0x1A, 0xAF, 0xB3, 0x48, 0x9A, 0x29, 0x29, 0x5E, + 0x49, 0x84, 0xE0, 0x94, 0x11, 0xD1, 0x7E, 0xAB, 0xB2, 0xC0, 0x44, 0x7E, + 0xA1, 0x1B, 0x5E, 0x9D, 0x0D, 0x1A, 0xF9, 0x02, 0x9A, 0x2E, 0x53, 0x03, + 0x2D, 0x48, 0x96, 0x7C, 0x2C, 0xA6, 0xD7, 0xAC, 0xF1, 0xED, 0x2B, 0x18, + 0xBB, 0x01, 0xCB, 0x13, 0xB9, 0xAC, 0xA6, 0xEE, 0x55, 0x00, 0x37, 0x7C, + 0x69, 0x61, 0x62, 0x89, 0x01, 0x54, 0x77, 0x9F, 0x07, 0x5D, 0x26, 0x34, + 0x3A, 0xA9, 0x49, 0xA5, 0xAF, 0xF2, 0x5E, 0x06, 0x51, 0xB7, 0x1C, 0xE0, + 0xDE, 0xDA, 0x5C, 0x0B, 0x9F, 0x98, 0xC2, 0x15, 0xFD, 0xBA, 0xD8, 0xA9, + 0x99, 0x00, 0xAB, 0xA4, 0x8E, 0x4A, 0x16, 0x9D, 0x66, 0x2A, 0xE8, 0x56, + 0x64, 0xB2, 0xB6, 0xC0, 0x93, 0xAF, 0x4D, 0x38, 0xA0, 0x16, 0x5C, 0xE4, + 0xBD, 0x62, 0xC2, 0x46, 0x6B, 0xC9, 0x5A, 0x59, 0x4A, 0x72, 0x58, 0xFD, + 0xB2, 0xCC, 0x36, 0x87, 0x30, 0x85, 0xE8, 0xA1, 0x04, 0x5B, 0xE0, 0x17, + 0x9B, 0xD0, 0xEC, 0x9B + }; + + RSA_setKey2048(2, firmRetailmod, 0x01000100u);*/ } static void rsaWaitBusy(void) @@ -733,6 +762,38 @@ return true; } -/*bool RSA_verify2048(const void *const encSig, const void *const data, u32 size) +bool RSA_verify2048(const u32 *const encSig, const u32 *const data, u32 size, u8 keyslot) { -}*/ + u8 decSig[0x100]; + RSA_selectKeyslot(keyslot); + if(!RSA_decrypt2048(decSig, encSig)) return false; + + if(decSig[0] != 0x00 || decSig[1] != 0x01) return false; + + u32 read = 2; + while(read < 0x100) + { + if(decSig[read] != 0xFF) break; + read++; + } + if(read != 0xCC || decSig[read] != 0x00) return false; + + // ASN.1 is a clusterfuck so we skip parsing the remaining headers + // and hardcode the hash location. + + alignas(4) u8 hash[32]; + sha(data, size, (u32*)hash, SHA_INPUT_BIG | SHA_MODE_256, SHA_OUTPUT_BIG); + + // Compare hash + u8 res = 0; + for(u32 i = 0; i < 32; i++) + { + u8 tmp; + if(decSig[0xE0 + i] == hash[i]) tmp = 0; + else tmp = 1; + + res |= tmp; + } + + return res == 0; +} diff --git a/source/arm9/hardware/hardware.c b/source/arm9/hardware/hardware.c index fc5e321..38ee3ec 100644 --- a/source/arm9/hardware/hardware.c +++ b/source/arm9/hardware/hardware.c @@ -32,6 +32,7 @@ TIMER_init(); PXI_init(); AES_init(); + RSA_init(); } void hardwareDeinit(void)