Merge pull request #46 from gomsoup/elden-ring

Unencrypted save file support
Atvaark · Mar 17, 2022 · 1879ffb · 1879ffb
2 parents 7731d94 + bf24fae
commit 1879ffb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/BinderTool.Core/Sl2/Sl2UserData.cs b/BinderTool.Core/Sl2/Sl2UserData.cs
@@ -1,29 +1,39 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Text;
 
 namespace BinderTool.Core.Sl2
 {
     public class Sl2UserData
     {
         private const int UserDataIvSize = 16;
-        
+
         private readonly byte[] _key;
 
         private readonly byte[] _iv;
 
+        private readonly bool _encrypted;
+
         public Sl2UserData(byte[] key)
         {
             _key = key;
             _iv = new byte[UserDataIvSize];
+            _encrypted = Equals(key, new byte[key.Length]) ? true : false;
         }
 
         public string Name { get; set; }
 
         public byte[] EncryptedUserData { get; private set; }
 
-        //public byte[] DecryptedUserData => CryptographyUtility.DecryptAesCbc(new MemoryStream(EncryptedUserData), _key, _iv).ToArray();
-        public byte[] DecryptedUserData => null;
+        public byte[] DecryptedUserData()
+        {
+            if (!_encrypted)
+                return EncryptedUserData;
 
+            MemoryStream ms = new MemoryStream();
+            CryptographyUtility.DecryptAesCbc(new MemoryStream(EncryptedUserData), _key, _iv).CopyTo(ms);
+            return ms.ToArray();
+        }
 
         public static Sl2UserData ReadSl2UserData(Stream inputStream, byte[] key, int size, string name)
         {

diff --git a/BinderTool/Program.cs b/BinderTool/Program.cs
@@ -596,7 +596,7 @@ private static void UnpackSl2File(Options options)
                 foreach (var userData in sl2File.UserData)
                 {
                     string outputFilePath = Path.Combine(options.OutputPath, userData.Name);
-                    File.WriteAllBytes(outputFilePath, userData.DecryptedUserData);
+                    File.WriteAllBytes(outputFilePath, userData.DecryptedUserData());
                 }
             }
         }