angr 9.2.42__tar.gz → 9.2.44__tar.gz

{angr-9.2.42/angr.egg-info → angr-9.2.44}/PKG-INFO

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.42
+Version: 9.2.44
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: AngrDB
@@ -14,22 +18,26 @@ Provides-Extra: docs
 Provides-Extra: pcode
 License-File: LICENSE
 
-angr
-====
+# angr
 
 [![Latest Release](https://img.shields.io/pypi/v/angr.svg)](https://pypi.python.org/pypi/angr/)
+[![Python Version](https://img.shields.io/pypi/pyversions/angr)](https://pypi.python.org/pypi/angr/)
 [![PyPI Statistics](https://img.shields.io/pypi/dm/angr.svg)](https://pypistats.org/packages/angr)
-[![Build Status](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)
 [![License](https://img.shields.io/github/license/angr/angr.svg)](https://github.com/angr/angr/blob/master/LICENSE)
-[![Gitbook](https://img.shields.io/badge/docs-gitbook-green.svg)](https://docs.angr.io)
-[![API Docs](https://img.shields.io/badge/docs-api-green.svg)](https://angr.io/api-doc)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 angr is a platform-agnostic binary analysis framework.
-It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu),  their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
+It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu), their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
 
-# What?
+## Project Links
+Homepage: https://angr.io
+
+Project repository: https://github.com/angr/angr
+
+Documentation: https://docs.angr.io
+
+API Documentation: https://api.angr.io/en/latest/
+
+## What is angr?
 
 angr is a suite of Python 3 libraries that let you load a binary and do a lot of cool things to it:
 
@@ -45,7 +53,7 @@ The most common angr operation is loading a binary: `p = angr.Project('/bin/bash
 
 The short version of "how to install angr" is `mkvirtualenv --python=$(which python3) angr && python -m pip install angr`.
 
-# Example
+## Example
 
 angr does a lot of binary analysis stuff.
 To get you started, here's a simple example of using symbolic execution to get a flag in a CTF challenge.

{angr-9.2.42 → angr-9.2.44}/README.md

@@ -1,19 +1,23 @@
-angr
-====
+# angr
 
 [![Latest Release](https://img.shields.io/pypi/v/angr.svg)](https://pypi.python.org/pypi/angr/)
+[![Python Version](https://img.shields.io/pypi/pyversions/angr)](https://pypi.python.org/pypi/angr/)
 [![PyPI Statistics](https://img.shields.io/pypi/dm/angr.svg)](https://pypistats.org/packages/angr)
-[![Build Status](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)
 [![License](https://img.shields.io/github/license/angr/angr.svg)](https://github.com/angr/angr/blob/master/LICENSE)
-[![Gitbook](https://img.shields.io/badge/docs-gitbook-green.svg)](https://docs.angr.io)
-[![API Docs](https://img.shields.io/badge/docs-api-green.svg)](https://angr.io/api-doc)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 angr is a platform-agnostic binary analysis framework.
-It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu),  their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
+It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu), their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
 
-# What?
+## Project Links
+Homepage: https://angr.io
+
+Project repository: https://github.com/angr/angr
+
+Documentation: https://docs.angr.io
+
+API Documentation: https://api.angr.io/en/latest/
+
+## What is angr?
 
 angr is a suite of Python 3 libraries that let you load a binary and do a lot of cool things to it:
 
@@ -29,7 +33,7 @@ The most common angr operation is loading a binary: `p = angr.Project('/bin/bash
 
 The short version of "how to install angr" is `mkvirtualenv --python=$(which python3) angr && python -m pip install angr`.
 
-# Example
+## Example
 
 angr does a lot of binary analysis stuff.
 To get you started, here's a simple example of using symbolic execution to get a flag in a CTF challenge.

{angr-9.2.42 → angr-9.2.44}/angr/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import
 # pylint: disable=wrong-import-position
 
-__version__ = "9.2.42"
+__version__ = "9.2.44"
 
 if bytes is str:
     raise Exception(

{angr-9.2.42 → angr-9.2.44}/angr/analyses/calling_convention.py

@@ -563,9 +563,10 @@ class CallingConventionAnalysis(Analysis):
             if isinstance(d.atom, MemoryLocation) and isinstance(d.atom.addr, SpOffset)
         }
 
-        arg_session = cc.arg_session(SimTypeInt().with_arch(self.project.arch))
+        default_type_cls = SimTypeInt if self.project.arch.bits == 32 else SimTypeLongLong
+        arg_session = cc.arg_session(default_type_cls().with_arch(self.project.arch))
         for _ in range(30):  # at most 30 arguments
-            arg_loc = cc.next_arg(arg_session, SimTypeInt().with_arch(self.project.arch))
+            arg_loc = cc.next_arg(arg_session, default_type_cls().with_arch(self.project.arch))
             if isinstance(arg_loc, SimRegArg):
                 reg_offset = self.project.arch.registers[arg_loc.reg_name][0]
                 # is it initialized?

{angr-9.2.42 → angr-9.2.44}/angr/analyses/decompiler/ail_simplifier.py

@@ -248,7 +248,8 @@ class AILSimplifier(Analysis):
             addr_and_idx_to_block[(block.addr, block.idx)] = block
 
         rd = self._compute_reaching_definitions()
-        for def_ in rd.all_definitions:
+        sorted_defs = sorted(rd.all_definitions, key=lambda d: d.codeloc, reverse=True)
+        for def_ in sorted_defs:
             if isinstance(def_.atom, atoms.Register):
                 needs_narrowing, to_size, use_exprs = self._narrowing_needed(def_, rd, addr_and_idx_to_block)
                 if needs_narrowing:

{angr-9.2.42 → angr-9.2.44}/angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py

@@ -165,6 +165,13 @@ class LoweredSwitchSimplifier(OptimizationPass):
                 # update the block
                 self._update_block(original_head, new_head)
 
+                # sanity check that no switch head points to either itself
+                # or to any if-head that was merged into the new switch head; this
+                # would result in a successor node no longer being present in the graph
+                if any(onode not in graph_copy for onode in original_nodes):
+                    self.out_graph = None
+                    return
+
                 # add edges between the head and case nodes
                 for onode in original_nodes:
                     successors = list(graph_copy.successors(onode))

{angr-9.2.42 → angr-9.2.44}/angr/analyses/decompiler/structured_codegen/c.py

@@ -1061,6 +1061,7 @@ class CFunctionCall(CStatement, CExpression):
     func(arg0, arg1)
 
     :ivar Function callee_func:  The function getting called.
+    :ivar is_expr:  True if the return value of the function is written to ret_expr; Essentially, ret_expr = call().
     """
 
     __slots__ = (
@@ -1108,7 +1109,13 @@ class CFunctionCall(CStatement, CExpression):
         else:
             raise RuntimeError("CFunctionCall.type should not be accessed if the function call is used as a statement.")
 
-    def c_repr_chunks(self, indent=0, asexpr=False):
+    def c_repr_chunks(self, indent=0, asexpr: bool = False):
+        """
+
+        :param indent:  Number of whitespace indentation characters.
+        :param asexpr:  True if this call is used as an expression (which means we will skip the generation of
+                        semicolons and newlines at the end of the call).
+        """
         indent_str = self.indent_str(indent=indent)
         yield indent_str, None
 
@@ -1135,7 +1142,7 @@ class CFunctionCall(CStatement, CExpression):
 
         yield ")", paren
 
-        if not self.is_expr:
+        if not self.is_expr and not asexpr:
             yield ";", self
             if not self.returning:
                 yield " /* do not return */", self

{angr-9.2.42 → angr-9.2.44}/angr/analyses/decompiler/structuring/phoenix.py

@@ -2015,7 +2015,7 @@ class PhoenixStructurer(StructurerBase):
                 elif isinstance(last_stmt.false_target, Const) and last_stmt.false_target.value == dst_addr:
                     return True
             elif isinstance(last_stmt, IncompleteSwitchCaseHeadStatement):
-                if any(case_addr == dst_addr for _, case_addr in last_stmt.case_addrs):
+                if any(case_addr == dst_addr for _, _, _, case_addr in last_stmt.case_addrs):
                     return True
             return False
 

{angr-9.2.42 → angr-9.2.44}/angr/analyses/propagator/engine_ail.py

@@ -280,7 +280,8 @@ class SimEnginePropagatorAIL(
             # check if this new_expr uses any expression that has been overwritten
             all_subexprs = list(tmp.all_exprs())
             outdated = False
-            for detail in tmp.offset_and_details.values():
+            offset_and_details = tmp.offset_and_details or {}
+            for detail in offset_and_details.values():
                 if detail.expr is None:
                     continue
                 outdated_, has_avoid_ = self.is_using_outdated_def(
@@ -290,6 +291,10 @@ class SimEnginePropagatorAIL(
                     outdated = True
                     break
 
+            if not offset_and_details:
+                l.warning("Tmp expression has no details or offsets")
+                return tmp
+
             if None in all_subexprs or outdated:
                 top = self.state.top(expr.size * self.arch.byte_width)
                 self.state.add_replacement(self._codeloc(), expr, top)

{angr-9.2.42 → angr-9.2.44}/angr/code_location.py

@@ -108,12 +108,22 @@ class CodeLocation:
 
     def __lt__(self, other):
         if self.block_addr != other.block_addr:
+            if self.block_addr is None and other.block_addr is not None:
+                return True
+            elif self.block_addr is not None and other.block_addr is None:
+                return False
+            # elif self.block_addr is not None and other.block_addr is not None:
             return self.block_addr < other.block_addr
+        if self.stmt_idx != other.stmt_idx:
+            if self.stmt_idx is None and other.stmt_idx is not None:
+                return True
+            elif self.stmt_idx is not None and other.stmt_idx is None:
+                return False
+            # elif self.stmt_idx is not None and other.stmt_idx is not None
+            return self.stmt_idx < other.stmt_idx
         if self.ins_addr is not None and other.ins_addr is not None:
             if self.ins_addr != other.ins_addr:
                 return self.ins_addr < other.ins_addr
-        if self.stmt_idx != other.stmt_idx:
-            return self.stmt_idx < other.stmt_idx
         return False
 
     def __hash__(self):

{angr-9.2.42 → angr-9.2.44/angr.egg-info}/PKG-INFO

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.42
+Version: 9.2.44
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: AngrDB
@@ -14,22 +18,26 @@ Provides-Extra: docs
 Provides-Extra: pcode
 License-File: LICENSE
 
-angr
-====
+# angr
 
 [![Latest Release](https://img.shields.io/pypi/v/angr.svg)](https://pypi.python.org/pypi/angr/)
+[![Python Version](https://img.shields.io/pypi/pyversions/angr)](https://pypi.python.org/pypi/angr/)
 [![PyPI Statistics](https://img.shields.io/pypi/dm/angr.svg)](https://pypistats.org/packages/angr)
-[![Build Status](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)](https://github.com/angr/angr/actions/workflows/.github/workflows/ci.yml/badge.svg)
 [![License](https://img.shields.io/github/license/angr/angr.svg)](https://github.com/angr/angr/blob/master/LICENSE)
-[![Gitbook](https://img.shields.io/badge/docs-gitbook-green.svg)](https://docs.angr.io)
-[![API Docs](https://img.shields.io/badge/docs-api-green.svg)](https://angr.io/api-doc)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 angr is a platform-agnostic binary analysis framework.
-It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu),  their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
+It is brought to you by [the Computer Security Lab at UC Santa Barbara](https://seclab.cs.ucsb.edu), [SEFCOM at Arizona State University](https://sefcom.asu.edu), their associated CTF team, [Shellphish](https://shellphish.net), the open source community, and **[@rhelmot](https://github.com/rhelmot)**.
 
-# What?
+## Project Links
+Homepage: https://angr.io
+
+Project repository: https://github.com/angr/angr
+
+Documentation: https://docs.angr.io
+
+API Documentation: https://api.angr.io/en/latest/
+
+## What is angr?
 
 angr is a suite of Python 3 libraries that let you load a binary and do a lot of cool things to it:
 
@@ -45,7 +53,7 @@ The most common angr operation is loading a binary: `p = angr.Project('/bin/bash
 
 The short version of "how to install angr" is `mkvirtualenv --python=$(which python3) angr && python -m pip install angr`.
 
-# Example
+## Example
 
 angr does a lot of binary analysis stuff.
 To get you started, here's a simple example of using symbolic execution to get a flag in a CTF challenge.

{angr-9.2.42 → angr-9.2.44}/angr.egg-info/requires.txt

@@ -1,12 +1,12 @@
 CppHeaderParser
 GitPython
-ailment==9.2.42
-archinfo==9.2.42
+ailment==9.2.44
+archinfo==9.2.44
 cachetools
 capstone!=5.0.0rc2,>=3.0.5rc2
 cffi>=1.14.0
-claripy==9.2.42
-cle==9.2.42
+claripy==9.2.44
+cle==9.2.44
 dpkt
 itanium-demangler
 mulpyplexer
@@ -16,7 +16,7 @@ progressbar2>=3
 protobuf>=3.19.0
 psutil
 pycparser>=2.18
-pyvex==9.2.42
+pyvex==9.2.44
 rpyc
 sortedcontainers
 sympy

{angr-9.2.42 → angr-9.2.44}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=59", "wheel", "pyvex==9.2.42", "unicorn==2.0.1.post1"]
+requires = ["setuptools>=59", "wheel", "pyvex==9.2.44", "unicorn==2.0.1.post1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

{angr-9.2.42 → angr-9.2.44}/setup.cfg

@@ -11,19 +11,23 @@ classifiers =
 	License :: OSI Approved :: BSD License
 	Programming Language :: Python :: 3
 	Programming Language :: Python :: 3 :: Only
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 
 [options]
 packages = find:
 install_requires = 
 	CppHeaderParser
 	GitPython
-	ailment==9.2.42
-	archinfo==9.2.42
+	ailment==9.2.44
+	archinfo==9.2.44
 	cachetools
 	capstone!=5.0.0rc2,>=3.0.5rc2
 	cffi>=1.14.0
-	claripy==9.2.42
-	cle==9.2.42
+	claripy==9.2.44
+	cle==9.2.44
 	dpkt
 	itanium-demangler
 	mulpyplexer
@@ -33,7 +37,7 @@ install_requires =
 	protobuf>=3.19.0
 	psutil
 	pycparser>=2.18
-	pyvex==9.2.42
+	pyvex==9.2.44
 	rpyc
 	sortedcontainers
 	sympy

{angr-9.2.42 → angr-9.2.44}/tests/test_decompiler.py

@@ -2274,6 +2274,32 @@ class TestDecompiler(unittest.TestCase):
 
         assert d.codegen.text.count("switch") == 1
 
+    @for_all_structuring_algos
+    def test_no_switch_case_touch_touch(self, decompiler_options=None):
+        # node 0x40015b is an if-node that is merged into a switch case node with other if-node's that
+        # have it as a successor, resulting in a switch that point's to its old heads; in this case,
+        # the switch should not exist at all AND not crash
+        bin_path = os.path.join(test_location, "x86_64", "decompiler", "touch_touch_no_switch.o")
+        proj = angr.Project(bin_path, auto_load_libs=False)
+
+        all_optimization_passes = angr.analyses.decompiler.optimization_passes.get_default_optimization_passes(
+            "AMD64", "linux"
+        )
+        all_optimization_passes = [
+            p
+            for p in all_optimization_passes
+            if p is not angr.analyses.decompiler.optimization_passes.EagerReturnsSimplifier
+        ]
+
+        cfg = proj.analyses.CFGFast(normalize=True, data_references=True)
+        f = proj.kb.functions["touch"]
+        d = proj.analyses[Decompiler].prep()(
+            f, cfg=cfg.model, options=decompiler_options, optimization_passes=all_optimization_passes
+        )
+        self._print_decompilation_result(d)
+
+        assert d.codegen.text.count("switch") == 0
+
 
 if __name__ == "__main__":
     unittest.main()