Sanity check: Assert .code is encrypted before setting normal key

wheremyfoodat · Jul 11, 2024 · e608436 · e608436
1 parent 096d0a8
commit e608436
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
@@ -207,8 +207,8 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
 				// All files in ExeFS use the same IV, though .code uses the secondary key for decryption
 				// whereas .icon/.banner use the primary key.
 				FSInfo info = exeFS;
-				if (secondaryKey.has_value() && info.encryptionInfo.has_value()) {
-					info.encryptionInfo->normalKey = secondaryKey.value();
+				if (encrypted && secondaryKey.has_value() && info.encryptionInfo.has_value()) {
+					info.encryptionInfo->normalKey = *secondaryKey;
 				}
 
 				if (compressCode) {