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

angr/exploration_techniques/threading.py

@@ -1,4 +1,5 @@
 # pylint: disable=cell-var-from-loop
+from __future__ import annotations
 import concurrent.futures
 import logging
 

angr/exploration_techniques/timeout.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import time
 import logging
 from . import ExplorationTechnique

angr/exploration_techniques/tracer.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
 from typing import TYPE_CHECKING
 import logging
 import cle
 
+import claripy
 from capstone import CS_GRP_CALL, CS_GRP_IRET, CS_GRP_JUMP, CS_GRP_RET
 
 from . import ExplorationTechnique
@@ -53,7 +55,7 @@ class RepHook:
 
     @staticmethod
     def _inline_call(state, procedure, *arguments, **kwargs):
-        e_args = [state.solver.BVV(a, state.arch.bits) if isinstance(a, int) else a for a in arguments]
+        e_args = [claripy.BVV(a, state.arch.bits) if isinstance(a, int) else a for a in arguments]
         p = procedure(project=state.project, **kwargs)
         return p.execute(state, None, arguments=e_args)
 
@@ -77,7 +79,7 @@ class RepHook:
                 val = state.regs.rax
                 multiplier = 8
             else:
-                raise NotImplementedError("Unsupported mnemonic %s" % self.mnemonic)
+                raise NotImplementedError(f"Unsupported mnemonic {self.mnemonic}")
 
             size = (state.regs.ecx if state.arch.name == "X86" else state.regs.rcx) * multiplier
 
@@ -104,7 +106,7 @@ class RepHook:
             elif self.mnemonic == "movsq":
                 multiplier = 8
             else:
-                raise NotImplementedError("Unsupported mnemonic %s" % self.mnemonic)
+                raise NotImplementedError(f"Unsupported mnemonic {self.mnemonic}")
 
             size = (state.regs.ecx if state.arch.name == "X86" else state.regs.rcx) * multiplier
 
@@ -121,7 +123,7 @@ class RepHook:
                 state.regs.rcx = 0
 
         else:
-            raise NotImplementedError("Unsupported mnemonic %s" % self.mnemonic)
+            raise NotImplementedError(f"Unsupported mnemonic {self.mnemonic}")
 
 
 class Tracer(ExplorationTechnique):
@@ -185,7 +187,7 @@ class Tracer(ExplorationTechnique):
         self._fd_bytes = None
 
         # keep track of the last basic block we hit
-        self.predecessors: list["SimState"] = [None] * keep_predecessors
+        self.predecessors: list[SimState] = [None] * keep_predecessors
         self.last_state = None
 
         # whether we should follow the trace
@@ -253,15 +255,15 @@ class Tracer(ExplorationTechnique):
 
                 if len(possibilities) == 0:
                     raise AngrTracerError(
-                        "Trace does not seem to contain object initializers for %s. "
-                        "Do you want to have a Tracer(aslr=False)?" % obj
+                        f"Trace does not seem to contain object initializers for {obj}. "
+                        "Do you want to have a Tracer(aslr=False)?"
                     )
                 if len(possibilities) == 1:
                     self._aslr_slides[obj] = next(iter(possibilities))
                 else:
                     raise AngrTracerError(
-                        "Trace seems ambiguous with respect to what the ASLR slides are for %s. "
-                        "This is surmountable, please open an issue." % obj
+                        f"Trace seems ambiguous with respect to what the ASLR slides are for {obj}. "
+                        "This is surmountable, please open an issue."
                     )
         else:
             # if we know there is no slides, just trust the address in the loader
@@ -278,11 +280,10 @@ class Tracer(ExplorationTechnique):
         legal_next = block.vex.constant_jump_targets
         if legal_next:
             return any(a + slide == self._trace[idx + 1] for a in legal_next)
-        else:
-            # the intuition is that if the first block of an initializer does an indirect jump,
-            # it's probably a call out to another binary (notably __libc_start_main)
-            # this is an awful fucking heuristic but it's as good as we've got
-            return abs(self._trace[idx] - self._trace[idx + 1]) > 0x1000
+        # the intuition is that if the first block of an initializer does an indirect jump,
+        # it's probably a call out to another binary (notably __libc_start_main)
+        # this is an awful fucking heuristic but it's as good as we've got
+        return abs(self._trace[idx] - self._trace[idx + 1]) > 0x1000
 
     def set_fd_data(self, fd_data: dict[int, bytes]):
         """
@@ -521,7 +522,7 @@ class Tracer(ExplorationTechnique):
         self._update_state_tracking(res[0])
         return res[0]
 
-    def _update_state_tracking(self, state: "SimState"):
+    def _update_state_tracking(self, state: SimState):
         idx = state.globals["trace_idx"]
         sync = state.globals["sync_idx"]
         timer = state.globals["sync_timer"]
@@ -588,8 +589,8 @@ class Tracer(ExplorationTechnique):
                 state.globals["sync_timer"] = timer
             else:
                 raise Exception(
-                    "Trace failed to synchronize! We expected it to hit %#x (trace addr), "
-                    "but it failed to do this within a timeout" % self._trace[sync]
+                    f"Trace failed to synchronize! We expected it to hit {self._trace[sync]:#x} (trace addr), "
+                    "but it failed to do this within a timeout"
                 )
 
         elif state.history.jumpkind.startswith("Ijk_Exit"):
@@ -692,22 +693,21 @@ class Tracer(ExplorationTechnique):
         current_bin = self.project.loader.find_object_containing(state_addr)
         if current_bin is self.project.loader._extern_object or current_bin is self.project.loader._kernel_object:
             return False
-        elif current_bin in self._aslr_slides:
+        if current_bin in self._aslr_slides:
             self._current_slide = self._aslr_slides[current_bin]
             return trace_addr == state_addr + self._current_slide
-        elif ((trace_addr - state_addr) & 0xFFF) == 0:
+        if ((trace_addr - state_addr) & 0xFFF) == 0:
             self._aslr_slides[current_bin] = self._current_slide = trace_addr - state_addr
             return True
         # error handling
-        elif current_bin:
+        if current_bin:
             raise AngrTracerError(
-                "Trace desynced on jumping into %s. "
-                "Did you load the right version of this library?" % current_bin.provides
+                f"Trace desynced on jumping into {current_bin.provides}. "
+                "Did you load the right version of this library?"
             )
-        else:
-            raise AngrTracerError("Trace desynced on jumping into %#x, where no library is mapped!" % state_addr)
+        raise AngrTracerError(f"Trace desynced on jumping into {state_addr:#x}, where no library is mapped!")
 
-    def _check_qemu_block_in_unicorn_block(self, state: "SimState", trace_curr_idx, state_desync_block_idx):
+    def _check_qemu_block_in_unicorn_block(self, state: SimState, trace_curr_idx, state_desync_block_idx):
         """
         Check if desync occurred because unicorn block was split into multiple blocks in qemu tracer. If yes, find the
         correct increment for trace index
@@ -748,7 +748,7 @@ class Tracer(ExplorationTechnique):
 
         return (True, next_contain_index - trace_curr_idx)
 
-    def _check_qemu_unicorn_large_block_split(self, state: "SimState", trace_curr_idx, state_desync_block_idx):
+    def _check_qemu_unicorn_large_block_split(self, state: SimState, trace_curr_idx, state_desync_block_idx):
         """
         Check if desync occurred because large blocks are split up at different instructions by qemu and unicorn. This
         is done by reconstructing part of block executed so far from the trace and state history and checking if they
@@ -794,7 +794,7 @@ class Tracer(ExplorationTechnique):
 
             if state_history_block_addr == big_block_start_addr:
                 # We found start of the big block and no control flow statements in between that and the block where
-                # desync happend.
+                # desync happened.
                 break
 
         # Let's find the address of the last byte of the big basic block using VEX lifter
@@ -823,8 +823,7 @@ class Tracer(ExplorationTechnique):
                     if angr_big_block_end_addr != big_block_end_addr:
                         # End does not match. Treat as trace desync.
                         return False
-                    else:
-                        break
+                    break
 
             if big_block_end_addr is not None:
                 break
@@ -873,15 +872,14 @@ class Tracer(ExplorationTechnique):
                 if self._trace[idx + 1] - slide == state.addr:
                     state.globals["trace_idx"] = idx + 1
                     return True
-                else:
-                    state.globals["trace_idx"] = idx
-                    # state.globals['trace_desync'] = True
-                    return True
+                state.globals["trace_idx"] = idx
+                # state.globals['trace_desync'] = True
+                return True
 
             # Case 2: trace block contains more instructions than angr
             # block.  Caused by VEX's maximum instruction limit of 99
             # instructions
-            elif (
+            if (
                 state.project.factory.block(state.history.addr).instructions == VEXMaxInsnsPerBlock
                 and state.history.jumpkind == "Ijk_Boring"
             ):
@@ -903,10 +901,9 @@ class Tracer(ExplorationTechnique):
 
         if prev_obj is not None:
             prev_section = prev_obj.find_section_containing(prev_addr)
-            if prev_section is not None:
-                if prev_section.name in (".plt",):
-                    l.info("...syncing at PLT callsite (type 2)")
-                    return self._sync_return(state, idx, assert_obj=prev_obj)
+            if prev_section is not None and prev_section.name in (".plt",):
+                l.info("...syncing at PLT callsite (type 2)")
+                return self._sync_return(state, idx, assert_obj=prev_obj)
 
         l.info("...all analyses failed.")
         return False
@@ -959,8 +956,7 @@ class Tracer(ExplorationTechnique):
                 state.globals["is_desync"] = True
                 return
             raise AngrTracerError(
-                "Trace failed to synchronize during fast forward? You might want to unhook %s."
-                % (self.project.hooked_by(state.history.addr).display_name)
+                f"Trace failed to synchronize during fast forward? You might want to unhook {self.project.hooked_by(state.history.addr).display_name}."
             ) from e
         else:
             state.globals["trace_idx"] = target_idx

angr/exploration_techniques/unique.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from difflib import SequenceMatcher
 from collections import Counter
 

angr/exploration_techniques/veritesting.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 
 from ..sim_options import EFFICIENT_STATE_MERGING

angr/factory.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import overload
 import logging
 import archinfo
@@ -58,12 +59,11 @@ class AngrObjectFactory:
             hook = self.project._sim_procedures[addr]
             size = hook.kwargs.get("length", 0)
             return HookNode(addr, size, self.project.hooked_by(addr))
-        elif self.project.simos.is_syscall_addr(addr):
+        if self.project.simos.is_syscall_addr(addr):
             syscall = self.project.simos.syscall_from_addr(addr)
             size = syscall.kwargs.get("length", 0)
             return SyscallNode(addr, size, syscall)
-        else:
-            return self.block(addr, **block_opts).codenode  # pylint: disable=no-member
+        return self.block(addr, **block_opts).codenode  # pylint: disable=no-member
 
     def successors(self, *args, engine=None, **kwargs):
         """
@@ -169,12 +169,12 @@ class AngrObjectFactory:
 
         grow_like_stack controls the behavior of allocating data at alloc_base. When data from args needs to be wrapped
         in a pointer, the pointer needs to point somewhere, so that data is dumped into memory at alloc_base. If you
-        set alloc_base to point to somewhere other than the stack, set grow_like_stack to False so that sequencial
+        set alloc_base to point to somewhere other than the stack, set grow_like_stack to False so that sequential
         allocations happen at increasing addresses.
         """
         return self.project.simos.state_call(addr, *args, **kwargs)
 
-    def simulation_manager(self, thing: list[SimState] | SimState | None = None, **kwargs) -> "SimulationManager":
+    def simulation_manager(self, thing: list[SimState] | SimState | None = None, **kwargs) -> SimulationManager:
         """
         Constructs a new simulation manager.
 
@@ -200,7 +200,7 @@ class AngrObjectFactory:
         elif isinstance(thing, SimState):
             thing = [thing]
         else:
-            raise AngrError("BadType to initialze SimulationManager: %s" % repr(thing))
+            raise AngrError(f"BadType to initialize SimulationManager: {thing!r}")
 
         return SimulationManager(self.project, active_states=thing, **kwargs)
 
@@ -266,7 +266,7 @@ class AngrObjectFactory:
         """
         Return a default function prototype parameterized for this project and SimOS.
         """
-        return SimTypeFunction(tuple(), SimTypeInt()).with_arch(self.project.arch)
+        return SimTypeFunction((), SimTypeInt()).with_arch(self.project.arch)
 
     # pylint: disable=unused-argument, no-self-use, function-redefined
     @overload
@@ -291,7 +291,7 @@ class AngrObjectFactory:
         load_from_ro_regions=False,
         initial_regs=None,
         skip_stmts=False,
-    ) -> "Block": ...
+    ) -> Block: ...
 
     # pylint: disable=unused-argument, no-self-use, function-redefined
     @overload
@@ -314,7 +314,7 @@ class AngrObjectFactory:
         collect_data_refs=False,
         cross_insn_opt=True,
         skip_stmts=False,
-    ) -> "SootBlock": ...
+    ) -> SootBlock: ...
 
     def block(
         self,

angr/flirt/__init__.py

@@ -1,4 +1,5 @@
 # This submodule stores and manages FLIRT signatures
+from __future__ import annotations
 
 from typing import Set, List, Dict, Optional
 import os

angr/flirt/build_sig.py

@@ -1,4 +1,5 @@
 # pylint:disable=consider-using-with
+from __future__ import annotations
 import json
 import subprocess
 import argparse
@@ -97,7 +98,7 @@ def get_unique_strings(ar_path: str) -> list[str]:
     grouped_strings = defaultdict(set)
     for s in all_strings:
         grouped_strings[s[:5]].add(s)
-    sorted_strings = list(sorted(all_strings, key=len, reverse=True))
+    sorted_strings = sorted(all_strings, key=len, reverse=True)
 
     ctr = 0
     picked = set()
@@ -118,10 +119,7 @@ def run_pelf(pelf_path: str, ar_path: str, output_path: str):
 
 
 def run_sigmake(sigmake_path: str, sig_name: str, pat_path: str, sig_path: str):
-    if " " not in sig_name:
-        sig_name_arg = f"-n{sig_name}"
-    else:
-        sig_name_arg = f'-n"{sig_name}"'
+    sig_name_arg = f"-n{sig_name}" if " " not in sig_name else f'-n"{sig_name}"'
 
     proc = subprocess.Popen(
         [sigmake_path, sig_name_arg, pat_path, sig_path],
@@ -130,15 +128,13 @@ def run_sigmake(sigmake_path: str, sig_name: str, pat_path: str, sig_path: str):
     )
     _, stderr = proc.communicate()
 
-    if b"COLLISIONS:" in stderr:
-        return False
-    return True
+    return b"COLLISIONS:" not in stderr
 
 
 def process_exc_file(exc_path: str):
     """
     We are doing the stupidest thing possible: For each batch of conflicts, we pick the most likely
-    result baed on a set of predefined rules.
+    result based on a set of predefined rules.
 
     TODO: Add caller-callee-based de-duplication.
     """
@@ -180,7 +176,7 @@ def process_exc_file(exc_path: str):
             non_cold_names.append(func_name)
 
         # sort it
-        non_cold_names = list(sorted(non_cold_names, key=len))
+        non_cold_names = sorted(non_cold_names, key=len)
 
         # pick the top one
         the_chosen_one = non_cold_names[0]
@@ -222,14 +218,14 @@ def main():
     if args.pelf_path:
         pelf_path = args.pelf_path
     elif "pelf_path" in os.environ:
-        pelf_path = os.environ["pelf_path"]
+        pelf_path = os.environ["PELF_PATH"]
     else:
         raise ValueError("pelf_path must be specified.")
 
     if args.sigmake_path:
         sigmake_path = args.sigmake_path
     elif "sigmake_path" in os.environ:
-        sigmake_path = os.environ["sigmake_path"]
+        sigmake_path = os.environ["SIGMAKE_PATH"]
     else:
         raise ValueError("sigmake_path must be specified.")
 

angr/keyed_region.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
 import logging
 import weakref
-from typing import Union, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from sortedcontainers import SortedDict
 
@@ -17,7 +18,7 @@ class StoredObject:
     def __init__(self, start, obj, size):
         self.start = start
         self.obj = obj
-        self.size: Union["UnknownSize", int] = size
+        self.size: UnknownSize | int = size
 
     def __eq__(self, other):
         assert type(other) is StoredObject
@@ -28,7 +29,7 @@ class StoredObject:
         return hash((self.start, self.size, self.obj))
 
     def __repr__(self):
-        return f"<SO {repr(self.obj)}@{self.start:#x}, {self.size} bytes>"
+        return f"<SO {self.obj!r}@{self.start:#x}, {self.size} bytes>"
 
     @property
     def obj_id(self):
@@ -101,8 +102,7 @@ class RegionObject:
         self.add_object(obj)
 
     def copy(self):
-        ro = RegionObject(self.start, self.size, objects=self.stored_objects.copy())
-        return ro
+        return RegionObject(self.start, self.size, objects=self.stored_objects.copy())
 
 
 class KeyedRegion:
@@ -167,11 +167,7 @@ class KeyedRegion:
         if set(self._storage.keys()) != set(other._storage.keys()):
             return False
 
-        for k, v in self._storage.items():
-            if v != other._storage[k]:
-                return False
-
-        return True
+        return all(v == other._storage[k] for k, v in self._storage.items())
 
     def copy(self):
         if not self._storage:
@@ -327,8 +323,7 @@ class KeyedRegion:
         base_addr, container = self._get_container(addr)
         if container is None:
             return None
-        else:
-            return base_addr
+        return base_addr
 
     def get_variables_by_offset(self, start):
         """
@@ -342,8 +337,7 @@ class KeyedRegion:
         _, container = self._get_container(start)
         if container is None:
             return set()
-        else:
-            return container.internal_objects
+        return container.internal_objects
 
     def get_objects_by_offset(self, start):
         """
@@ -356,8 +350,7 @@ class KeyedRegion:
         _, container = self._get_container(start)
         if container is None:
             return set()
-        else:
-            return container.internal_objects
+        return container.internal_objects
 
     def get_all_variables(self):
         """
@@ -375,7 +368,7 @@ class KeyedRegion:
     # Private methods
     #
 
-    def _canonicalize_size(self, size: Union[int, "UnknownSize"]) -> int:
+    def _canonicalize_size(self, size: int | UnknownSize) -> int:
         # delayed import
         from .knowledge_plugins.key_definitions.unknown_size import (
             UnknownSize,

angr/knowledge_base/__init__.py

@@ -1 +1,2 @@
+from __future__ import annotations
 from .knowledge_base import KnowledgeBase

angr/knowledge_base/knowledge_base.py

@@ -1,5 +1,7 @@
 """Representing the artifacts of a project."""
 
+from __future__ import annotations
+
 from itertools import count
 import logging
 
@@ -30,15 +32,15 @@ class KnowledgeBase:
     Contains things like a CFG, data references, etc.
     """
 
-    functions: "FunctionManager"
-    variables: "VariableManager"
-    structured_code: "StructuredCodeManager"
-    defs: "KeyDefinitionManager"
-    cfgs: "CFGManager"
-    _project: "Project"
-    types: "TypesStore"
-    propagations: "PropagationManager"
-    xrefs: "XRefManager"
+    functions: FunctionManager
+    variables: VariableManager
+    structured_code: StructuredCodeManager
+    defs: KeyDefinitionManager
+    cfgs: CFGManager
+    _project: Project
+    types: TypesStore
+    propagations: PropagationManager
+    xrefs: XRefManager
 
     def __init__(self, project, obj=None, name=None):
         if obj is not None:
@@ -65,11 +67,10 @@ class KnowledgeBase:
         object.__setattr__(self, "_plugins", state["plugins"])
 
     def __getstate__(self):
-        s = {
+        return {
             "project": self._project,
             "plugins": self._plugins,
         }
-        return s
 
     def __dir__(self):
         x = list(super().__dir__())
@@ -86,8 +87,8 @@ class KnowledgeBase:
     def __getattr__(self, v):
         try:
             return self.get_plugin(v)
-        except KeyError:
-            raise AttributeError(v)
+        except KeyError as err:
+            raise AttributeError(v) from err
 
     def __setattr__(self, k, v):
         self.register_plugin(k, v)
@@ -139,7 +140,6 @@ class KnowledgeBase:
         existing = self.get_knowledge(requested_plugin_cls)
         if existing is not None:
             return existing
-        else:
-            p = requested_plugin_cls(self)
-            self.register_plugin(requested_plugin_cls.__name__, p)
-            return p
+        p = requested_plugin_cls(self)
+        self.register_plugin(requested_plugin_cls.__name__, p)
+        return p

angr/knowledge_plugins/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .functions import FunctionManager, Function
 from .variables import VariableManager
 from .debug_variables import DebugVariableManager

angr/knowledge_plugins/callsite_prototypes.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .plugin import KnowledgeBasePlugin
 from ..sim_type import SimTypeFunction
 from ..calling_conventions import SimCC

angr/knowledge_plugins/cfg/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 __all__ = (
     "MemoryDataSort",
     "MemoryData",

angr/knowledge_plugins/cfg/cfg_manager.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from collections import defaultdict
 
 from archinfo.arch_arm import is_arm_arch
@@ -49,7 +50,7 @@ class CFGManager(KnowledgeBasePlugin):
 
     def copy(self):
         cm = CFGManager(self._kb)
-        cm.cfgs = dict(map(lambda x: (x[0], x[1].copy()), self.cfgs.items()))
+        cm.cfgs = {x[0]: x[1].copy() for x in self.cfgs.items()}
         return cm
 
     def get_most_accurate(self) -> CFGModel | None: