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

Update NSTool to v1.9.2
This commit is contained in:
Jack 2024-10-14 10:37:24 +09:00 committed by GitHub
commit e89ea84bd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

2
deps/libtoolchain vendored

@ -1 +1 @@
Subproject commit fa13eb8679ad8ff64f90485e96f7c60bd2c568bb Subproject commit 578d170f5b294e4a9feb3cc2d504896e846f204e

View file

@ -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++) 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; 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()); 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());

View file

@ -3,5 +3,5 @@
#define BIN_NAME "nstool" #define BIN_NAME "nstool"
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 9 #define VER_MINOR 9
#define VER_PATCH 1 #define VER_PATCH 2
#define AUTHORS "jakcron" #define AUTHORS "jakcron"