Update to angr==9.2.77

disassemblers/ofrak_angr/CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased](https://github.com/redballoonsecurity/ofrak/tree/master)
 
+### Changed
+- Update to latest angr==9.2.77, which also necessitates Python >= 3.8.
+
 ### Fixed
 - Add `importlib-resources` dependency as workaround for z3-solver dependency issue. ([#401](https://github.com/redballoonsecurity/ofrak/pull/401))
 

disassemblers/ofrak_angr/ofrak_angr/components/blocks/unpackers.py

@@ -228,7 +228,7 @@ def _angr_get_dword_blocks(
             if xref is None or not any(xref in bb_range for bb_range in valid_data_xref_ranges):
                 continue
 
-            LOGGER.debug(f"Creating DataWord for {cb_data_xref.content} @ {cb_data_xref_addr:#x}")
+            LOGGER.debug(f"Creating DataWord for {cb_data_xref.content!r} @ {cb_data_xref_addr:#x}")
 
             format_string = endian_flag + dword_size_map[word_size]
 

disassemblers/ofrak_angr/ofrak_angr_test/test_unpackers.py

@@ -54,14 +54,30 @@ async def expected_results(self, unpack_verify_test_case: ComplexBlockUnpackerTe
                 0x110,
                 0x110,
                 0x130,
-                keep_same_is_exit_point=True,
+                keep_same_is_exit_point=False,
             )
 
             return self._fixup_test_case_for_pie(
                 unpack_verify_test_case.expected_results,
                 pie_base_vaddr=0x400000,
             )
 
+        elif unpack_verify_test_case.binary_md5_digest == "c79d1bea0398d7a9d0faa1ba68786f5e":
+            # Latest version of angr misses this DataWord now = the ref to it does not appear in the list of xrefs
+
+            missing_data_words = {0x8030, 0x8060}
+
+            fixed_up_results = {
+                vaddr: [
+                    block
+                    for block in original_expected_blocks
+                    if block.virtual_address not in missing_data_words
+                ]
+                for vaddr, original_expected_blocks in unpack_verify_test_case.expected_results.items()
+            }
+
+            return fixed_up_results
+
         return unpack_verify_test_case.expected_results
 
     def _split_bb(

disassemblers/ofrak_angr/requirements.txt

@@ -1,2 +1,2 @@
-angr==9.2.6
+angr==9.2.77
 importlib-resources  # A workaround for https://github.com/redballoonsecurity/ofrak/issues/398

disassemblers/ofrak_angr/setup.py

@@ -69,7 +69,7 @@ def read_requirements(requirements_path):
         "Topic :: Security",
         "Typing :: Typed",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     license="Proprietary",
     license_files=["LICENSE"],
     cmdclass={"egg_info": egg_info_ex},

disassemblers/ofrak_capstone/CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased](https://github.com/redballoonsecurity/ofrak/tree/master)
 
+### Changed
+- Update to captione==5.0.0.post1.
+
 ## 1.0.0 - 2022-01-25
 ### Added
 Initial release. Hello world!

disassemblers/ofrak_capstone/requirements.txt

@@ -1 +1 @@
-capstone==4.0.2
+capstone==5.0.0.post1

docs/environment-setup.md

@@ -1,7 +1,7 @@
 # Environment Setup & Installing OFRAK
 
 !!! warning
-    OFRAK is a Python library supporting Python3.7 and up. First and foremost, make sure your Python and pip installations are for Python3.7+! Python 3.8 is recommended, as this is the version we primarily test OFRAK with.
+    OFRAK is a Python library supporting Python3.8 and up. First and foremost, make sure your Python and pip installations are for Python3.8+! Python 3.8 is recommended, as this is the version we primarily test OFRAK with.
 
 There are three main ways one can set up an environment to use OFRAK:
 

docs/getting-started.md

@@ -3,7 +3,7 @@
 ## Quick Start - Unpack a firmware file and display it in the GUI
 
 !!! warning
-    OFRAK is a Python library supporting Python3.7 and up. First and foremost, make sure your Python and pip installations are for Python3.7+! Python 3.8 is recommended, as this is the version we primarily test OFRAK with.
+    OFRAK is a Python library supporting Python3.8 and up. First and foremost, make sure your Python and pip installations are for Python3.8+! Python 3.8 is recommended, as this is the version we primarily test OFRAK with.
 
 ```bash
 pip install ofrak

ofrak_core/pytest_ofrak/patterns/basic_block_unpacker.py

@@ -756,6 +756,14 @@ class BasicBlockUnpackerTestCase(
                         operands="",
                         mode=InstructionSetMode.NONE,
                     ),
+                    Instruction(
+                        virtual_address=0x4004E0,
+                        size=2,
+                        disassembly="repz ret ",
+                        mnemonic="repz ret",
+                        operands="",
+                        mode=InstructionSetMode.NONE,
+                    ),
                 ),
             ],
             0x4004F0: [

ofrak_core/pytest_ofrak/patterns/complex_block_unpacker.py

@@ -231,7 +231,7 @@ class ComplexBlockUnpackerTestCase(UnpackAndVerifyTestCase[int, List[Union[Basic
                     is_exit_point=True,
                     exit_vaddr=None,
                 ),
-                DataWord(virtual_address=32816, size=4, format_string="<L", xrefs_to=(32792,)),
+                DataWord(virtual_address=0x8030, size=4, format_string="<L", xrefs_to=(32792,)),
             ],
             0x8034: [
                 BasicBlock(
@@ -255,8 +255,8 @@ class ComplexBlockUnpackerTestCase(UnpackAndVerifyTestCase[int, List[Union[Basic
                     is_exit_point=False,
                     exit_vaddr=32856,
                 ),
-                DataWord(virtual_address=32864, size=4, format_string="<L", xrefs_to=(32820,)),
-                DataWord(virtual_address=32868, size=4, format_string="<L", xrefs_to=(32840,)),
+                DataWord(virtual_address=0x8060, size=4, format_string="<L", xrefs_to=(32820,)),
+                DataWord(virtual_address=0x8064, size=4, format_string="<L", xrefs_to=(32840,)),
             ],
             0x8068: [
                 BasicBlock(

ofrak_core/test_ofrak/components/test_comments.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 import pytest
 from hypothesis import given, HealthCheck, settings
 from hypothesis.strategies import text
@@ -38,7 +39,10 @@ async def test_adding_comments(executable_resource: Resource):
 # We suppress the function_scoped_fixture health check because the executable_resource fixture
 # doesn't need to be reset between individual runs of hypothesis (since the comment overrides
 # the previous one every time).
-@settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+@settings(
+    suppress_health_check=[HealthCheck.function_scoped_fixture],
+    deadline=timedelta(seconds=5),
+)
 @given(comment_str=text())
 async def test_comment_content(executable_resource: Resource, comment_str: str):
     """Test comments with all kinds of string contents."""

ofrak_core/test_ofrak/unit/test_ofrak_context.py

@@ -64,6 +64,9 @@ async def run_component_with_installed_dependency(ofrak_context: OFRAKContext):
 
 
 def test_get_ofrak_context_over_time():
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
     # No active context before running OFRAK
     with pytest.raises(InvalidStateError):
         get_current_ofrak_context()