Merge pull request #118 from jakcron/v1.9.2-release

Update NSTool to v1.9.2
Bump version to 1.9.2
2025-02-05 15:32:49 +00:00 · 2024-10-14 10:37:24 +09:00 · 2024-10-14 10:27:17 +09:00 · 2024-10-14 10:25:27 +09:00 · 2024-10-14 10:20:20 +09:00 · 2024-09-22 23:46:52 +08:00
3 changed files with 3 additions and 3 deletions
--- a/deps/libtoolchain
+++ b/deps/libtoolchain
@ -1 +1 @@
-Subproject commit fa13eb8679ad8ff64f90485e96f7c60bd2c568bb
+Subproject commit 578d170f5b294e4a9feb3cc2d504896e846f204e
--- a/src/KeyBag.cpp
+++ b/src/KeyBag.cpp
@ -421,7 +421,7 @@ void nstool::KeyBagInitializer::importBaseKeyFile(const tc::io::Path& keyfile_pa

 			for (size_t keak_idx = 0; keak_idx < pie::hac::nca::kKeyAreaEncryptionKeyNum; keak_idx++)
 			{
-				if (key_area_key_source[keak_idx].isSet() && nca_key_area_encryption_key[keak_idx].find(itr->first) != nca_key_area_encryption_key[keak_idx].end())
+				if (key_area_key_source[keak_idx].isSet() && nca_key_area_encryption_key[keak_idx].find(itr->first) == nca_key_area_encryption_key[keak_idx].end())
 				{
 					aes128_key_t nca_key_area_encryption_key_tmp;
 					pie::hac::AesKeygen::generateKey(nca_key_area_encryption_key_tmp.data(), aes_kek_generation_source.get().data(), key_area_key_source[keak_idx].get().data(), aes_key_generation_source.get().data(), itr->second.data());
--- a/src/version.h
+++ b/src/version.h
@ -3,5 +3,5 @@
 #define BIN_NAME	"nstool"
 #define VER_MAJOR	1
 #define VER_MINOR	9
-#define VER_PATCH   1
+#define VER_PATCH   2
 #define AUTHORS		"jakcron"
Author	SHA1	Message	Date
Jack	e89ea84bd7	Merge pull request #118 from jakcron/v1.9.2-release Update NSTool to v1.9.2	2024-10-14 10:37:24 +09:00
Jack	f70b6dc458	Bump version to 1.9.2	2024-10-14 10:27:17 +09:00
Jack	f27c71bb4a	Merge branch 'development-tip' into v1.9.2-release	2024-10-14 10:25:27 +09:00
Jack	cfb826ca6c	Update libtoolchain to v0.8.0 (fixes VS dup issue)	2024-10-14 10:20:20 +09:00
jakcron	cfadea2994	Fix bug where KeyAreaEncryptionKeys were not calcd	2024-09-22 23:46:52 +08:00