mirror of
https://github.com/DarkStore-3DS/Project_CTR.git
synced 2026-07-02 16:59:03 +00:00
[makerom] Implemented support for secure crypto. Secure crypto is now default. Seeded keyY crypto not yet supported. Time for version 0.16!!!
This commit is contained in:
jakcron
@@ -45,14 +45,6 @@ void n128_add(const uint8_t *a, const uint8_t *b, uint8_t *out)
|
||||
carry = sum >> 8;
|
||||
out[i] = sum & 0xff;
|
||||
}
|
||||
|
||||
while (carry != 0) {
|
||||
for (int i = 15; i >= 0; i--) {
|
||||
sum = out[i] + carry;
|
||||
carry = sum >> 8;
|
||||
out[i] = sum & 0xff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* out = a - b
|
||||
@@ -77,25 +69,6 @@ void n128_sub(const uint8_t *a, const uint8_t *b, uint8_t *out)
|
||||
// set value
|
||||
out[i] = sum & 0xff;
|
||||
}
|
||||
|
||||
|
||||
while (carry != 0) {
|
||||
for (int i = 15; i >= 0; i--) {
|
||||
sum = out[i] - carry;
|
||||
|
||||
// check to see if anything was borrowed from next byte
|
||||
if (out[i] < carry) {
|
||||
sum += 0x100;
|
||||
carry = 1;
|
||||
}
|
||||
else {
|
||||
carry = 0;
|
||||
}
|
||||
|
||||
out[i] = sum & 0xff;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void n128_xor(const uint8_t *a, const uint8_t *b, uint8_t *out)
|
||||
|
||||
+28
-10
@@ -101,10 +101,10 @@ int LoadKeysFromResources(keys_struct *keys)
|
||||
SetNormalKey(keys, dev_fixed_ncch_key[0]);
|
||||
SetSystemFixedKey(keys, dev_fixed_ncch_key[1]);
|
||||
|
||||
/*
|
||||
for(int i = 0; i < 2; i++)
|
||||
|
||||
for(int i = 0; i < 4; i++)
|
||||
SetNcchKeyX(keys, dev_unfixed_ncch_keyX[i],i);
|
||||
*/
|
||||
|
||||
|
||||
/* RSA Keys */
|
||||
// CIA
|
||||
@@ -124,20 +124,19 @@ int LoadKeysFromResources(keys_struct *keys)
|
||||
keys->keysetLoaded = true;
|
||||
/* AES Keys */
|
||||
// CIA
|
||||
//for(int i = 0; i < 6; i++){
|
||||
// keys->aes.commonKey[i] = malloc(16);
|
||||
// ctr_aes_keygen(ctr_common_etd_keyX_ppki, ctr_common_etd_keyY_ppki[i], keys->aes.commonKey[i]);
|
||||
//}
|
||||
for (int i = 0; i < 6; i++)
|
||||
SetCommonKey(keys, ctr_common_etd_key_ppki[i], i);
|
||||
|
||||
if(keys->aes.currentCommonKey > 0xff)
|
||||
SetCurrentCommonKey(keys,0);
|
||||
|
||||
// NCCH
|
||||
keys->aes.normalKey = NULL;
|
||||
keys->aes.systemFixedKey = NULL;
|
||||
/*
|
||||
for(int i = 0; i < 2; i++)
|
||||
|
||||
for(int i = 0; i < 4; i++)
|
||||
SetNcchKeyX(keys, prod_unfixed_ncch_keyX[i],i);
|
||||
*/
|
||||
|
||||
|
||||
/* RSA Keys */
|
||||
// CIA
|
||||
@@ -200,6 +199,7 @@ void DumpKeyset(keys_struct *keys)
|
||||
{
|
||||
bool showNcchFixedKeys = (keys->aes.normalKey || keys->aes.systemFixedKey);
|
||||
bool showCommonKeys = false;
|
||||
bool showNcchKeyXs = false;
|
||||
for(int i = 0; i < 256; i++){
|
||||
if(keys->aes.commonKey[i]){
|
||||
showCommonKeys = true;
|
||||
@@ -207,6 +207,13 @@ void DumpKeyset(keys_struct *keys)
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 256; i++) {
|
||||
if (keys->aes.ncchKeyX[i]) {
|
||||
showNcchKeyXs = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
printf("[*] Keyset\n");
|
||||
|
||||
if(showCommonKeys){
|
||||
@@ -218,6 +225,17 @@ void DumpKeyset(keys_struct *keys)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (showNcchKeyXs) {
|
||||
printf(" > Unfixed NCCH KeyXs\n");
|
||||
for (int i = 0; i < 256; i++) {
|
||||
if (keys->aes.ncchKeyX[i]) {
|
||||
printf(" [0x%02x] ", i);
|
||||
memdump(stdout, "", keys->aes.ncchKeyX[i], 16);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(showNcchFixedKeys){
|
||||
printf(" > Fixed NCCH Keys\n");
|
||||
if(keys->aes.normalKey)
|
||||
|
||||
+31
-15
@@ -1024,33 +1024,49 @@ bool IsNcchEncrypted(ncch_hdr *hdr)
|
||||
|
||||
bool SetNcchKeys(keys_struct *keys, ncch_hdr *hdr)
|
||||
{
|
||||
if(!IsNcchEncrypted(hdr))
|
||||
if (!IsNcchEncrypted(hdr))
|
||||
return true;
|
||||
|
||||
if((hdr->flags[ncchflag_OTHER_FLAG] & otherflag_FixedCryptoKey) == otherflag_FixedCryptoKey){
|
||||
if((hdr->programId[4] & 0x10) == 0x10){
|
||||
if(!keys->aes.systemFixedKey)
|
||||
|
||||
if ((hdr->flags[ncchflag_OTHER_FLAG] & otherflag_FixedCryptoKey) == otherflag_FixedCryptoKey) {
|
||||
if ((hdr->programId[4] & 0x10) == 0x10) {
|
||||
if (!keys->aes.systemFixedKey)
|
||||
return false;
|
||||
memcpy(keys->aes.ncchKey0,keys->aes.systemFixedKey,AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey1,keys->aes.systemFixedKey,AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey0, keys->aes.systemFixedKey, AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey1, keys->aes.systemFixedKey, AES_128_KEY_SIZE);
|
||||
return true;
|
||||
}
|
||||
else{
|
||||
if(!keys->aes.normalKey)
|
||||
else {
|
||||
if (!keys->aes.normalKey)
|
||||
return false;
|
||||
memcpy(keys->aes.ncchKey0,keys->aes.normalKey,AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey1,keys->aes.normalKey,AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey0, keys->aes.normalKey, AES_128_KEY_SIZE);
|
||||
memcpy(keys->aes.ncchKey1, keys->aes.normalKey, AES_128_KEY_SIZE);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
u8 ncch_keyx_index = 0;
|
||||
switch (hdr->flags[ncchflag_CONTENT_KEYX])
|
||||
{
|
||||
case (keyx_7_0):
|
||||
ncch_keyx_index = 1;
|
||||
break;
|
||||
case (keyx_9_3):
|
||||
ncch_keyx_index = 2;
|
||||
break;
|
||||
case (keyx_9_6):
|
||||
ncch_keyx_index = 3;
|
||||
break;
|
||||
default:
|
||||
ncch_keyx_index = 0;
|
||||
}
|
||||
|
||||
if(keys->aes.ncchKeyX[0])
|
||||
ctr_aes_keygen(keys->aes.ncchKeyX[0],hdr->signature,keys->aes.ncchKey0);
|
||||
else
|
||||
return false;
|
||||
|
||||
if(keys->aes.ncchKeyX[hdr->flags[ncchflag_CONTENT_KEYX]])
|
||||
ctr_aes_keygen(keys->aes.ncchKeyX[ncchflag_CONTENT_KEYX], hdr->signature, keys->aes.ncchKey0);
|
||||
|
||||
if(keys->aes.ncchKeyX[ncch_keyx_index])
|
||||
ctr_aes_keygen(keys->aes.ncchKeyX[ncch_keyx_index], hdr->signature, keys->aes.ncchKey0);
|
||||
else
|
||||
return false;
|
||||
|
||||
|
||||
@@ -72,6 +72,14 @@ typedef enum
|
||||
platform_SNAKE = 0x2
|
||||
} ncch_platform;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
keyx_regular = 0x00,
|
||||
keyx_7_0 = 0x01,
|
||||
keyx_9_3 = 0x0A,
|
||||
keyx_9_6 = 0x0B,
|
||||
} ncch_keyx_id;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u16 formatVersion;
|
||||
|
||||
+13
-11
@@ -6,26 +6,28 @@
|
||||
#endif
|
||||
|
||||
// AES KEYS
|
||||
static const unsigned char dev_unfixed_ncch_keyX[2][16] = // Dummy
|
||||
static const unsigned char dev_unfixed_ncch_keyX[4][16] =
|
||||
{
|
||||
{0x82, 0xAD, 0xED, 0xC7, 0xBA, 0x0A, 0x3F, 0x3D, 0x5F, 0xDD, 0x30, 0x0F, 0x0E, 0x9B, 0xE1, 0x5B} , // Normal
|
||||
{0xE5, 0x70, 0x6F, 0x65, 0x6A, 0xF4, 0xD9, 0x3F, 0x1E, 0x2F, 0x29, 0x3F, 0x16, 0x15, 0x4E, 0xD8} , // 7.X new Crypto
|
||||
{ 0x51, 0x02, 0x07, 0x51, 0x55, 0x07, 0xcb, 0xb1, 0x8e, 0x24, 0x3d, 0xcb, 0x85, 0xe2, 0x3a, 0x1d }, // Regular
|
||||
{ 0x81, 0x90, 0x7a, 0x4b, 0x6f, 0x1b, 0x47, 0x32, 0x3a, 0x67, 0x79, 0x74, 0xce, 0x4a, 0xd7, 0x1b }, // >=7.0
|
||||
{ 0x30, 0x4b, 0xf1, 0x46, 0x83, 0x72, 0xee, 0x64, 0x11, 0x5e, 0xbd, 0x40, 0x93, 0xd8, 0x42, 0x76 }, // >=9.3 (New3DS)
|
||||
{ 0x6c, 0x8b, 0x29, 0x44, 0xa0, 0x72, 0x60, 0x35, 0xf9, 0x41, 0xdf, 0xc0, 0x18, 0x52, 0x4f, 0xb6 } // >=9.6 (New3DS)
|
||||
};
|
||||
|
||||
static const unsigned char dev_fixed_ncch_key[2][16] =
|
||||
{
|
||||
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} , // Normal FixedKey
|
||||
{0x52, 0x7C, 0xE6, 0x30, 0xA9, 0xCA, 0x30, 0x5F, 0x36, 0x96, 0xF3, 0xCD, 0xE9, 0x54, 0x19, 0x4B} , // System FixedKey
|
||||
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // Normal FixedKey
|
||||
{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[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
|
||||
{ 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 },
|
||||
{ 0x2B, 0x49, 0xCB, 0x6F, 0x99, 0x98, 0xD9, 0xAD, 0x94, 0xF2, 0xED, 0xE7, 0xB5, 0xDA, 0x3E, 0x27 },
|
||||
{ 0x75, 0x05, 0x52, 0xBF, 0xAA, 0x1C, 0x04, 0x07, 0x55, 0xC8, 0xD5, 0x9A, 0x55, 0xF9, 0xAD, 0x1F },
|
||||
{ 0xAA, 0xDA, 0x4C, 0xA8, 0xF6, 0xE5, 0xA9, 0x77, 0xE0, 0xA0, 0xF9, 0xE4, 0x76, 0xCF, 0x0D, 0x63 }
|
||||
};
|
||||
|
||||
//RSA Keys
|
||||
|
||||
+12
-15
@@ -5,25 +5,22 @@
|
||||
#endif
|
||||
|
||||
// AES KEYS
|
||||
static const unsigned char prod_unfixed_ncch_keyX[2][16] = // Dummy
|
||||
static const unsigned char prod_unfixed_ncch_keyX[4][16] =
|
||||
{
|
||||
{0x81, 0x50, 0xA9, 0x78, 0x53, 0x3B, 0xA5, 0xE9, 0xA5, 0x0A, 0x23, 0x16, 0xB9, 0x3A, 0xED, 0x5A} , // Normal
|
||||
{0xB4, 0xD1, 0xCF, 0x58, 0x49, 0xCE, 0x8A, 0x2D, 0x71, 0x58, 0xF6, 0x66, 0x77, 0x5D, 0x16, 0x3D} , // 7.X new Crypto
|
||||
{ 0xb9, 0x8e, 0x95, 0xce, 0xca, 0x3e, 0x4d, 0x17, 0x1f, 0x76, 0xa9, 0x4d, 0xe9, 0x34, 0xc0, 0x53 }, // Regular
|
||||
{ 0xce, 0xe7, 0xd8, 0xab, 0x30, 0xc0, 0x0d, 0xae, 0x85, 0x0e, 0xf5, 0xe3, 0x82, 0xac, 0x5a, 0xf3 }, // >=7.0
|
||||
{ 0x82, 0xe9, 0xc9, 0xbe, 0xbf, 0xb8, 0xbd, 0xb8, 0x75, 0xec, 0xc0, 0xa0, 0x7d, 0x47, 0x43, 0x74 }, // >=9.3 (New3DS)
|
||||
{ 0x45, 0xad, 0x04, 0x95, 0x39, 0x92, 0xc7, 0xc8, 0x93, 0x72, 0x4a, 0x9a, 0x7b, 0xce, 0x61, 0x82 } // >=9.6 (New3DS)
|
||||
};
|
||||
|
||||
static const unsigned char ctr_common_etd_keyX_ppki[16] = // Dummy
|
||||
static const unsigned char ctr_common_etd_key_ppki[6][16] =
|
||||
{
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
static const unsigned char ctr_common_etd_keyY_ppki[6][16] =
|
||||
{
|
||||
{0xD0, 0x7B, 0x33, 0x7F, 0x9C, 0xA4, 0x38, 0x59, 0x32, 0xA2, 0xE2, 0x57, 0x23, 0x23, 0x2E, 0xB9} , // 0 - eShop Titles
|
||||
{0x0C, 0x76, 0x72, 0x30, 0xF0, 0x99, 0x8F, 0x1C, 0x46, 0x82, 0x82, 0x02, 0xFA, 0xAC, 0xBE, 0x4C} , // 1 - System Titles
|
||||
{0xC4, 0x75, 0xCB, 0x3A, 0xB8, 0xC7, 0x88, 0xBB, 0x57, 0x5E, 0x12, 0xA1, 0x09, 0x07, 0xB8, 0xA4} , // 2
|
||||
{0xE4, 0x86, 0xEE, 0xE3, 0xD0, 0xC0, 0x9C, 0x90, 0x2F, 0x66, 0x86, 0xD4, 0xC0, 0x6F, 0x64, 0x9F} , // 3
|
||||
{0xED, 0x31, 0xBA, 0x9C, 0x04, 0xB0, 0x67, 0x50, 0x6C, 0x44, 0x97, 0xA3, 0x5B, 0x78, 0x04, 0xFC} , // 4
|
||||
{0x5E, 0x66, 0x99, 0x8A, 0xB4, 0xE8, 0x93, 0x16, 0x06, 0x85, 0x0F, 0xD7, 0xA1, 0x6D, 0xD7, 0x55} , // 5
|
||||
{ 0x64, 0xC5, 0xFD, 0x55, 0xDD, 0x3A, 0xD9, 0x88, 0x32, 0x5B, 0xAA, 0xEC, 0x52, 0x43, 0xDB, 0x98 } , // 0 - eShop Titles
|
||||
{ 0x4A, 0xAA, 0x3D, 0x0E, 0x27, 0xD4, 0xD7, 0x28, 0xD0, 0xB1, 0xB4, 0x33, 0xF0, 0xF9, 0xCB, 0xC8 } , // 1 - System Titles
|
||||
{ 0xFB, 0xB0, 0xEF, 0x8C, 0xDB, 0xB0, 0xD8, 0xE4, 0x53, 0xCD, 0x99, 0x34, 0x43, 0x71, 0x69, 0x7F } , // 2
|
||||
{ 0x25, 0x95, 0x9B, 0x7A, 0xD0, 0x40, 0x9F, 0x72, 0x68, 0x41, 0x98, 0xBA, 0x2E, 0xCD, 0x7D, 0xC6 } , // 3
|
||||
{ 0x7A, 0xDA, 0x22, 0xCA, 0xFF, 0xC4, 0x76, 0xCC, 0x82, 0x97, 0xA0, 0xC7, 0xCE, 0xEE, 0xEE, 0xBE } , // 4
|
||||
{ 0xA5, 0x05, 0x1C, 0xA1, 0xB3, 0x7D, 0xCF, 0x3A, 0xFB, 0xCF, 0x8C, 0xC1, 0xED, 0xD9, 0xCE, 0x02 } , // 5
|
||||
};
|
||||
|
||||
// RSA KEYS
|
||||
|
||||
@@ -87,7 +87,7 @@ void SetDefaults(user_settings *set)
|
||||
set->common.keys.accessDescSign.presetType = desc_NotSpecified;
|
||||
|
||||
// Build NCCH Info
|
||||
set->ncch.useSecCrypto = false;
|
||||
set->ncch.useSecCrypto = true;
|
||||
set->ncch.buildNcch0 = true;
|
||||
set->ncch.includeExefsLogo = false;
|
||||
set->common.outFormat = NCCH;
|
||||
@@ -900,7 +900,7 @@ void PrintNoNeedParam(char *arg)
|
||||
|
||||
void DisplayBanner(void)
|
||||
{
|
||||
printf("CTR MAKEROM v0.15 (C) 3DSGuy 2014\n");
|
||||
printf("CTR MAKEROM v0.16 (C) 3DSGuy 2017\n");
|
||||
printf("Built: %s %s\n\n", __TIME__, __DATE__);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user