dissect.fve 4.2.dev2__tar.gz → 4.3.dev2__tar.gz

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.fve
-Version: 4.2.dev2
+Version: 4.3.dev2
 Summary: A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption
 Author-email: Dissect Team <dissect@fox-it.com>
-License: Affero General Public License v3
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/dissect.fve
 Project-URL: repository, https://github.com/fox-it/dissect.fve
@@ -11,7 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Internet :: Log Analysis
@@ -23,15 +22,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3
-Requires-Dist: pycryptodome==3.22.0
+Requires-Dist: dissect.util<4,>=3.22.dev8
+Requires-Dist: pycryptodome
 Requires-Dist: argon2-cffi
 Provides-Extra: full
 Requires-Dist: dissect.target; extra == "full"
 Requires-Dist: rich; extra == "full"
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
 Dynamic: license-file
 
 # dissect.fve

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/dissect/fve/crypto/__init__.py

@@ -1,20 +1,9 @@
 from __future__ import annotations
 
-from Crypto.Cipher import AES
-
+# Only pycryptodome is supported right now
 from dissect.fve.crypto import _pycryptodome
 from dissect.fve.crypto.base import Cipher, Plain, Plain64, Plain64BE
 
-# Only pycryptodome is supported right now
-_pycryptodome.install()
-
-
-CIPHER_MODE_MAP = {
-    "ecb": AES.MODE_FVE_ECB,
-    "cbc": AES.MODE_FVE_CBC,
-    "xts": AES.MODE_FVE_XTS,
-}
-
 IV_MODE_MAP = {
     "plain": Plain,
     "plain64": Plain64,
@@ -45,17 +34,15 @@ def create_cipher(
     if cipher_name != "aes":
         raise ValueError("Only AES support is implemented")
 
-    mode = CIPHER_MODE_MAP.get(cipher_mode)
-    if not mode:
+    if cipher_mode not in ("ecb", "cbc", "xts"):
         raise ValueError(f"Invalid cipher mode: {cipher_name}-{cipher_mode} (from {spec})")
 
-    iv = IV_MODE_MAP.get(iv_name)
-    if not iv:
+    if (iv := IV_MODE_MAP.get(iv_name)) is None:
         raise ValueError(f"Invalid iv mode: {iv_name}:{iv_options} (from {spec})")
 
-    return AES.new(
+    return _pycryptodome.new(
         key,
-        mode,
+        cipher_mode,
         key_size=key_size,
         iv_mode=iv,
         iv_options=iv_options,

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/dissect/fve/crypto/_pycryptodome.py

@@ -5,7 +5,7 @@ import platform
 import sys
 from typing import Any, Callable
 
-from Crypto.Cipher import AES, _extra_modes
+from Crypto.Cipher import AES
 from Crypto.Util import _raw_api
 
 from dissect.fve.crypto import elephant
@@ -250,14 +250,21 @@ def _create_cipher_factory(mode: type[Cipher]) -> Callable[..., Cipher]:
     return cipher_factory
 
 
-def install() -> None:
-    """Install the cipher modes into pycryptotome."""
+_create_fve_ecb_cipher = _create_cipher_factory(EcbMode)
+_create_fve_cbc_cipher = _create_cipher_factory(CbcMode)
+_create_fve_xts_cipher = _create_cipher_factory(XtsMode)
 
-    # Only support AES for now
-    AES.MODE_FVE_ECB = 50
-    AES.MODE_FVE_CBC = 51
-    AES.MODE_FVE_XTS = 52
 
-    _extra_modes[AES.MODE_FVE_ECB] = _create_cipher_factory(EcbMode)
-    _extra_modes[AES.MODE_FVE_CBC] = _create_cipher_factory(CbcMode)
-    _extra_modes[AES.MODE_FVE_XTS] = _create_cipher_factory(XtsMode)
+def new(key: bytes, mode: int, *args, **kwargs) -> Cipher:
+    """Create a new cipher object."""
+    if mode not in ("ecb", "cbc", "xts"):
+        return AES.new(key, mode, *args, **kwargs)
+
+    if mode == "ecb":
+        return _create_fve_ecb_cipher(AES, key=key, mode=mode, **kwargs)
+    if mode == "cbc":
+        return _create_fve_cbc_cipher(AES, key=key, mode=mode, **kwargs)
+    if mode == "xts":
+        return _create_fve_xts_cipher(AES, key=key, mode=mode, **kwargs)
+
+    raise ValueError(f"Unsupported mode: {mode} (key: {key!r}, args: {args}, kwargs: {kwargs})")

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/dissect/fve/crypto/elephant.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
+from dissect.util.xmemoryview import xmemoryview
+
 
 def diffuser_a_decrypt(buffer: memoryview, sector_size: int) -> None:
     a_cycles = 5
     r_a = [9, 0, 13, 0]
     int_size = sector_size >> 2
 
-    buffer_i = buffer.cast("I")
+    buffer_i = xmemoryview(buffer, "<I")
 
     for _ in range(a_cycles):
         for i in range(int_size):
@@ -18,7 +20,7 @@ def diffuser_a_encrypt(buffer: memoryview, sector_size: int) -> None:
     r_a = [9, 0, 13, 0]
     int_size = sector_size >> 2
 
-    buffer_i = buffer.cast("I")
+    buffer_i = xmemoryview(buffer, "<I")
 
     for _ in range(a_cycles):
         for i in range(int_size - 1, -1, -1):
@@ -30,7 +32,7 @@ def diffuser_b_decrypt(buffer: memoryview, sector_size: int) -> None:
     r_b = [0, 10, 0, 25]
     int_size = sector_size >> 2
 
-    buffer_i = buffer.cast("I")
+    buffer_i = xmemoryview(buffer, "<I")
 
     for _ in range(b_cycles):
         for i in range(int_size):
@@ -44,7 +46,7 @@ def diffuser_b_encrypt(buffer: memoryview, sector_size: int) -> None:
     r_b = [0, 10, 0, 25]
     int_size = sector_size >> 2
 
-    buffer_i = buffer.cast("I")
+    buffer_i = xmemoryview(buffer, "<I")
 
     for _ in range(b_cycles):
         for i in range(int_size - 1, -1, -1):

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/dissect.fve.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dissect.fve
-Version: 4.2.dev2
+Version: 4.3.dev2
 Summary: A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption
 Author-email: Dissect Team <dissect@fox-it.com>
-License: Affero General Public License v3
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/dissect.fve
 Project-URL: repository, https://github.com/fox-it/dissect.fve
@@ -11,7 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Internet :: Log Analysis
@@ -23,15 +22,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3
-Requires-Dist: pycryptodome==3.22.0
+Requires-Dist: dissect.util<4,>=3.22.dev8
+Requires-Dist: pycryptodome
 Requires-Dist: argon2-cffi
 Provides-Extra: full
 Requires-Dist: dissect.target; extra == "full"
 Requires-Dist: rich; extra == "full"
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
 Dynamic: license-file
 
 # dissect.fve

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/dissect.fve.egg-info/requires.txt

@@ -1,11 +1,11 @@
 dissect.cstruct<5,>=4
-dissect.util<4,>=3
-pycryptodome==3.22.0
+dissect.util<4,>=3.22.dev8
+pycryptodome
 argon2-cffi
 
 [dev]
 dissect.cstruct<5.0.dev,>=4.0.dev
-dissect.util<4.0.dev,>=3.0.dev
+dissect.util<4.0.dev,>=3.22.dev
 
 [full]
 dissect.target

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=65.5.0", "setuptools_scm[toml]>=6.4.0"]
+requires = ["setuptools>=77.0.0", "setuptools_scm[toml]>=6.4.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -7,7 +7,8 @@ name = "dissect.fve"
 description = "A Dissect module implementing a parsers for full volume encryption implementations, currently Linux Unified Key Setup (LUKS1 and LUKS2) and Microsoft's Bitlocker Disk Encryption"
 readme = "README.md"
 requires-python = "~=3.9"
-license.text = "Affero General Public License v3"
+license = "AGPL-3.0-or-later"
+license-files = ["LICENSE", "COPYRIGHT"]
 authors = [
   {name = "Dissect Team", email = "dissect@fox-it.com"}
 ]
@@ -16,7 +17,6 @@ classifiers = [
   "Environment :: Console",
   "Intended Audience :: Developers",
   "Intended Audience :: Information Technology",
-  "License :: OSI Approved",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Topic :: Internet :: Log Analysis",
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
     "dissect.cstruct>=4,<5",
-    "dissect.util>=3,<4",
-    "pycryptodome==3.22.0",
+    "dissect.util>=3.22.dev8,<4",  # TODO: update on release
+    "pycryptodome",
     "argon2-cffi",
 ]
 dynamic = ["version"]
@@ -44,7 +44,7 @@ full = [
 ]
 dev = [
     "dissect.cstruct>=4.0.dev,<5.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.util>=3.22.dev,<4.0.dev",
 ]
 
 [project.scripts]
@@ -52,7 +52,7 @@ fve-dd = "dissect.fve.tools.dd:main"
 
 [tool.ruff]
 line-length = 120
-required-version = ">=0.9.0"
+required-version = ">=0.12.0"
 
 [tool.ruff.format]
 docstring-code-format = true
@@ -101,9 +101,6 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
 known-first-party = ["dissect.fve"]
 known-third-party = ["dissect"]
 
-[tool.setuptools]
-license-files = ["LICENSE", "COPYRIGHT"]
-
 [tool.setuptools.packages.find]
 include = ["dissect.*"]
 

{dissect_fve-4.2.dev2 → dissect_fve-4.3.dev2}/tox.ini

@@ -18,7 +18,7 @@ deps =
     pytest-cov
     coverage
 commands =
-    pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
+    pytest --basetemp="{envtmpdir}" --import-mode="append" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
     coverage report
     coverage xml
 
@@ -32,7 +32,7 @@ commands =
 [testenv:fix]
 package = skip
 deps =
-    ruff==0.9.2
+    ruff==0.12.1
 commands =
     ruff format dissect tests
     ruff check --fix dissect tests
@@ -40,7 +40,7 @@ commands =
 [testenv:lint]
 package = skip
 deps =
-    ruff==0.9.2
+    ruff==0.12.1
     vermin
 commands =
     ruff check dissect tests