dissect.hypervisor 3.13.dev4__tar.gz → 3.14__tar.gz

{dissect.hypervisor-3.13.dev4/dissect.hypervisor.egg-info → dissect_hypervisor-3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.13.dev4
+Version: 3.14
 Summary: A Dissect module implementing parsers for various hypervisor disk, backup and configuration files
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -23,11 +23,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: defusedxml
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4
+Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: rich; extra == "full"
+Provides-Extra: dev
+Requires-Dist: dissect.hypervisor[full]; 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"
 
 # dissect.hypervisor
 

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/backup/c_vma.py

@@ -1,4 +1,4 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vma_def = """
 #define VMA_BLOCK_BITS          12
@@ -53,8 +53,7 @@ struct VmaExtentHeader {
 };
 """
 
-c_vma = cstruct.cstruct(endian=">")
-c_vma.load(vma_def)
+c_vma = cstruct(endian=">").load(vma_def)
 
 
 VMA_MAGIC = b"VMA\x00"

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/descriptor/c_hyperv.py

@@ -1,4 +1,4 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 hyperv_def = """
 /* ======== File header ======== */
@@ -112,8 +112,7 @@ struct HyperVStorageKeyTableEntryHeader {
 };
 """
 
-c_hyperv = cstruct.cstruct()
-c_hyperv.load(hyperv_def)
+c_hyperv = cstruct().load(hyperv_def)
 
 ObjectEntryType = c_hyperv.ObjectEntryType
 KeyDataType = c_hyperv.KeyDataType

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_hdd.py

@@ -3,7 +3,7 @@
 # - https://github.com/qemu/qemu/blob/master/docs/interop/parallels.txt
 
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 hdd_def = """
 /* Compressed disk v1 signature */
@@ -62,7 +62,6 @@ struct pvd_dirty_bitmap_raw {
 };
 """
 
-c_hdd = cstruct.cstruct()
-c_hdd.load(hdd_def)
+c_hdd = cstruct().load(hdd_def)
 
 SECTOR_SIZE = c_hdd.SECTOR_SIZE

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_qcow2.py

@@ -1,4 +1,4 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 qcow2_def = """
 #define MIN_CLUSTER_BITS 9
@@ -136,8 +136,7 @@ enum QCow2SubclusterType {
 };
 """
 
-c_qcow2 = cstruct.cstruct(endian=">")
-c_qcow2.load(qcow2_def)
+c_qcow2 = cstruct(endian=">").load(qcow2_def)
 
 QCOW2_MAGIC = 0x514649FB
 QCOW2_MAGIC_BYTES = c_qcow2.uint32.dumps(QCOW2_MAGIC)

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_vdi.py

@@ -1,4 +1,4 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 # https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Storage/VDICore.h
 # https://forums.virtualbox.org/viewtopic.php?t=8046
@@ -81,8 +81,7 @@ struct HeaderDescriptor {
 };
 """
 
-c_vdi = cstruct.cstruct()
-c_vdi.load(vdi_def)
+c_vdi = cstruct().load(vdi_def)
 
 VDI_SIGNATURE = 0xBEDA107F
 

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_vhd.py

@@ -1,4 +1,4 @@
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vhd_def = """
 struct footer {
@@ -38,14 +38,13 @@ struct dynamic_header {
     uint32          checksum;
     char            parent_unique_id[16];
     uint32          parent_timestamp;
-    uint32          reserved;
+    uint32          reserved1;
     char            parent_unicode_name[512];
     parent_locator  parent_locators[8];
-    char            reserved[256];
+    char            reserved2[256];
 };
 """
 
-c_vhd = cstruct.cstruct(endian=">")
-c_vhd.load(vhd_def)
+c_vhd = cstruct(endian=">").load(vhd_def)
 
 SECTOR_SIZE = 512

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_vhdx.py

@@ -1,6 +1,6 @@
 from uuid import UUID
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vhdx_def = """
 #define PAYLOAD_BLOCK_NOT_PRESENT           0
@@ -99,8 +99,7 @@ struct parent_locator_entry {
 };
 """
 
-c_vhdx = cstruct.cstruct()
-c_vhdx.load(vhdx_def)
+c_vhdx = cstruct().load(vhdx_def)
 
 ALIGNMENT = 64 * 1024
 MB = 1024 * 1024

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/disk/c_vmdk.py

@@ -1,6 +1,6 @@
 import struct
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vmdk_def = """
 typedef struct {
@@ -132,8 +132,7 @@ typedef struct {
 #define GRAIN_MARKER_PROGRESS           4
 """
 
-c_vmdk = cstruct.cstruct()
-c_vmdk.load(vmdk_def)
+c_vmdk = cstruct().load(vmdk_def)
 
 SECTOR_SIZE = 512
 

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/dissect/hypervisor/util/envelope.py

@@ -25,7 +25,7 @@ try:
 except ImportError:
     HAS_PYCRYPTODOME = False
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 from dissect.util.stream import RangeStream
 
 c_def = """
@@ -69,8 +69,7 @@ enum AttributeType : uint8 {
     Bytes = 0xC
 };
 """
-c_envelope = cstruct.cstruct()
-c_envelope.load(c_def)
+c_envelope = cstruct().load(c_def)
 
 FILE_HEADER_MAGIC = b"DataTransformEnvelope"
 FOOTER_AEAD_MAGIC = b"DataTransformAeadFooter"

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14/dissect.hypervisor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.13.dev4
+Version: 3.14
 Summary: A Dissect module implementing parsers for various hypervisor disk, backup and configuration files
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -23,11 +23,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: defusedxml
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4
+Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: rich; extra == "full"
+Provides-Extra: dev
+Requires-Dist: dissect.hypervisor[full]; 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"
 
 # dissect.hypervisor
 

dissect_hypervisor-3.14/dissect.hypervisor.egg-info/requires.txt

@@ -0,0 +1,12 @@
+defusedxml
+dissect.cstruct<5,>=4
+dissect.util<4,>=3
+
+[dev]
+dissect.hypervisor[full]
+dissect.cstruct<5.0.dev,>=4.0.dev
+dissect.util<4.0.dev,>=3.0.dev
+
+[full]
+pycryptodome
+rich

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
     "defusedxml",
-    "dissect.cstruct>=3.0.dev,<4.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.cstruct>=4,<5",
+    "dissect.util>=3,<4",
 ]
 dynamic = ["version"]
 
@@ -41,6 +41,11 @@ full = [
     "pycryptodome",
     "rich",
 ]
+dev = [
+    "dissect.hypervisor[full]",
+    "dissect.cstruct>=4.0.dev,<5.0.dev",
+    "dissect.util>=3.0.dev,<4.0.dev",
+]
 
 [project.scripts]
 vma-extract = "dissect.hypervisor.tools.vma:main"
@@ -61,4 +66,3 @@ license-files = ["LICENSE", "COPYRIGHT"]
 include = ["dissect.*"]
 
 [tool.setuptools_scm]
-local_scheme = "no-local-version"

{dissect.hypervisor-3.13.dev4 → dissect_hypervisor-3.14}/tox.ini

@@ -5,13 +5,14 @@ envlist = lint, py3, pypy3
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
 minversion = 4.4.3
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# This version of virtualenv will install setuptools version 68.2.2 and pip
+# 23.3.1. These versions fully support python projects defined only through a
+# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
-extras = full
+extras = dev
 deps =
     pytest
     pytest-cov

dissect.hypervisor-3.13.dev4/dissect.hypervisor.egg-info/requires.txt

@@ -1,7 +0,0 @@
-defusedxml
-dissect.cstruct<4.0.dev,>=3.0.dev
-dissect.util<4.0.dev,>=3.0.dev
-
-[full]
-pycryptodome
-rich