smallworld-re 1.0.1__tar.gz → 1.0.3__tar.gz

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/PKG-INFO

@@ -1,20 +1,20 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: smallworld-re
-Version: 1.0.1
+Version: 1.0.3
 Summary: An emulation stack tracking library
 Home-page: https://github.com/smallworld-re/smallworld
 Author: MIT Lincoln Laboratory
 Author-email: smallworld@ll.mit.edu
 License: MIT
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: unicorn
-Requires-Dist: angr
-Requires-Dist: capstone
-Requires-Dist: lief
-Requires-Dist: pyhidra
-Requires-Dist: pypcode
+Requires-Dist: pyhidra==1.3.0
+Requires-Dist: angr==9.2.137
+Requires-Dist: capstone==5.0.3
+Requires-Dist: lief==0.14.1
+Requires-Dist: pypcode==3.0
+Requires-Dist: unicorn==2.0.1.post1
 Provides-Extra: development
 Requires-Dist: black; extra == "development"
 Requires-Dist: isort; extra == "development"
@@ -30,6 +30,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/setup.py

@@ -3,9 +3,35 @@ from setuptools import find_packages, setup
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
+# AFAIK, there is no way to load a constraints file directly.
+# Hey look I just made one.
+immediate_dependencies = {
+    "angr",
+    "capstone",
+    "lief",
+    "pyhidra",
+    "pypcode",
+    "unicorn",
+}
+# For some reason, pyhidra doesn't show up on pip-compile
+install_requires = ["pyhidra==1.3.0"]
+with open("constraints.txt", "r") as f:
+    constraints = f.read().split("\n")
+    for c in filter(
+        lambda x: not x.startswith("#"), map(lambda x: x.strip(), constraints)
+    ):
+        package = c.split("=", 1)[0]
+        if package in immediate_dependencies:
+            install_requires.append(c)
+
+if len(install_requires) != len(immediate_dependencies):
+    print(install_requires)
+    print(immediate_dependencies)
+    raise ValueError("Missing constraints for some packages")
+
 setup(
     name="smallworld-re",
-    version="1.0.1",
+    version="1.0.3",
     author="MIT Lincoln Laboratory",
     author_email="smallworld@ll.mit.edu",
     url="https://github.com/smallworld-re/smallworld",
@@ -15,8 +41,8 @@ setup(
     license="MIT",
     license_files=["LICENSE.txt"],
     packages=find_packages(),
-    python_requires=">=3.8",
-    install_requires=["unicorn", "angr", "capstone", "lief", "pyhidra", "pypcode"],
+    python_requires=">=3.10",
+    install_requires=install_requires,
     extras_require={
         "development": [
             "black",

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/smallworld/state/memory/code.py

@@ -33,6 +33,7 @@ class Executable(memory.RawMemory):
         address: typing.Optional[int] = None,
         platform: typing.Optional[Platform] = None,
         ignore_platform: bool = False,
+        page_size: int = 0x1000,
     ):
         """Load an ELF executable from an open file-like object.
 
@@ -41,6 +42,7 @@ class Executable(memory.RawMemory):
             address: The address where this executable should be loaded.
             platform: Optional platform for header verification
             ignore_platform: Skip platform ID and verification
+            page_size: Page size in bytes
 
         Returns:
             An Executable parsed from the given ELF file-like object.
@@ -50,7 +52,11 @@ class Executable(memory.RawMemory):
         from .elf import ElfExecutable
 
         return ElfExecutable(
-            file, user_base=address, platform=platform, ignore_platform=ignore_platform
+            file,
+            user_base=address,
+            platform=platform,
+            ignore_platform=ignore_platform,
+            page_size=page_size,
         )
 
     @classmethod

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/smallworld/state/memory/elf/elf.py

@@ -368,6 +368,7 @@ class ElfExecutable(Executable):
                 # File base is defined.
                 # We (probably) cannot move the image without problems.
                 raise ConfigurationError("Base address defined for fixed-position ELF")
+        log.info(f"Address: {self.address:x}")
 
     def _rebase_file(self, val: int):
         # Rebase an offset from file-relative to image-relative
@@ -389,16 +390,22 @@ class ElfExecutable(Executable):
         seg_size = self._page_align(phdr.virtual_size + (phdr.file_offset - seg_start))
 
         log.debug("Mapping: ")
-        log.debug(f"    f: [ {seg_start:012x} -> {seg_end:012x} ]")
-        log.debug(f"    m: [ {seg_addr:012x} -> {seg_addr + seg_size:012x} ]")
+        log.debug(
+            f"    f: [ {seg_start:012x} -> {seg_end:012x} ] ( {seg_end - seg_start:x} bytes )"
+        )
+        log.debug(
+            f"    m: [ {seg_addr:012x} -> {seg_addr + seg_size:012x} ] ( {seg_size:x} bytes )"
+        )
 
         # Extract segment data
         seg_data = image[seg_start:seg_end]
         if len(seg_data) < seg_size:
             # Segment is shorter than is available from the file;
             # this will get zero-padded.
-            seg_data += b"\0" * (seg_size - (seg_start - seg_end))
-        elif len(seg_data) != seg_size:
+            pad_size = seg_size - len(seg_data)
+            log.debug(f"Padding segment by {pad_size} bytes")
+            seg_data += b"\0" * pad_size
+        if len(seg_data) != seg_size:
             raise ConfigurationError(
                 f"Expected segment of size {seg_size}, but got {len(seg_data)}"
             )
@@ -408,6 +415,9 @@ class ElfExecutable(Executable):
 
         # Add the segment to the memory map
         seg_value = BytesValue(seg_data, None)
+        assert (
+            seg_value._size == seg_size
+        ), f"Expected {seg_size:x} bytes, got {seg_value._size:x}"
         self[seg_addr - self.address] = seg_value
 
     def _extract_symbols(self, elf):

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/smallworld_re.egg-info/PKG-INFO

@@ -1,20 +1,20 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: smallworld-re
-Version: 1.0.1
+Version: 1.0.3
 Summary: An emulation stack tracking library
 Home-page: https://github.com/smallworld-re/smallworld
 Author: MIT Lincoln Laboratory
 Author-email: smallworld@ll.mit.edu
 License: MIT
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: unicorn
-Requires-Dist: angr
-Requires-Dist: capstone
-Requires-Dist: lief
-Requires-Dist: pyhidra
-Requires-Dist: pypcode
+Requires-Dist: pyhidra==1.3.0
+Requires-Dist: angr==9.2.137
+Requires-Dist: capstone==5.0.3
+Requires-Dist: lief==0.14.1
+Requires-Dist: pypcode==3.0
+Requires-Dist: unicorn==2.0.1.post1
 Provides-Extra: development
 Requires-Dist: black; extra == "development"
 Requires-Dist: isort; extra == "development"
@@ -30,6 +30,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{smallworld_re-1.0.1 → smallworld_re-1.0.3}/smallworld_re.egg-info/requires.txt

@@ -1,9 +1,9 @@
-unicorn
-angr
-capstone
-lief
-pyhidra
-pypcode
+pyhidra==1.3.0
+angr==9.2.137
+capstone==5.0.3
+lief==0.14.1
+pypcode==3.0
+unicorn==2.0.1.post1
 
 [development]
 black