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

Merge pull request #117 from 3DSGuy/ctrtool-cci-initialdata-fix

Browse Source 
Fix bug where CCI CryptoType 1-2 weren't processed properly.
This commit is contained in:
Jack
2022-04-12 03:31:58 +08:00
committed by GitHub
parent 8876f0efd4 5c584f4d36
commit 5840526951
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/deps/libnintendo-n3ds/include/ntd/n3ds/cci.h
+3 -1
View File
@@ -167,7 +167,9 @@ struct CciHeader
enum CryptoType enum CryptoType
{ {
CryptoType_Secure = 0, // Secure initial data key (keyX bootrom, keyY initial data seed) (used in production ROMs) CryptoType_Secure0 = 0, // Secure initial data key (keyX bootrom, keyY initial data seed) (used in production ROMs)
CryptoType_Secure1 = 1, // Secure initial data key (keyX bootrom, keyY initial data seed) (used in production ROMs)
CryptoType_Secure2 = 2, // Secure initial data key (keyX bootrom, keyY initial data seed) (used in production ROMs)
CryptoType_FixedKey = 3, // Zeros initial data key (used in non-HSM enviroments like development) CryptoType_FixedKey = 3, // Zeros initial data key (used in non-HSM enviroments like development)
}; };
ctrtool/src/CciProcess.cpp
+12 -4
View File
@@ -171,8 +171,10 @@ void ctrtool::CciProcess::importHeader()
ctrtool::KeyBag::Aes128Key initial_data_key; ctrtool::KeyBag::Aes128Key initial_data_key;
bool initial_data_key_available = false; bool initial_data_key_available = false;
// crypto_type 0 is the normal "secure" initial data key // crypto_type 0-2 is the normal "secure" initial data key
if (mHeader.card_info.flag.crypto_type == ntd::n3ds::CciHeader::CryptoType_Secure) if (mHeader.card_info.flag.crypto_type == ntd::n3ds::CciHeader::CryptoType_Secure0 ||
mHeader.card_info.flag.crypto_type == ntd::n3ds::CciHeader::CryptoType_Secure1 ||
mHeader.card_info.flag.crypto_type == ntd::n3ds::CciHeader::CryptoType_Secure2)
{ {
if (mKeyBag.brom_static_key_x.find(mKeyBag.KEYSLOT_INITIAL_DATA) != mKeyBag.brom_static_key_x.end()) if (mKeyBag.brom_static_key_x.find(mKeyBag.KEYSLOT_INITIAL_DATA) != mKeyBag.brom_static_key_x.end())
{ {
@@ -530,8 +532,14 @@ std::string ctrtool::CciProcess::getCryptoTypeString(byte_t crypto_type)
switch(crypto_type) switch(crypto_type)
{ {
case ntd::n3ds::CciHeader::CryptoType_Secure : case ntd::n3ds::CciHeader::CryptoType_Secure0 :
ret_str = "Secure"; ret_str = "Secure0";
break;
case ntd::n3ds::CciHeader::CryptoType_Secure1 :
ret_str = "Secure1";
break;
case ntd::n3ds::CciHeader::CryptoType_Secure2 :
ret_str = "Secure2";
break; break;
case ntd::n3ds::CciHeader::CryptoType_FixedKey : case ntd::n3ds::CciHeader::CryptoType_FixedKey :
ret_str = "FixedKey"; ret_str = "FixedKey";
ctrtool/src/version.h
+1 -1
View File
@@ -3,5 +3,5 @@
#define BIN_NAME "ctrtool" #define BIN_NAME "ctrtool"
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 0 #define VER_MINOR 0
#define VER_PATCH 3 #define VER_PATCH 4
#define AUTHORS "jakcron" #define AUTHORS "jakcron"