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

Add support for processing InitialData CryptoTypes 1-2

Browse Source
This commit is contained in:
jakcron
2022-04-11 18:01:05 +08:00
parent 8876f0efd4
commit a1f86a6813
2 changed files with 15 additions and 5 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
{
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)
};
ctrtool/src/CciProcess.cpp
+12 -4
View File
@@ -171,8 +171,10 @@ void ctrtool::CciProcess::importHeader()
ctrtool::KeyBag::Aes128Key initial_data_key;
bool initial_data_key_available = false;
// crypto_type 0 is the normal "secure" initial data key
if (mHeader.card_info.flag.crypto_type == ntd::n3ds::CciHeader::CryptoType_Secure)
// crypto_type 0-2 is the normal "secure" initial data key
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())
{
@@ -530,8 +532,14 @@ std::string ctrtool::CciProcess::getCryptoTypeString(byte_t crypto_type)
switch(crypto_type)
{
case ntd::n3ds::CciHeader::CryptoType_Secure :
ret_str = "Secure";
case ntd::n3ds::CciHeader::CryptoType_Secure0 :
ret_str = "Secure0";
break;
case ntd::n3ds::CciHeader::CryptoType_Secure1 :
ret_str = "Secure1";
break;
case ntd::n3ds::CciHeader::CryptoType_Secure2 :
ret_str = "Secure2";
break;
case ntd::n3ds::CciHeader::CryptoType_FixedKey :
ret_str = "FixedKey";