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

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

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:
@@ -31,6 +31,7 @@ _SORT_TO_IDX = {
     MemoryDataSort.GOTPLTEntry: cfg_pb2.MemoryData.GOTPLTEntry,
     MemoryDataSort.ELFHeader: cfg_pb2.MemoryData.ELFHeader,
     MemoryDataSort.FloatingPoint: cfg_pb2.MemoryData.FloatingPoint,
+    MemoryDataSort.Alignment: cfg_pb2.MemoryData.Alignment,
 }
 
 _IDX_TO_SORT = {v: k for k, v in _SORT_TO_IDX.items()}

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

angr/knowledge_plugins/propagations/__init__.py

@@ -1,3 +1,10 @@
 from __future__ import annotations
+
 from .propagation_model import PropagationModel
 from .propagation_manager import PropagationManager
+
+
+__all__ = (
+    "PropagationModel",
+    "PropagationManager",
+)

angr/knowledge_plugins/propagations/prop_value.py

@@ -6,7 +6,7 @@ import claripy
 import ailment
 
 if TYPE_CHECKING:
-    from ...code_location import CodeLocation
+    from angr.code_location import CodeLocation
 
 
 class Detail:

angr/knowledge_plugins/{structured_code/manager.py → structured_code.py}

@@ -1,8 +1,9 @@
 # pylint:disable=import-outside-toplevel
 from __future__ import annotations
+
 from typing import Any, TYPE_CHECKING
 
-from .. import KnowledgeBasePlugin
+from .plugin import KnowledgeBasePlugin
 
 if TYPE_CHECKING:
     from angr.analyses.decompiler.structured_codegen import BaseStructuredCodeGenerator
@@ -10,6 +11,8 @@ if TYPE_CHECKING:
 
 
 class StructuredCodeManager(KnowledgeBasePlugin):
+    """A knowledge base plugin to store structured code generator results."""
+
     def __init__(self, kb):
         super().__init__(kb=kb)
         self.cached: dict[Any, DecompilationCache] = {}
@@ -25,8 +28,8 @@ class StructuredCodeManager(KnowledgeBasePlugin):
         return self.cached[self._normalize_key(item)]
 
     def __setitem__(self, key, value: DecompilationCache | BaseStructuredCodeGenerator):
-        from ...analyses.decompiler.structured_codegen import BaseStructuredCodeGenerator
-        from ...analyses.decompiler.decompilation_cache import DecompilationCache
+        from angr.analyses.decompiler.structured_codegen import BaseStructuredCodeGenerator
+        from angr.analyses.decompiler.decompilation_cache import DecompilationCache
 
         nkey = self._normalize_key(key)
 

angr/knowledge_plugins/types.py

@@ -3,7 +3,7 @@ import random
 from collections import UserDict
 
 from .plugin import KnowledgeBasePlugin
-from ..sim_type import ALL_TYPES, TypeRef
+from angr.sim_type import ALL_TYPES, TypeRef
 
 
 FRUITS = [

angr/knowledge_plugins/variables/__init__.py

@@ -1,2 +1,8 @@
 from __future__ import annotations
+
 from .variable_manager import VariableManager, VariableType
+
+__all__ = (
+    "VariableManager",
+    "VariableType",
+)

angr/knowledge_plugins/variables/variable_access.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from ...code_location import CodeLocation
-from ...serializable import Serializable
-from ...protos import variables_pb2
+from angr.code_location import CodeLocation
+from angr.serializable import Serializable
+from angr.protos import variables_pb2
 
 if TYPE_CHECKING:
     from angr.sim_variable import SimVariable

angr/knowledge_plugins/variables/variable_manager.py

@@ -12,10 +12,10 @@ from cle.backends.elf.variable import Variable
 
 from angr.utils.orderedset import OrderedSet
 from angr.utils.ail import is_phi_assignment
-from ...protos import variables_pb2
-from ...serializable import Serializable
-from ...sim_variable import SimVariable, SimStackVariable, SimMemoryVariable, SimRegisterVariable
-from ...sim_type import (
+from angr.protos import variables_pb2
+from angr.serializable import Serializable
+from angr.sim_variable import SimVariable, SimStackVariable, SimMemoryVariable, SimRegisterVariable
+from angr.sim_type import (
     TypeRef,
     SimType,
     SimStruct,
@@ -26,9 +26,9 @@ from ...sim_type import (
     SimTypeInt,
     SimTypeLong,
 )
-from ...keyed_region import KeyedRegion
-from ..plugin import KnowledgeBasePlugin
-from ..types import TypesStore
+from angr.keyed_region import KeyedRegion
+from angr.knowledge_plugins.plugin import KnowledgeBasePlugin
+from angr.knowledge_plugins.types import TypesStore
 from .variable_access import VariableAccess, VariableAccessSort
 
 if TYPE_CHECKING:

angr/knowledge_plugins/xrefs/__init__.py

@@ -1,4 +1,12 @@
 from __future__ import annotations
-from .xref_types import XRefType
+
 from .xref import XRef
 from .xref_manager import XRefManager
+from .xref_types import XRefType
+
+
+__all__ = (
+    "XRef",
+    "XRefManager",
+    "XRefType",
+)

angr/knowledge_plugins/xrefs/xref.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ...serializable import Serializable
-from ...protos import primitives_pb2
+from angr.serializable import Serializable
+from angr.protos import primitives_pb2
 from .xref_types import XRefType
 
 
@@ -83,7 +83,7 @@ class XRef(Serializable):
         # pylint:disable=no-member
 
         # delayed import
-        from ...engines.light import SpOffset  # pylint:disable=import-outside-toplevel
+        from angr.engines.light import SpOffset  # pylint:disable=import-outside-toplevel
 
         cmsg = self._get_cmsg()
         if self.memory_data is not None:
@@ -119,7 +119,7 @@ class XRef(Serializable):
         # Note that we cannot recover _memory_data from cmsg
 
         # delayed import
-        from ...engines.light import SpOffset  # pylint:disable=import-outside-toplevel
+        from angr.engines.light import SpOffset  # pylint:disable=import-outside-toplevel
 
         if not isinstance(bits, int):
             raise TypeError("bits must be provided.")
@@ -150,4 +150,4 @@ class XRef(Serializable):
         )
 
 
-from ..cfg.memory_data import MemoryDataSort
+from angr.knowledge_plugins.cfg.memory_data import MemoryDataSort

angr/knowledge_plugins/xrefs/xref_manager.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 import logging
 from collections import defaultdict
 
-from ...serializable import Serializable
-from ...protos import xrefs_pb2
-from ..plugin import KnowledgeBasePlugin
+from angr.serializable import Serializable
+from angr.protos import xrefs_pb2
+from angr.knowledge_plugins.plugin import KnowledgeBasePlugin
 from .xref import XRef, XRefType
 
 

angr/misc/__init__.py

@@ -1,9 +1,19 @@
 from __future__ import annotations
+
 from . import ux
 from . import autoimport
-from . import weakpatch
 from .loggers import Loggers
-from .range import IRange
 from .plugins import PluginHub, PluginPreset
 from .hookset import HookSet
 from .picklable_lock import PicklableLock
+
+
+__all__ = (
+    "ux",
+    "autoimport",
+    "Loggers",
+    "PluginHub",
+    "PluginPreset",
+    "HookSet",
+    "PicklableLock",
+)

angr/misc/loggers.py

@@ -6,7 +6,7 @@ import zlib
 from .ansi import Color, BackgroundColor, color, clear
 
 from .testing import is_testing
-from ..utils.formatting import ansi_color_enabled
+from angr.utils.formatting import ansi_color_enabled
 
 
 class Loggers:
@@ -118,7 +118,7 @@ class CuteFormatter(logging.Formatter):
 
 def is_enabled_for(logger, level):
     if level == 1:
-        from .. import loggers
+        from angr import loggers
 
         return loggers.profiling_enabled
     return originalIsEnabledFor(logger, level)

angr/procedures/__init__.py

@@ -1,3 +1,12 @@
 from __future__ import annotations
+
 from .procedure_dict import SIM_PROCEDURES, SimProcedures
 from .definitions import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
+
+
+__all__ = (
+    "SIM_PROCEDURES",
+    "SIM_LIBRARIES",
+    "SIM_TYPE_COLLECTIONS",
+    "SimProcedures",
+)

angr/procedures/cgc/receive.py

@@ -5,8 +5,8 @@ import claripy
 
 import angr
 
-from ... import sim_options as o
-from ...state_plugins.sim_action import SimActionData
+from angr import sim_options as o
+from angr.state_plugins.sim_action import SimActionData
 
 fastpath_data_counter = count()
 

angr/procedures/cgc/transmit.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 
 import angr
-from ... import sim_options as o
+from angr import sim_options as o
 
 
 class transmit(angr.SimProcedure):

angr/procedures/definitions/__init__.py

@@ -11,14 +11,14 @@ import itanium_demangler
 
 import archinfo
 
-from ...errors import AngrMissingTypeError
-from ...sim_type import parse_cpp_file, SimTypeFunction, SimTypeBottom
-from ...calling_conventions import DEFAULT_CC
-from ...misc import autoimport
-from ...misc.ux import once
-from ...sim_type import parse_file
-from ..stubs.ReturnUnconstrained import ReturnUnconstrained
-from ..stubs.syscall_stub import syscall as stub_syscall
+from angr.errors import AngrMissingTypeError
+from angr.sim_type import parse_cpp_file, SimTypeFunction, SimTypeBottom
+from angr.calling_conventions import DEFAULT_CC
+from angr.misc import autoimport
+from angr.misc.ux import once
+from angr.sim_type import parse_file
+from angr.procedures.stubs.ReturnUnconstrained import ReturnUnconstrained
+from angr.procedures.stubs.syscall_stub import syscall as stub_syscall
 
 if TYPE_CHECKING:
     from angr.calling_conventions import SimCCSyscall

angr/procedures/definitions/cgc.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from . import SimSyscallLibrary
-from .. import SIM_PROCEDURES as P
+from angr.procedures import SIM_PROCEDURES as P
 
 lib = SimSyscallLibrary()
 lib.set_library_names('cgcabi')

angr/procedures/definitions/glibc.py

@@ -2,21 +2,8 @@
 from __future__ import annotations
 import logging
 
-from ...sim_type import (
-    SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimTypeFixedSizeArray,
-    SimTypeBottom,
-    ALL_TYPES,
-)
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimTypeFixedSizeArray, SimTypeBottom, ALL_TYPES
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary