angr 9.2.118__py3-none-win_amd64.whl → 9.2.120__py3-none-win_amd64.whl

angr/engines/vex/light/slicing.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from .light import VEXMixin
-from ....utils.constants import DEFAULT_STATEMENT
+from angr.utils.constants import DEFAULT_STATEMENT
 
 
 class VEXSlicingMixin(VEXMixin):

angr/errors.py

@@ -66,10 +66,6 @@ class AngrBackwardSlicingError(AngrError):
     pass
 
 
-class AngrGirlScoutError(AngrError):
-    pass
-
-
 class AngrCallableError(AngrSurveyorError):
     pass
 
@@ -605,5 +601,9 @@ class SimConcreteBreakpointError(AngrError):
 #
 
 
+class AngrDecompilationError(AngrError):
+    pass
+
+
 class UnsupportedNodeTypeError(AngrError, NotImplementedError):
     pass

angr/exploration_techniques/__init__.py

@@ -141,7 +141,6 @@ from .tech_builder import TechniqueBuilder
 from .stochastic import StochasticSearch
 from .unique import UniqueSearch
 from .symbion import Symbion
-from ..errors import AngrError, AngrExplorationTechniqueError
 from .memory_watcher import MemoryWatcher
 from .bucketizer import Bucketizer
 from .local_loop_seer import LocalLoopSeer

angr/exploration_techniques/bucketizer.py

@@ -3,11 +3,10 @@ import math
 from collections import defaultdict
 import logging
 
-from ..engines.successors import SimSuccessors
+from angr.engines.successors import SimSuccessors
 from . import ExplorationTechnique
 
 _l = logging.getLogger(__name__)
-_l.setLevel(logging.DEBUG)
 
 
 class Bucketizer(ExplorationTechnique):
@@ -15,9 +14,6 @@ class Bucketizer(ExplorationTechnique):
     Loop bucketization: Pick log(n) paths out of n possible paths, and stash (or drop) everything else.
     """
 
-    def __init__(self):
-        super().__init__()
-
     def successors(self, simgr, state, **kwargs):
         # step first
         successors: SimSuccessors = super().successors(simgr, state, **kwargs)
@@ -50,7 +46,8 @@ class Bucketizer(ExplorationTechnique):
         successors.successors = new_successors
         return successors
 
-    def _get_transition_dict(self, state):
+    @staticmethod
+    def _get_transition_dict(state):
         """
 
         :param SimState state:
@@ -64,7 +61,8 @@ class Bucketizer(ExplorationTechnique):
             state.globals["transition"] = t
         return t
 
-    def _record_transition(self, state, transition):
+    @staticmethod
+    def _record_transition(state, transition):
         """
 
         :param SimState state:
@@ -72,12 +70,13 @@ class Bucketizer(ExplorationTechnique):
         :return:
         """
 
-        t = self._get_transition_dict(state).copy()
+        t = Bucketizer._get_transition_dict(state).copy()
         t[transition] += 1
 
         state.globals["transition"] = t
 
-    def _accept_transition(self, state, transition):
+    @staticmethod
+    def _accept_transition(state, transition):
         """
 
         :param SimState state:
@@ -85,7 +84,7 @@ class Bucketizer(ExplorationTechnique):
         :return:
         """
 
-        t = self._get_transition_dict(state)
+        t = Bucketizer._get_transition_dict(state)
 
         if t[transition] == 0:
             _l.error("Impossible: Transition %s has 0 occurrences.", transition)

angr/exploration_techniques/common.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from .. import engines
-from ..errors import SimError, AngrError, AngrExplorationTechniqueError
+from angr import engines
+from angr.errors import SimError, AngrError, AngrExplorationTechniqueError
 
 
 def condition_to_lambda(condition, default=False):

angr/exploration_techniques/director.py

@@ -6,10 +6,10 @@ import networkx
 
 import claripy
 
-from ..sim_type import SimType, SimTypePointer, SimTypeChar, SimTypeString, SimTypeReg
-from ..calling_conventions import default_cc
-from ..knowledge_base import KnowledgeBase
-from ..errors import AngrDirectorError
+from angr.sim_type import SimType, SimTypePointer, SimTypeChar, SimTypeString, SimTypeReg
+from angr.calling_conventions import default_cc
+from angr.knowledge_base import KnowledgeBase
+from angr.errors import AngrDirectorError
 from . import ExplorationTechnique
 
 l = logging.getLogger(name=__name__)

angr/exploration_techniques/driller_core.py

@@ -94,8 +94,7 @@ class DrillerCore(ExplorationTechnique):
     @staticmethod
     def _has_false(state):
         # Check if the state is unsat even if we remove preconstraints.
-        claripy_false = claripy.false
-        if state.scratch.guard.cache_key == claripy_false.cache_key:
+        if state.scratch.guard.identical(claripy.false()):
             return True
 
-        return any(c.cache_key == claripy_false.cache_key for c in state.solver.constraints)
+        return any(c.identical(claripy.false()) for c in state.solver.constraints)

angr/exploration_techniques/explorer.py

@@ -4,8 +4,8 @@ import claripy
 
 from . import ExplorationTechnique
 from .common import condition_to_lambda
-from .. import sim_options
-from ..state_plugins.sim_event import resource_event
+from angr import sim_options
+from angr.state_plugins.sim_event import resource_event
 
 l = logging.getLogger(name=__name__)
 
@@ -48,7 +48,7 @@ class Explorer(ExplorationTechnique):
         self._warned_unicorn = False
 
         # TODO: This is a hack for while CFGFast doesn't handle procedure continuations
-        from .. import analyses  # pylint: disable=import-outside-toplevel
+        from angr import analyses  # pylint: disable=import-outside-toplevel
 
         if isinstance(cfg, analyses.CFGFast):
             l.error("CFGFast is currently inappropriate for use with Explorer.")

angr/exploration_techniques/loop_seer.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import logging
 
 from . import ExplorationTechnique
-from ..knowledge_base import KnowledgeBase
-from ..knowledge_plugins.functions import Function
+from angr.knowledge_base import KnowledgeBase
+from angr.knowledge_plugins.functions import Function
 
 
 l = logging.getLogger(name=__name__)
@@ -233,4 +233,4 @@ class LoopSeer(ExplorationTechnique):
         return f
 
 
-from ..analyses.loopfinder import Loop
+from angr.analyses.loopfinder import Loop

angr/exploration_techniques/oppologist.py

@@ -6,9 +6,9 @@ import logging
 
 l = logging.getLogger(name=__name__)
 
-from ..errors import AngrError, SimError, SimUnsupportedError, SimCCallError
-from .. import sim_options
-from ..engines.successors import SimSuccessors
+from angr.errors import AngrError, SimError, SimUnsupportedError, SimCCallError
+from angr import sim_options
+from angr.engines.successors import SimSuccessors
 
 exc_list = (AngrError, SimError, claripy.ClaripyError, TypeError, ValueError, ArithmeticError, MemoryError)
 

angr/exploration_techniques/slicecutor.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..errors import AngrExitError
+from angr.errors import AngrExitError
 from . import ExplorationTechnique
 
 import logging

angr/exploration_techniques/spiller.py

@@ -279,4 +279,4 @@ class Spiller(ExplorationTechnique):
         return id(state)
 
 
-from .. import vaults
+from angr import vaults

angr/exploration_techniques/suggestions.py

@@ -3,10 +3,10 @@ import logging
 import claripy
 
 from . import ExplorationTechnique
-from ..misc.ux import once
-from ..misc.picklable_lock import PicklableLock
-from ..state_plugins.sim_action import SimActionConstraint
-from ..state_plugins.sim_action_object import SimActionObject
+from angr.misc.ux import once
+from angr.misc.picklable_lock import PicklableLock
+from angr.state_plugins.sim_action import SimActionConstraint
+from angr.state_plugins.sim_action_object import SimActionObject
 
 l = logging.getLogger(__name__)
 
@@ -20,12 +20,12 @@ def ast_weight(ast, memo=None):
     if memo is None:
         memo = {}
 
-    result = memo.get(ast.cache_key, None)
+    result = memo.get(ast.hash(), None)
     if result is not None:
         return result
 
     result = 1 + sum(ast_weight(arg, memo) for arg in ast.args)
-    memo[ast.cache_key] = result
+    memo[ast.hash()] = result
     return result
 
 

angr/exploration_techniques/symbion.py

@@ -4,7 +4,6 @@ from .common import condition_to_lambda
 from . import ExplorationTechnique
 
 l = logging.getLogger("angr.exploration_techniques.symbion")
-# l.setLevel(logging.DEBUG)
 
 
 class Symbion(ExplorationTechnique):

angr/exploration_techniques/threading.py

@@ -4,8 +4,8 @@ import concurrent.futures
 import logging
 
 from . import ExplorationTechnique
-from ..engines.engine import TLSMixin
-from ..misc.ux import once
+from angr.engines.engine import TLSMixin
+from angr.misc.ux import once
 
 l = logging.getLogger(__name__)
 

angr/exploration_techniques/tracer.py

@@ -7,8 +7,8 @@ import claripy
 from capstone import CS_GRP_CALL, CS_GRP_IRET, CS_GRP_JUMP, CS_GRP_RET
 
 from . import ExplorationTechnique
-from .. import BP_BEFORE, BP_AFTER, sim_options
-from ..errors import AngrTracerError, SimIRSBNoDecodeError
+from angr import BP_BEFORE, BP_AFTER, sim_options
+from angr.errors import AngrTracerError, SimIRSBNoDecodeError
 
 if TYPE_CHECKING:
     from angr.sim_state import SimState
@@ -60,7 +60,7 @@ class RepHook:
         return p.execute(state, None, arguments=e_args)
 
     def run(self, state):
-        from .. import SIM_PROCEDURES  # pylint: disable=import-outside-toplevel
+        from angr import SIM_PROCEDURES  # pylint: disable=import-outside-toplevel
 
         dst = state.regs.edi if state.arch.name == "X86" else state.regs.rdi
 

angr/exploration_techniques/veritesting.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from . import ExplorationTechnique
 
-from ..sim_options import EFFICIENT_STATE_MERGING
+from angr.sim_options import EFFICIENT_STATE_MERGING
 
 
 class Veritesting(ExplorationTechnique):

angr/flirt/__init__.py

@@ -1,7 +1,6 @@
 # This submodule stores and manages FLIRT signatures
 from __future__ import annotations
 
-from typing import Set, List, Dict, Optional
 import os
 import json
 from collections import defaultdict

angr/{knowledge_base/knowledge_base.py → knowledge_base.py}

@@ -7,18 +7,19 @@ import logging
 
 from typing import TYPE_CHECKING, TypeVar
 
+from .knowledge_plugins.plugin import default_plugins, KnowledgeBasePlugin
+
 if TYPE_CHECKING:
-    from ..project import Project
-    from ..knowledge_plugins import FunctionManager
-    from ..knowledge_plugins import VariableManager
-    from ..knowledge_plugins import KeyDefinitionManager
-    from ..knowledge_plugins import CFGManager
-    from ..knowledge_plugins import StructuredCodeManager
-    from ..knowledge_plugins import TypesStore
-    from ..knowledge_plugins import PropagationManager
-    from ..knowledge_plugins import XRefManager
-
-from ..knowledge_plugins.plugin import default_plugins, KnowledgeBasePlugin
+    from .project import Project
+    from .knowledge_plugins import FunctionManager
+    from .knowledge_plugins import VariableManager
+    from .knowledge_plugins import KeyDefinitionManager
+    from .knowledge_plugins import CFGManager
+    from .knowledge_plugins import StructuredCodeManager
+    from .knowledge_plugins import TypesStore
+    from .knowledge_plugins import PropagationManager
+    from .knowledge_plugins import XRefManager
+
 
 l = logging.getLogger(name=__name__)
 
@@ -131,10 +132,7 @@ class KnowledgeBase:
         :return: Instance of the requested plugin class or null if it is not a known plugin
         """
         # Get first plugin of this type already registered, or default to None
-        return next(
-            filter(lambda registered_plugin: type(registered_plugin) == requested_plugin_cls, self._plugins.values()),
-            None,
-        )
+        return next((plugin for plugin in self._plugins.values() if isinstance(plugin, requested_plugin_cls)), None)
 
     def request_knowledge(self, requested_plugin_cls: type[K]) -> K:
         existing = self.get_knowledge(requested_plugin_cls)

angr/knowledge_plugins/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from .functions import FunctionManager, Function
 from .variables import VariableManager
 from .debug_variables import DebugVariableManager
@@ -9,7 +10,6 @@ from .labels import Labels
 from .cfg import CFGManager
 from .xrefs import XRefManager
 from .plugin import KnowledgeBasePlugin
-from .sync import SyncController
 from .patches import PatchManager
 from .key_definitions import KeyDefinitionManager
 from .propagations import PropagationManager
@@ -17,3 +17,25 @@ from .structured_code import StructuredCodeManager
 from .types import TypesStore
 from .callsite_prototypes import CallsitePrototypes
 from .custom_strings import CustomStrings
+
+
+__all__ = (
+    "FunctionManager",
+    "Function",
+    "VariableManager",
+    "DebugVariableManager",
+    "Comments",
+    "Data",
+    "IndirectJumps",
+    "Labels",
+    "CFGManager",
+    "XRefManager",
+    "KnowledgeBasePlugin",
+    "PatchManager",
+    "KeyDefinitionManager",
+    "PropagationManager",
+    "StructuredCodeManager",
+    "TypesStore",
+    "CallsitePrototypes",
+    "CustomStrings",
+)

angr/knowledge_plugins/callsite_prototypes.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from .plugin import KnowledgeBasePlugin
-from ..sim_type import SimTypeFunction
-from ..calling_conventions import SimCC
+from angr.sim_type import SimTypeFunction
+from angr.calling_conventions import SimCC
 
 
 class CallsitePrototypes(KnowledgeBasePlugin):

angr/knowledge_plugins/cfg/cfg_manager.py

@@ -3,7 +3,7 @@ from collections import defaultdict
 
 from archinfo.arch_arm import is_arm_arch
 
-from ..plugin import KnowledgeBasePlugin
+from angr.knowledge_plugins.plugin import KnowledgeBasePlugin
 from .cfg_model import CFGModel
 
 

angr/knowledge_plugins/cfg/cfg_model.py

@@ -13,12 +13,12 @@ import networkx
 
 import cle
 
-from ...engines.vex.lifter import VEX_IRSB_MAX_SIZE
-from ...misc.ux import once
-from ...protos import cfg_pb2, primitives_pb2
-from ...serializable import Serializable
-from ...utils.enums_conv import cfg_jumpkind_to_pb, cfg_jumpkind_from_pb
-from ...errors import AngrCFGError
+from angr.engines.vex.lifter import VEX_IRSB_MAX_SIZE
+from angr.misc.ux import once
+from angr.protos import cfg_pb2, primitives_pb2
+from angr.serializable import Serializable
+from angr.utils.enums_conv import cfg_jumpkind_to_pb, cfg_jumpkind_from_pb
+from angr.errors import AngrCFGError
 from .cfg_node import CFGNode
 from .memory_data import MemoryData, MemoryDataSort
 from .indirect_jump import IndirectJump
@@ -721,7 +721,8 @@ class CFGModel(Serializable):
                             new_data_found = True
 
             else:
-                memory_data.size = memory_data.max_size
+                if memory_data.max_size is not None:
+                    memory_data.size = memory_data.max_size
 
             if seg_list is not None:
                 seg_list.occupy(data_addr, memory_data.size, memory_data.sort)

angr/knowledge_plugins/cfg/indirect_jump.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ...serializable import Serializable
+from angr.serializable import Serializable
 
 
 class IndirectJumpType:

angr/knowledge_plugins/cfg/memory_data.py

@@ -1,7 +1,7 @@
 # pylint:disable=no-member
 from __future__ import annotations
-from ...protos import cfg_pb2
-from ...serializable import Serializable
+from angr.protos import cfg_pb2
+from angr.serializable import Serializable
 
 
 class MemoryDataSort:
@@ -16,6 +16,7 @@ class MemoryDataSort:
     GOTPLTEntry = "GOT PLT Entry"
     ELFHeader = "elf-header"
     FloatingPoint = "fp"  # the size is determined by the MemoryData itself
+    Alignment = "alignment"
 
 
 _SORT_TO_IDX = {

angr/knowledge_plugins/debug_variables.py

@@ -11,7 +11,7 @@ from cle.backends.elf.elf import ELF
 from .plugin import KnowledgeBasePlugin
 
 if TYPE_CHECKING:
-    from ..knowledge_base import KnowledgeBase
+    from angr.knowledge_base import KnowledgeBase
 
 l = logging.getLogger(name=__name__)
 
@@ -150,7 +150,7 @@ class DebugVariableManager(KnowledgeBasePlugin):
         return self._dvar_containers[var_name]
 
     def __getitem__(self, var_name):
-        assert type(var_name) == str
+        assert isinstance(var_name, str)
         return self.from_name(var_name)
 
     def add_variable(self, cle_var: Variable, low_pc: int, high_pc: int):

angr/knowledge_plugins/functions/__init__.py

@@ -1,3 +1,9 @@
 from __future__ import annotations
+
 from .function import Function
 from .function_manager import FunctionManager
+
+__all__ = (
+    "Function",
+    "FunctionManager",
+)

angr/knowledge_plugins/functions/function.py

@@ -15,21 +15,21 @@ import claripy
 from angr.block import Block
 from angr.knowledge_plugins.cfg.memory_data import MemoryDataSort
 
-from ...codenode import CodeNode, BlockNode, HookNode, SyscallNode
-from ...serializable import Serializable
-from ...errors import AngrValueError, SimEngineError, SimMemoryError
-from ...procedures import SIM_LIBRARIES
-from ...procedures.definitions import SimSyscallLibrary
-from ...protos import function_pb2
-from ...calling_conventions import DEFAULT_CC, default_cc
-from ...misc.ux import deprecated
+from angr.codenode import CodeNode, BlockNode, HookNode, SyscallNode
+from angr.serializable import Serializable
+from angr.errors import AngrValueError, SimEngineError, SimMemoryError
+from angr.procedures import SIM_LIBRARIES
+from angr.procedures.definitions import SimSyscallLibrary
+from angr.protos import function_pb2
+from angr.calling_conventions import DEFAULT_CC, default_cc
+from angr.misc.ux import deprecated
 from .function_parser import FunctionParser
 
 l = logging.getLogger(name=__name__)
 
-from ...sim_type import SimTypeFunction, parse_defns
-from ...calling_conventions import SimCC
-from ...project import Project
+from angr.sim_type import SimTypeFunction, parse_defns
+from angr.calling_conventions import SimCC
+from angr.project import Project
 import contextlib
 
 
@@ -1398,7 +1398,7 @@ class Function(Serializable):
                 original_successors = list(graph.out_edges([n], data=True))
 
                 for _, d, data in original_successors:
-                    ins_addr = data.get("ins_addr", data.get("pseudo_ins_addr", None))
+                    ins_addr = data.get("ins_addr", None)
                     if ins_addr is not None and ins_addr < d.addr:
                         continue
                     if d not in graph[smallest_node]:
@@ -1432,15 +1432,20 @@ class Function(Serializable):
                 new_successors = [i for i in all_nodes if i.addr == smallest_node.addr]
                 if new_successors:
                     new_successor = new_successors[0]
+                    new_ins_addrs = self.project.factory.block(new_node.addr, size=new_node.size).instruction_addrs
+                    if self.project.arch.branch_delay_slot and len(new_ins_addrs) >= 2:
+                        new_ins_addr = new_ins_addrs[-2]
+                    elif len(new_ins_addrs) >= 1:
+                        new_ins_addr = new_ins_addrs[-1]
+                    else:
+                        # the new node is somehow not decode-able
+                        new_ins_addr = new_node.addr + new_node.size - 1
                     graph.add_edge(
                         new_node,
                         new_successor,
                         type="transition",
                         outside=is_outside_node,
-                        # it's named "pseudo_ins_addr" because we have no way to know what the actual last
-                        # instruction is at this moment (without re-lifting the block, which would be a
-                        # waste of time).
-                        pseudo_ins_addr=new_node.addr + new_node.size - 1,
+                        ins_addr=new_ins_addr,
                     )
                 else:
                     # We gotta create a new one

angr/knowledge_plugins/functions/function_manager.py

@@ -12,8 +12,8 @@ import networkx
 
 from archinfo.arch_soot import SootMethodDescriptor
 
-from ...errors import SimEngineError
-from ..plugin import KnowledgeBasePlugin
+from angr.errors import SimEngineError
+from angr.knowledge_plugins.plugin import KnowledgeBasePlugin
 from .function import Function
 from .soot_function import SootFunction
 

angr/knowledge_plugins/functions/function_parser.py

@@ -5,9 +5,9 @@ import pickle
 
 from collections import defaultdict
 
-from ...codenode import BlockNode, HookNode
-from ...utils.enums_conv import func_edge_type_to_pb, func_edge_type_from_pb
-from ...protos import primitives_pb2, function_pb2
+from angr.codenode import BlockNode, HookNode
+from angr.utils.enums_conv import func_edge_type_to_pb, func_edge_type_from_pb
+from angr.protos import primitives_pb2, function_pb2
 
 l = logging.getLogger(name=__name__)
 

angr/knowledge_plugins/functions/soot_function.py

@@ -126,5 +126,5 @@ class SootFunction(Function):
                 self._addr_to_block_node[node.addr] = node
 
 
-from ...codenode import BlockNode
-from ...errors import AngrValueError
+from angr.codenode import BlockNode
+from angr.errors import AngrValueError

angr/knowledge_plugins/key_definitions/atoms.py

@@ -5,8 +5,8 @@ import claripy
 import ailment
 from archinfo import Arch, RegisterOffset
 
-from ...calling_conventions import SimFunctionArgument, SimRegArg, SimStackArg
-from ...engines.light import SpOffset
+from angr.calling_conventions import SimFunctionArgument, SimRegArg, SimStackArg
+from angr.engines.light import SpOffset
 from .heap_address import HeapAddress
 
 

angr/knowledge_plugins/key_definitions/definition.py

@@ -10,11 +10,11 @@ from angr.sim_variable import SimStackVariable
 from angr.sim_variable import SimRegisterVariable
 from angr.misc.ux import once
 
-from ...engines.light import SpOffset
-from ...code_location import CodeLocation, ExternalCodeLocation
+from angr.engines.light import SpOffset
+from angr.code_location import CodeLocation, ExternalCodeLocation
 from .atoms import Atom, MemoryLocation, Register, Tmp, AtomKind, atom_kind_mapping, VirtualVariable
 from .tag import Tag
-from ...sim_variable import SimVariable
+from angr.sim_variable import SimVariable
 
 log = logging.getLogger(__name__)
 

angr/knowledge_plugins/key_definitions/key_definition_manager.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from collections.abc import Iterable
 
-from .. import KnowledgeBasePlugin
+from angr.knowledge_plugins import KnowledgeBasePlugin
 from .rd_model import ReachingDefinitionsModel
 from .constants import OP_BEFORE, OP_AFTER
 
 if TYPE_CHECKING:
-    from ...knowledge_base import KnowledgeBase
+    from angr.knowledge_base import KnowledgeBase
 
 
 class RDAObserverControl:

angr/knowledge_plugins/key_definitions/uses.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 from typing import Any, TYPE_CHECKING
 
-from ...utils.cowdict import DefaultChainMapCOW
-from ...code_location import CodeLocation
+from angr.utils.cowdict import DefaultChainMapCOW
+from angr.code_location import CodeLocation
 
 if TYPE_CHECKING:
     from .definition import Definition