Fix incorrect size being used

SabreTools · Nov 15, 2024 · dc4bd15 · dc4bd15
1 parent ce54eb2
commit dc4bd15
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/NDecrypt.Core/ThreeDSTool.cs b/NDecrypt.Core/ThreeDSTool.cs
@@ -389,8 +389,7 @@ private void DecryptExeFSFileEntries(N3DS cart, int index, Stream input, Stream
                 output.Seek(exeFsFilesOffset + fileHeader.FileOffset, SeekOrigin.Begin);
 
                 // Setup and perform the encryption
-                uint exeFsSize = cart.GetExeFSSize(index);
-                PerformAESOperation(exeFsSize,
+                PerformAESOperation(fileHeader.FileSize,
                     firstCipher,
                     secondCipher,
                     input,
@@ -650,10 +649,6 @@ private bool EncryptExeFS(N3DS cart, int index, Stream input, Stream output)
                 return false;
             }
 
-            // Get the ExeFS offset
-            uint exeFsHeaderOffset = cart.GetExeFSOffset(index);
-            uint exeFsFilesOffset = exeFsHeaderOffset + cart.MediaUnitSize;
-
             // For all but the original crypto method, process each of the files in the table
             var backupHeader = cart.BackupHeader;
             if (backupHeader!.Flags!.CryptoMethod != CryptoMethod.Original)
@@ -662,6 +657,10 @@ private bool EncryptExeFS(N3DS cart, int index, Stream input, Stream output)
             // Encrypt the filename table
             EncryptExeFSFilenameTable(cart, index, input, output);
 
+            // Get the ExeFS offset
+            uint exeFsHeaderOffset = cart.GetExeFSOffset(index);
+            uint exeFsFilesOffset = exeFsHeaderOffset + cart.MediaUnitSize;
+
             // Seek to the ExeFS
             input.Seek(exeFsHeaderOffset, SeekOrigin.Begin);
             output.Seek(exeFsHeaderOffset, SeekOrigin.Begin);
@@ -769,8 +768,7 @@ private void EncryptExeFSFileEntries(N3DS cart, int index, Stream input, Stream
                 output.Seek(exeFsFilesOffset + fileHeader.FileOffset, SeekOrigin.Begin);
 
                 // Setup and perform the encryption
-                uint exeFsSize = cart.GetExeFSSize(index);
-                PerformAESOperation(exeFsSize,
+                PerformAESOperation(fileHeader.FileSize,
                     firstCipher,
                     secondCipher,
                     input,