fix auto encryption bug

dnasdw · Jun 20, 2017 · 7c811cc · 7c811cc
1 parent c885c2c
commit 7c811cc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ if(APPLE)
 endif()
 set(_3DSTOOL_MAJOR 1)
 set(_3DSTOOL_MINOR 0)
-set(_3DSTOOL_PATCHLEVEL 25)
+set(_3DSTOOL_PATCHLEVEL 26)
 if(NOT MSVC_IDE AND NOT XCODE_VERSION AND NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()

diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ An all-in-one tool for extracting/creating 3ds roms.
 - v1.0.23 @ 2017.05.09 - Fix runtime error
 - v1.0.24 @ 2017.05.21 - Support auto encryption
 - v1.0.25 @ 2017.06.18 - Fix auto encryption bug and add download
+- v1.0.26 @ 2017.06.20 - Fix auto encryption bug
 
 ## Platforms
 

diff --git a/bin/ext_key.txt b/bin/ext_key.txt
@@ -1133,6 +1133,7 @@
 00040000001BCF00 7B2BA41A027B35691C3453B8CA7C6E00
 00040000001BD000 47D2D7F09A0E51E1AAC9745354AE4361
 00040000001BD100 677AB1AF282C4A3FC86017D64682AD7D
+00040000001BD400 EE6709A1A5A81B589D4577A8973C5876
 00040000001BD500 323111F6E5EE9AAD8B9EDFF37611445C
 00040000001BDC00 A74006499AF6E0D9D33BCFBBD4CAC915
 00040000001BDF00 4A74072E3E30928537EFE930E1D630C7

diff --git a/src/ncch.cpp b/src/ncch.cpp
@@ -694,6 +694,10 @@ void CNcch::calculateAlignment()
 
 void CNcch::calculateKey()
 {
+	if (m_nEncryptMode != kEncryptModeXor)
+	{
+		return;
+	}
 	m_Key[0] = 0;
 	m_Key[1] = 0;
 	CBigNum keyX[2] = { s_Slot0x2CKeyX, s_Slot0x2CKeyX };