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

Fix bug where CCI CryptoType 1-2 weren't processed properly.
3DSGuy · Apr 11, 2022 · 5840526 · 5840526
2 parents 8876f0e + 5c584f4
commit 5840526
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/ctrtool/deps/libnintendo-n3ds/include/ntd/n3ds/cci.h b/ctrtool/deps/libnintendo-n3ds/include/ntd/n3ds/cci.h
@@ -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)
 	};
 

diff --git a/ctrtool/src/CciProcess.cpp b/ctrtool/src/CciProcess.cpp
@@ -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";

diff --git a/ctrtool/src/version.h b/ctrtool/src/version.h
@@ -3,5 +3,5 @@
 #define BIN_NAME	"ctrtool"
 #define VER_MAJOR	1
 #define VER_MINOR	0
-#define VER_PATCH	3
+#define VER_PATCH	4
 #define AUTHORS		"jakcron"