From 3548ebb1cf8038c0712279e9a7051ee61ec6807b Mon Sep 17 00:00:00 2001 From: jakcron Date: Mon, 18 Jan 2016 19:28:52 +0800 Subject: [PATCH] [makerom] Added dev common keys: 2,3,4,5 --- makerom/keyset.c | 2 +- makerom/pki/dev.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/makerom/keyset.c b/makerom/keyset.c index c17bf0c..85cc3f7 100644 --- a/makerom/keyset.c +++ b/makerom/keyset.c @@ -91,7 +91,7 @@ int LoadKeysFromResources(keys_struct *keys) keys->keysetLoaded = true; /* AES Keys */ // CIA - for(int i = 0; i < 2; i++) + for(int i = 0; i < 6; i++) SetCommonKey(keys, ctr_common_etd_key_dpki[i],i); if(keys->aes.currentCommonKey > 0xff) diff --git a/makerom/pki/dev.h b/makerom/pki/dev.h index 6e10735..1099a23 100644 --- a/makerom/pki/dev.h +++ b/makerom/pki/dev.h @@ -18,10 +18,14 @@ static const unsigned char dev_fixed_ncch_key[2][16] = {0x52, 0x7C, 0xE6, 0x30, 0xA9, 0xCA, 0x30, 0x5F, 0x36, 0x96, 0xF3, 0xCD, 0xE9, 0x54, 0x19, 0x4B} , // System FixedKey }; -static const unsigned char ctr_common_etd_key_dpki[2][16] = +static const unsigned char ctr_common_etd_key_dpki[6][16] = { {0x55, 0xA3, 0xF8, 0x72, 0xBD, 0xC8, 0x0C, 0x55, 0x5A, 0x65, 0x43, 0x81, 0x13, 0x9E, 0x15, 0x3B} , // 0 - eShop Titles {0x44, 0x34, 0xED, 0x14, 0x82, 0x0C, 0xA1, 0xEB, 0xAB, 0x82, 0xC1, 0x6E, 0x7B, 0xEF, 0x0C, 0x25} , // 1 - System Titles + {0xF6, 0x2E, 0x3F, 0x95, 0x8E, 0x28, 0xA2, 0x1F, 0x28, 0x9E, 0xEC, 0x71, 0xA8, 0x66, 0x29, 0xDC} , // 2 + {0x2B, 0x49, 0xCB, 0x6F, 0x99, 0x98, 0xD9, 0xAD, 0x94, 0xF2, 0xED, 0xE7, 0xB5, 0xDA, 0x3E, 0x27} , // 3 + {0x75, 0x05, 0x52, 0xBF, 0xAA, 0x1C, 0x04, 0x07, 0x55, 0xC8, 0xD5, 0x9A, 0x55, 0xF9, 0xAD, 0x1F} , // 4 + {0xAA, 0xDA, 0x4C, 0xA8, 0xF6, 0xE5, 0xA9, 0x77, 0xE0, 0xA0, 0xF9, 0xE4, 0x76, 0xCF, 0x0D, 0x63} , // 5 }; //RSA Keys