acquire 3.18.dev10__tar.gz → 3.18.dev11__tar.gz

{acquire-3.18.dev10 → acquire-3.18.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: acquire
-Version: 3.18.dev10
+Version: 3.18.dev11
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{acquire-3.18.dev10 → acquire-3.18.dev11}/acquire/crypt.py

@@ -2,11 +2,19 @@ from __future__ import annotations
 
 import hashlib
 import io
+import os
 from datetime import datetime, timezone
 from typing import BinaryIO
 
 from dissect.cstruct import cstruct
 
+try:
+    import _pystandalone
+
+    HAS_PYSTANDALONE = True
+except ImportError:
+    HAS_PYSTANDALONE = False
+
 try:
     from Crypto.Cipher import AES, PKCS1_OAEP
     from Crypto.PublicKey import RSA
@@ -74,16 +82,26 @@ class EncryptedStream(io.RawIOBase):
     """
 
     def __init__(self, fh: BinaryIO, public_key: str):
-        if not HAS_PYCRYPTODOME:
-            raise ImportError("PyCryptodome is not available")
+        if not HAS_PYSTANDALONE and not HAS_PYCRYPTODOME:
+            raise ImportError("Neither _pystandalone nor PyCryptodome are available")
 
         self.fh = fh
 
-        key = get_random_bytes(32)
-        iv = get_random_bytes(12)
-        self.cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
-
-        rsa = PKCS1_OAEP.new(RSA.import_key(public_key))
+        if HAS_PYSTANDALONE:
+            try:
+                key = _pystandalone.rand_bytes(32)
+                iv = _pystandalone.rand_bytes(12)
+            except Exception:
+                # Fallback if pystandalone does not work
+                key = os.urandom(32)
+                iv = os.urandom(12)
+            self.cipher = _pystandalone.aes_256_gcm(key, iv)
+            rsa = _pystandalone.rsa(public_key)
+        else:
+            key = get_random_bytes(32)
+            iv = get_random_bytes(12)
+            self.cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
+            rsa = PKCS1_OAEP.new(RSA.import_key(public_key))
 
         plain_header = c_acquire.header(
             magic=HEADER_MAGIC,

{acquire-3.18.dev10 → acquire-3.18.dev11}/acquire/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.18.dev10'
-__version_tuple__ = version_tuple = (3, 18, 'dev10')
+__version__ = version = '3.18.dev11'
+__version_tuple__ = version_tuple = (3, 18, 'dev11')

{acquire-3.18.dev10 → acquire-3.18.dev11}/acquire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: acquire
-Version: 3.18.dev10
+Version: 3.18.dev11
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3