1.22.2 - UnityCN encryption flag fix for newer versions that use 0x1000 instead of 0x400

Author: K0lb3

UnityPy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.22.1"
+__version__ = "1.22.2"
 
 from .environment import Environment as Environment
 from .helpers.ArchiveStorageManager import (

UnityPy/enums/BundleFile.py

@@ -23,4 +23,4 @@ class ArchiveFlags(IntFlag):
     BlocksInfoAtTheEnd = 0x80
     OldWebPluginCompatibility = 0x100
     BlockInfoNeedPaddingAtStart = 0x200
-    UsesAssetBundleEncryption = 0x400
+    UsesAssetBundleEncryption = 0x1400  # old: 0x400, new: 0x1000

UnityPy/helpers/ArchiveStorageManager.py

@@ -75,13 +75,15 @@ def __init__(self, reader: EndianBinaryReader):
 
         if DECRYPT_KEY is None:
             raise LookupError(
-                "\n".join([
-                    "The BundleFile is encrypted, but no key was provided!",
-                    "You can set the key via UnityPy.set_assetbundle_decrypt_key(key).",
-                    "To try brute-forcing the key, use UnityPy.helpers.ArchiveStorageManager.brute_force_key(fp, key_sig, data_sig)",
-                    f"with  key_sig = {self.key_sig}, data_sig = {self.data_sig},"
-                    "and fp being the path to global-metadata.dat or a memory dump.",
-                ])
+                "\n".join(
+                    [
+                        "The BundleFile is encrypted, but no key was provided!",
+                        "You can set the key via UnityPy.set_assetbundle_decrypt_key(key).",
+                        "To try brute-forcing the key, use UnityPy.helpers.ArchiveStorageManager.brute_force_key(fp, key_sig, data_sig)",
+                        f"with  key_sig = {self.key_sig}, data_sig = {self.data_sig},"
+                        "and fp being the path to global-metadata.dat or a memory dump.",
+                    ]
+                )
             )
 
         signature = decrypt_key(self.key_sig, self.data_sig, DECRYPT_KEY)
@@ -146,3 +148,6 @@ def decrypt(self, data: Union[bytearray, memoryview], index: int, remaining: int
                     b, offset, index = self.decrypt_byte(data, offset, index)
 
         return offset
+
+    # def encrypt(self, data: bytes):
+    #     # TODO: patch BundleFile encryption flag to keep either 0x1000 or 0x400