dissect.hypervisor 3.13.dev4__py3-none-any.whl → 3.14.dev2__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → dissect.hypervisor-3.14.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.13.dev4
+Version: 3.14.dev2
 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,8 +23,12 @@ 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.dev
+Requires-Dist: dissect.util <4,>=3
+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'
 Provides-Extra: full
 Requires-Dist: pycryptodome ; extra == 'full'
 Requires-Dist: rich ; extra == 'full'

{dissect.hypervisor-3.13.dev4.dist-info → dissect.hypervisor-3.14.dev2.dist-info}/RECORD

@@ -1,23 +1,23 @@
 dissect/hypervisor/__init__.py,sha256=0wWcbmVN8F-6inSkNhEdxhnWVt2_oOxwZQC2ANQzNRM,433
 dissect/hypervisor/exceptions.py,sha256=7DzM0r3_-a7t7pM1V7EGR8gQZBVdxfCOYyWOtTXMc0s,163
 dissect/hypervisor/backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/hypervisor/backup/c_vma.py,sha256=MkIbF43GSh9Xm7FPcTOkoiOeTcbtmVFxYecW6ArHMb0,1487
+dissect/hypervisor/backup/c_vma.py,sha256=H85EQ1vyy9ew1nGRA6mkvir1zbCutXSjIvQRa6kKqnM,1481
 dissect/hypervisor/backup/vma.py,sha256=C72t_qjseVICQh4P4nOOqPFWZpth2raWSSZZE4WGkSU,9039
 dissect/hypervisor/backup/xva.py,sha256=xfP9KzxGUXbnrg-JqFdGeuBoHWMY2xVXyEQe543jptw,4572
 dissect/hypervisor/descriptor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/hypervisor/descriptor/c_hyperv.py,sha256=rNb1MbO_epg5_D3KnRDxc0tcbHyFVeH10x4jELsCfIs,4378
+dissect/hypervisor/descriptor/c_hyperv.py,sha256=QsMIn5sLeirmHM6mfwEpXoUpl0rJYTwE7VJpAxE3-0w,4369
 dissect/hypervisor/descriptor/hyperv.py,sha256=MQTpcAK9oxiiCyCSSrLNElmQ0lS1vzAcXqImDPmhLQ0,17692
 dissect/hypervisor/descriptor/ovf.py,sha256=99Q0IO9sCs9g-N8iFSkwQYFsBK17Fcqsdex6JqJFJdc,1815
 dissect/hypervisor/descriptor/pvs.py,sha256=m4sjaCU0dcoB4zTBWlxo2qrOD0kuSmEe97-8UpcFdPI,588
 dissect/hypervisor/descriptor/vbox.py,sha256=mPmgD0Hyr5c7lFCnZjt0mUS1h490LlRiTyE4CiBW6tc,509
 dissect/hypervisor/descriptor/vmx.py,sha256=LABtrrh-LYwHxsP07iZ6F2zoKiVXWxaxwCe5ArsDf-M,12500
 dissect/hypervisor/disk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/hypervisor/disk/c_hdd.py,sha256=xQ8CvKo5X6BY__yV1ioyUMIxxZL8xkJ_q59vzFcgaBA,2207
-dissect/hypervisor/disk/c_qcow2.py,sha256=9lqidhbLBWA3aIXXLlema7GykT2KAVLRsTQih0vBC1U,5055
-dissect/hypervisor/disk/c_vdi.py,sha256=BsjvtU8lwsizg1cvGlO8Lz9avy2xfyWREEAF8Ip9Hz0,3813
-dissect/hypervisor/disk/c_vhd.py,sha256=Whzhbo0BrAA6Vbmh2ZQVmwy9-mQ8jGQm0JHnriizOzM,1461
-dissect/hypervisor/disk/c_vhdx.py,sha256=IWHcyDbWDOrDTUkkWfmeHjNF7_NhgErlSgWOzuJFy_M,2891
-dissect/hypervisor/disk/c_vmdk.py,sha256=jM_fdrx4eu-ZoQiEmzw6hamqPJwf0YgBKgiS5iijUZI,5959
+dissect/hypervisor/disk/c_hdd.py,sha256=2kmoZyFgXB2JL7m7iPEgMzSD5oD5WFGhmF1VjH6Hzuk,2201
+dissect/hypervisor/disk/c_qcow2.py,sha256=wX2haLBSzTk4T_PeFc7KzzwkSFWxUsEGWwyoR9wa2q4,5047
+dissect/hypervisor/disk/c_vdi.py,sha256=TFjO9s19JgA6Hvv0LjHFcoJu08G7qi0SpVxlxBcH45w,3807
+dissect/hypervisor/disk/c_vhd.py,sha256=4lxGjUEyFR3OCKc7E0cjdTXkOr1LG0zdnPuqo1h3_L0,1457
+dissect/hypervisor/disk/c_vhdx.py,sha256=CAI1WC0E7D5clsTyO-2Dejdttp8_bBvTWK5Qa3rpxi0,2884
+dissect/hypervisor/disk/c_vmdk.py,sha256=ZnGYognILB9EgZE_bgWCQrMxJOsQ1dDbPCLzTbSJNA4,5952
 dissect/hypervisor/disk/hdd.py,sha256=p4oFLD9X0v39htwSU4pxPBJ37CnAiufi8vgx4T2o8sM,13023
 dissect/hypervisor/disk/qcow2.py,sha256=K4zstjte7SxX2psSbAj4YqwGeplfIvfbq5ScP4mzuvI,20245
 dissect/hypervisor/disk/vdi.py,sha256=_kX7ZGOVo_98ckMaiaDEmw4VjNgM57cY4YUSYrk2JGs,1851
@@ -28,12 +28,12 @@ dissect/hypervisor/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 dissect/hypervisor/tools/envelope.py,sha256=6_RLtKmFnZ69fx8HlvFgsjDjNrfnXD73dgszpG1mYQE,967
 dissect/hypervisor/tools/vma.py,sha256=N8x4Yh45BM5MweLSriwhAfSegbjw_Ko4i2yayMWF3rw,5422
 dissect/hypervisor/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/hypervisor/util/envelope.py,sha256=yt2FXRX2L5FUJ587oCMMmVUHqkuYiMbPRPMhH_mB_qk,10338
+dissect/hypervisor/util/envelope.py,sha256=dRVyhtMTL5CKRxv40bAeRTrHx1MTOZ5czJbIV2brmL0,10327
 dissect/hypervisor/util/vmtar.py,sha256=oNJ-qTvQVOl7al_vExpg_T4LnGyE72O9hjOmQBiTKSA,1469
-dissect.hypervisor-3.13.dev4.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
-dissect.hypervisor-3.13.dev4.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.hypervisor-3.13.dev4.dist-info/METADATA,sha256=SXCnbx7Qvov_KYQzRF18fLOOXki6WpbT3C9FOo4D9ds,3274
-dissect.hypervisor-3.13.dev4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dissect.hypervisor-3.13.dev4.dist-info/entry_points.txt,sha256=qwOrIPRV4bYsKo2sAZznUqegFTMu1sm7ld-o7w_h_5U,124
-dissect.hypervisor-3.13.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.hypervisor-3.13.dev4.dist-info/RECORD,,
+dissect.hypervisor-3.14.dev2.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
+dissect.hypervisor-3.14.dev2.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.hypervisor-3.14.dev2.dist-info/METADATA,sha256=J4Wz4wrJHIoG_HwRvWdvmRRcC6-KumhkKui28H5pyKI,3462
+dissect.hypervisor-3.14.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dissect.hypervisor-3.14.dev2.dist-info/entry_points.txt,sha256=qwOrIPRV4bYsKo2sAZznUqegFTMu1sm7ld-o7w_h_5U,124
+dissect.hypervisor-3.14.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.hypervisor-3.14.dev2.dist-info/RECORD,,