angr 9.2.119__py3-none-macosx_11_0_arm64.whl → 9.2.121__py3-none-macosx_11_0_arm64.whl

angr/analyses/decompiler/structured_codegen/c.py

@@ -10,8 +10,8 @@ from ailment import Block, Expr, Stmt, Tmp
 from ailment.expression import StackBaseOffset, BinaryOp
 from unique_log_filter import UniqueLogFilter
 
-from ....procedures import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
-from ....sim_type import (
+from angr.procedures import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
+from angr.sim_type import (
     SimTypeLongLong,
     SimTypeInt,
     SimTypeShort,
@@ -34,17 +34,17 @@ from ....sim_type import (
     SimTypeInt128,
     SimTypeInt256,
 )
-from ....knowledge_plugins.functions import Function
-from ....sim_variable import SimVariable, SimTemporaryVariable, SimStackVariable, SimMemoryVariable
-from ....utils.constants import is_alignment_mask
-from ....utils.library import get_cpp_function_name
-from ....utils.loader import is_in_readonly_segment, is_in_readonly_section
-from ..utils import structured_node_is_simple_return
-from ....errors import UnsupportedNodeTypeError, AngrRuntimeError
-from ....knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
-from ... import Analysis, register_analysis
-from ..region_identifier import MultiNode
-from ..structuring.structurer_nodes import (
+from angr.knowledge_plugins.functions import Function
+from angr.sim_variable import SimVariable, SimTemporaryVariable, SimStackVariable, SimMemoryVariable
+from angr.utils.constants import is_alignment_mask
+from angr.utils.library import get_cpp_function_name
+from angr.utils.loader import is_in_readonly_segment, is_in_readonly_section
+from angr.analyses.decompiler.utils import structured_node_is_simple_return
+from angr.errors import UnsupportedNodeTypeError, AngrRuntimeError
+from angr.knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
+from angr.analyses import Analysis, register_analysis
+from angr.analyses.decompiler.region_identifier import MultiNode
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     ConditionNode,

angr/analyses/decompiler/structured_codegen/dwarf_import.py

@@ -4,9 +4,9 @@ import re
 import logging
 from sortedcontainers import SortedList
 
-from ... import Analysis, register_analysis
+from angr.analyses import Analysis, register_analysis
 from .base import BaseStructuredCodeGenerator, InstructionMapping, PositionMapping
-from ....knowledge_plugins.functions.function import Function
+from angr.knowledge_plugins.functions.function import Function
 
 
 l = logging.getLogger(__name__)

angr/analyses/decompiler/structuring/__init__.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Optional, Type
 
 from .dream import DreamStructurer
 from .phoenix import PhoenixStructurer
@@ -18,3 +17,14 @@ DEFAULT_STRUCTURER = SAILRStructurer
 
 def structurer_class_from_name(name: str) -> type | None:
     return STRUCTURER_CLASSES.get(name.lower(), None)
+
+
+__all__ = (
+    "DreamStructurer",
+    "PhoenixStructurer",
+    "SAILRStructurer",
+    "RecursiveStructurer",
+    "STRUCTURER_CLASSES",
+    "DEFAULT_STRUCTURER",
+    "structurer_class_from_name",
+)

angr/analyses/decompiler/structuring/dream.py

@@ -10,13 +10,13 @@ import claripy
 import ailment
 
 from angr.utils.graph import GraphUtils
-from ....knowledge_plugins.cfg import IndirectJump, IndirectJumpType
-from ..graph_region import GraphRegion
-from ..empty_node_remover import EmptyNodeRemover
-from ..jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
-from ..condition_processor import ConditionProcessor
-from ..region_simplifiers.cascading_cond_transformer import CascadingConditionTransformer
-from ..utils import (
+from angr.knowledge_plugins.cfg import IndirectJump, IndirectJumpType
+from angr.analyses.decompiler.graph_region import GraphRegion
+from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
+from angr.analyses.decompiler.jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.region_simplifiers.cascading_cond_transformer import CascadingConditionTransformer
+from angr.analyses.decompiler.utils import (
     extract_jump_targets,
     get_ast_subexprs,
     switch_extract_cmp_bounds,
@@ -1205,4 +1205,4 @@ class DreamStructurer(StructurerBase):
 
 
 # delayed import
-from ..sequence_walker import SequenceWalker  # pylint:disable=wrong-import-position
+from angr.analyses.decompiler.sequence_walker import SequenceWalker  # pylint:disable=wrong-import-position

angr/analyses/decompiler/structuring/phoenix.py

@@ -14,11 +14,11 @@ from ailment.expression import Const, UnaryOp, MultiStatementExpression
 
 from angr.utils.graph import GraphUtils
 from angr.utils.ail import is_phi_assignment
-from ....knowledge_plugins.cfg import IndirectJumpType
-from ....utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
-from ....utils.graph import dominates, to_acyclic_graph, dfs_back_edges
-from ..sequence_walker import SequenceWalker
-from ..utils import (
+from angr.knowledge_plugins.cfg import IndirectJumpType
+from angr.utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
+from angr.utils.graph import dominates, to_acyclic_graph, dfs_back_edges
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.utils import (
     remove_last_statement,
     extract_jump_targets,
     switch_extract_cmp_bounds,
@@ -26,7 +26,7 @@ from ..utils import (
     has_nonlabel_nonphi_statements,
     first_nonlabel_nonphi_statement,
 )
-from ..counters.call_counter import AILCallCounter
+from angr.analyses.decompiler.counters.call_counter import AILCallCounter
 from .structurer_nodes import (
     ConditionNode,
     SequenceNode,

angr/analyses/decompiler/structuring/recursive_structurer.py

@@ -5,13 +5,13 @@ import logging
 
 import networkx
 
-from ... import Analysis, register_analysis
-from ..condition_processor import ConditionProcessor
-from ..graph_region import GraphRegion
-from ..jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
-from ..empty_node_remover import EmptyNodeRemover
-from ..jump_target_collector import JumpTargetCollector
-from ..redundant_label_remover import RedundantLabelRemover
+from angr.analyses import Analysis, register_analysis
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.graph_region import GraphRegion
+from angr.analyses.decompiler.jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
+from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
+from angr.analyses.decompiler.jump_target_collector import JumpTargetCollector
+from angr.analyses.decompiler.redundant_label_remover import RedundantLabelRemover
 from .structurer_nodes import BaseNode
 from .structurer_base import StructurerBase
 from .dream import DreamStructurer

angr/analyses/decompiler/structuring/sailr.py

@@ -3,8 +3,8 @@ from typing import Any
 
 import networkx
 
-from ..utils import structured_node_is_simple_return
-from ....utils.graph import PostDominators, TemporaryNode
+from angr.analyses.decompiler.utils import structured_node_is_simple_return
+from angr.utils.graph import PostDominators, TemporaryNode
 from .phoenix import PhoenixStructurer
 
 

angr/analyses/decompiler/structuring/structurer_base.py

@@ -9,10 +9,15 @@ import networkx
 import ailment
 import claripy
 
-from ... import Analysis
-from ..condition_processor import ConditionProcessor
-from ..sequence_walker import SequenceWalker
-from ..utils import extract_jump_targets, insert_node, remove_last_statement, has_nonlabel_nonphi_statements
+from angr.analyses import Analysis
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.utils import (
+    extract_jump_targets,
+    insert_node,
+    remove_last_statement,
+    has_nonlabel_nonphi_statements,
+)
 from .structurer_nodes import (
     MultiNode,
     SequenceNode,

angr/analyses/decompiler/structuring/structurer_nodes.py

@@ -24,7 +24,7 @@ class MultiNode:
 
     def __init__(self, nodes, addr=None, idx=None):
         # delayed import
-        from ..graph_region import GraphRegion  # pylint:disable=import-outside-toplevel
+        from angr.analyses.decompiler.graph_region import GraphRegion  # pylint:disable=import-outside-toplevel
 
         self.nodes = []
 
@@ -247,14 +247,23 @@ class LoopNode(BaseNode):
         "_continue_addr",
     )
 
-    def __init__(self, sort, condition, sequence_node, addr=None, continue_addr=None, initializer=None, iterator=None):
-        self.sort = sort
-        self.condition = condition
-        self.sequence_node = sequence_node
-        self.initializer = initializer
-        self.iterator = iterator
-        self._addr = addr
-        self._continue_addr = continue_addr
+    def __init__(
+        self,
+        sort: str,
+        condition: ailment.Expr.Expression | None,
+        sequence_node: SequenceNode,
+        addr: int | None = None,
+        continue_addr: int | None = None,
+        initializer: ailment.Stmt.Assignment | None = None,
+        iterator: ailment.Stmt.Assignment | None = None,
+    ):
+        self.sort: str = sort
+        self.condition: ailment.Expr.Expression | None = condition
+        self.sequence_node: SequenceNode = sequence_node
+        self.initializer: ailment.Stmt.Assignment | None = initializer
+        self.iterator: ailment.Stmt.Assignment | None = iterator
+        self._addr: int | None = addr
+        self._continue_addr: int | None = continue_addr
 
     def copy(self):
         return LoopNode(

angr/analyses/decompiler/utils.py

@@ -694,6 +694,7 @@ def decompile_functions(
     catch_errors: bool = False,
     show_casts: bool = True,
     base_address: int | None = None,
+    preset: str | None = None,
 ) -> str | None:
     """
     Decompile a binary into a set of functions.
@@ -704,6 +705,7 @@ def decompile_functions(
     :param catch_errors:    The structuring algorithms to use.
     :param show_casts:      Whether to show casts in the decompiled output.
     :param base_address:    The base address of the binary.
+    :param preset:          The configuration preset to use during decompilation.
     :return:                The decompilation of all functions appended in order.
     """
     # delayed imports to avoid circular imports
@@ -757,11 +759,11 @@ def decompile_functions(
 
         exception_string = ""
         if not catch_errors:
-            dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options)
+            dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options, preset=preset)
         else:
             try:
                 # TODO: add a timeout
-                dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options)
+                dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options, preset=preset)
             except Exception as e:
                 exception_string = str(e).replace("\n", " ")
                 dec = None

angr/analyses/disassembly.py

@@ -10,16 +10,16 @@ from angr.knowledge_plugins import Function
 
 from . import Analysis
 
-from ..errors import AngrTypeError
-from ..utils.library import get_cpp_function_name
-from ..utils.formatting import ansi_color_enabled, ansi_color, add_edge_to_buffer
-from ..block import DisassemblerInsn, CapstoneInsn, SootBlockNode
-from ..codenode import BlockNode
+from angr.errors import AngrTypeError
+from angr.utils.library import get_cpp_function_name
+from angr.utils.formatting import ansi_color_enabled, ansi_color, add_edge_to_buffer
+from angr.block import DisassemblerInsn, CapstoneInsn, SootBlockNode
+from angr.codenode import BlockNode
 from .disassembly_utils import decode_instruction
 import contextlib
 
 try:
-    from ..engines import pcode
+    from angr.engines import pcode
     import pypcode
 
     IRSBType = Union[pyvex.IRSB, pcode.lifter.IRSB]

angr/analyses/disassembly_utils.py

@@ -5,7 +5,7 @@ import logging
 import capstone as cs
 from archinfo.arch_arm import is_arm_arch
 
-from ..misc.ux import once
+from angr.misc.ux import once
 
 l = logging.getLogger(name=__name__)
 

angr/analyses/dominance_frontier.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..utils.graph import compute_dominance_frontier, Dominators
+from angr.utils.graph import compute_dominance_frontier, Dominators
 from .analysis import Analysis
 from . import register_analysis
 

angr/analyses/find_objects_static.py

@@ -4,11 +4,11 @@ from collections import defaultdict
 
 import claripy
 
-from ..analyses import AnalysesHub
-from ..analyses.reaching_definitions.function_handler import FunctionHandler
-from ..knowledge_plugins.key_definitions.atoms import Register, MemoryLocation
-from ..storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
-from ..knowledge_plugins.key_definitions.constants import OP_BEFORE, OP_AFTER
+from angr.analyses import AnalysesHub
+from angr.analyses.reaching_definitions.function_handler import FunctionHandler
+from angr.knowledge_plugins.key_definitions.atoms import Register, MemoryLocation
+from angr.storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
+from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE, OP_AFTER
 from . import Analysis, VtableFinder, CFGFast, ReachingDefinitionsAnalysis
 
 if TYPE_CHECKING:

angr/analyses/flirt.py

@@ -7,9 +7,9 @@ import logging
 import nampa
 from archinfo.arch_arm import is_arm_arch
 
-from ..analyses import AnalysesHub
-from ..errors import AngrRuntimeError
-from ..flirt import FlirtSignature, STRING_TO_LIBRARIES, LIBRARY_TO_SIGNATURES, FLIRT_SIGNATURES_BY_ARCH
+from angr.analyses import AnalysesHub
+from angr.errors import AngrRuntimeError
+from angr.flirt import FlirtSignature, STRING_TO_LIBRARIES, LIBRARY_TO_SIGNATURES, FLIRT_SIGNATURES_BY_ARCH
 from .analysis import Analysis
 import contextlib
 

angr/analyses/forward_analysis/__init__.py

@@ -1,3 +1,12 @@
 from __future__ import annotations
+
 from .forward_analysis import ForwardAnalysis
 from .visitors import CallGraphVisitor, FunctionGraphVisitor, LoopVisitor, SingleNodeGraphVisitor
+
+__all__ = (
+    "ForwardAnalysis",
+    "CallGraphVisitor",
+    "FunctionGraphVisitor",
+    "LoopVisitor",
+    "SingleNodeGraphVisitor",
+)

angr/analyses/forward_analysis/forward_analysis.py

@@ -6,10 +6,10 @@ from collections.abc import Callable
 import networkx
 
 from .visitors.graph import NodeType
-from ...sim_state import SimState
-from ...errors import AngrForwardAnalysisError
-from ...errors import AngrSkipJobNotice, AngrDelayJobNotice, AngrJobMergingFailureNotice, AngrJobWideningFailureNotice
-from ...utils.algo import binary_insert
+from angr.sim_state import SimState
+from angr.errors import AngrForwardAnalysisError
+from angr.errors import AngrSkipJobNotice, AngrDelayJobNotice, AngrJobMergingFailureNotice, AngrJobWideningFailureNotice
+from angr.utils.algo import binary_insert
 from .job_info import JobInfo, JobType, JobKey
 
 if TYPE_CHECKING:

angr/analyses/forward_analysis/job_info.py

@@ -20,7 +20,7 @@ class JobInfo(Generic[JobType, JobKey]):
         return hash((self.key, *tuple(self.jobs)))
 
     def __eq__(self, o):
-        return type(self) == type(o) and self.key == o.key and self.job == o.job
+        return type(self) is type(o) and self.key == o.key and self.job == o.job
 
     def __repr__(self):
         return f"<JobInfo {self.key!s}>"

angr/analyses/forward_analysis/visitors/__init__.py

@@ -1,5 +1,14 @@
 from __future__ import annotations
+
 from .call_graph import CallGraphVisitor
 from .function_graph import FunctionGraphVisitor
 from .loop import LoopVisitor
 from .single_node_graph import SingleNodeGraphVisitor
+
+
+__all__ = (
+    "CallGraphVisitor",
+    "FunctionGraphVisitor",
+    "LoopVisitor",
+    "SingleNodeGraphVisitor",
+)

angr/analyses/forward_analysis/visitors/graph.py

@@ -3,8 +3,8 @@ from typing import TypeVar, Generic
 from collections.abc import Collection, Iterator
 from collections import defaultdict
 
-from ....misc.ux import deprecated
-from ....utils.algo import binary_insert
+from angr.misc.ux import deprecated
+from angr.utils.algo import binary_insert
 
 NodeType = TypeVar("NodeType")
 

angr/analyses/identifier/__init__.py

@@ -1,2 +1,5 @@
 from __future__ import annotations
+
 from .identify import Identifier
+
+__all__ = ("Identifier",)

angr/analyses/identifier/custom_callable.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 import logging
 
-from ...errors import AngrCallableError, AngrCallableMultistateError
-from ...calling_conventions import default_cc
+from angr.errors import AngrCallableError, AngrCallableMultistateError
+from angr.calling_conventions import default_cc
 
 
 l = logging.getLogger(name=__name__)
-# l.setLevel("DEBUG")
 
 
 class IdentifierCallable:

angr/analyses/identifier/errors.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ...errors import AngrAnalysisError
+from angr.errors import AngrAnalysisError
 
 
 class IdentifierException(AngrAnalysisError):

angr/analyses/identifier/functions/__init__.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
-import os
-from collections import defaultdict
-import importlib
 
+import importlib
 import logging
+import os
+
+from angr.analyses.identifier.func import Func
 
 l = logging.getLogger(name=__name__)
 
-from ..func import Func
 
 # Import all classes under the current directory, and group them based on
 # lib names.

angr/analyses/identifier/functions/atoi.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import random
 import string
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 class atoi(Func):

angr/analyses/identifier/functions/based_atoi.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import random
 import string
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 BASES = [8, 10, 16]

angr/analyses/identifier/functions/fdprintf.py

@@ -5,7 +5,7 @@ import logging
 
 import claripy
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 l = logging.getLogger(name=__name__)

angr/analyses/identifier/functions/free.py

@@ -3,8 +3,8 @@ import logging
 
 import claripy
 
-from ..func import Func, TestData
-from ..errors import IdentifierException
+from angr.analyses.identifier.func import Func, TestData
+from angr.analyses.identifier.errors import IdentifierException
 
 
 l = logging.getLogger(name=__name__)

angr/analyses/identifier/functions/int2str.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import random
 import string
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 digs = string.digits + string.ascii_letters

angr/analyses/identifier/functions/malloc.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ..func import Func, TestData
-from ....errors import SimMemoryError
+from angr.analyses.identifier.func import Func, TestData
+from angr.errors import SimMemoryError
 
 
 class malloc(Func):

angr/analyses/identifier/functions/memcmp.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import random
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/memcpy.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 import random
 
-from ....sim_type import SimTypeFunction, SimTypeInt
-from ..func import Func, TestData
-from ..custom_callable import IdentifierCallable
+from angr.sim_type import SimTypeFunction, SimTypeInt
+from angr.analyses.identifier.func import Func, TestData
+from angr.analyses.identifier.custom_callable import IdentifierCallable
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/memset.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import random
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/printf.py

@@ -5,7 +5,7 @@ import string
 
 import claripy
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 l = logging.getLogger(name=__name__)

angr/analyses/identifier/functions/recv_until.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import random
 import itertools
 
-from ..func import Func, TestData
-from ..errors import FunctionNotInitialized
+from angr.analyses.identifier.func import Func, TestData
+from angr.analyses.identifier.errors import FunctionNotInitialized
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/skip_calloc.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ..func import Func, TestData
-from ....errors import SimMemoryError
+from angr.analyses.identifier.func import Func, TestData
+from angr.errors import SimMemoryError
 
 
 class calloc(Func):

angr/analyses/identifier/functions/skip_realloc.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 import logging
 
-from ..func import Func, TestData
-from ....errors import SimMemoryError
+from angr.analyses.identifier.func import Func, TestData
+from angr.errors import SimMemoryError
 
 
 l = logging.getLogger(name=__name__)

angr/analyses/identifier/functions/skip_recv_n.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import random
 import struct
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/snprintf.py

@@ -4,7 +4,7 @@ import string
 
 import claripy
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 class snprintf(Func):

angr/analyses/identifier/functions/sprintf.py

@@ -4,7 +4,7 @@ import string
 
 import claripy
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 class sprintf(Func):

angr/analyses/identifier/functions/strcmp.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import random
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 def rand_str(length, byte_list=None):

angr/analyses/identifier/functions/strcpy.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import random
 
-from ..func import Func, TestData
+from angr.analyses.identifier.func import Func, TestData
 
 
 def rand_str(length, byte_list=None):