DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-05 00:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[makerom] Implemented support for secure crypto. Secure crypto is now default. Seeded keyY crypto not yet supported. Time for version 0.16!!!

Browse Source
This commit is contained in:
jakcron
2017-05-25 13:50:03 +08:00
parent 183d95bffa
commit 4f875b0d0b
7 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/keyset.c
+28 -10
View File
@@ -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)