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

angr/procedures/java_lang/math.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_lang/string.py

@@ -3,9 +3,9 @@ import logging
 
 import claripy
 
-from ..java import JavaSimProcedure
-from ...engines.soot.expressions import SimSootExpr_NewArray
-from ...engines.soot.values import SimSootValue_ArrayRef, SimSootValue_StringRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.expressions import SimSootExpr_NewArray
+from angr.engines.soot.values import SimSootValue_ArrayRef, SimSootValue_StringRef
 
 log = logging.getLogger(name=__name__)
 
@@ -65,7 +65,7 @@ class StringLength(JavaSimProcedure):
     def run(self, this_str):
         log.debug(f"Called SimProcedure java.lang.String.length with args: {this_str}")
 
-        return claripy.StrLen(self.state.memory.load(this_str), 32)
+        return claripy.StrLen(self.state.memory.load(this_str))
 
 
 class StringCharAt(JavaSimProcedure):

angr/procedures/java_lang/stringbuilder.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.values import SimSootValue_StringRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.values import SimSootValue_StringRef
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_lang/system.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import logging
 import claripy
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_util/collection.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.values import SimSootValue_ThisRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.values import SimSootValue_ThisRef
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_util/iterator.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.values import SimSootValue_ThisRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.values import SimSootValue_ThisRef
 from .collection import ELEMS, SIZE, INDEX
 
 log = logging.getLogger(name=__name__)

angr/procedures/java_util/list.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.expressions import SimSootExpr_NewArray
-from ...engines.soot.values import SimSootValue_ThisRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.expressions import SimSootExpr_NewArray
+from angr.engines.soot.values import SimSootValue_ThisRef
 from .collection import ELEMS, SIZE
 
 log = logging.getLogger(name=__name__)

angr/procedures/java_util/map.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.expressions import SimSootExpr_NewArray, SimSootExpr_NullConstant
-from ...engines.soot.values import SimSootValue_StringRef, SimSootValue_ThisRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.expressions import SimSootExpr_NewArray, SimSootExpr_NullConstant
+from angr.engines.soot.values import SimSootValue_StringRef, SimSootValue_ThisRef
 from .collection import ELEMS, SIZE
 
 log = logging.getLogger(name=__name__)

angr/procedures/java_util/random.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import claripy
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 
 class NextInt(JavaSimProcedure):

angr/procedures/java_util/scanner_nextline.py

@@ -3,8 +3,8 @@ import logging
 
 from claripy import StringS
 
-from ...engines.soot.values import SimSootValue_StringRef
-from ..java import JavaSimProcedure
+from angr.engines.soot.values import SimSootValue_StringRef
+from angr.procedures.java import JavaSimProcedure
 
 l = logging.getLogger("angr.procedures.java.scanner.nextLine")
 
@@ -14,7 +14,7 @@ class ScannerNextLine(JavaSimProcedure):
 
     def run(self, this):  # pylint: disable=arguments-differ,unused-argument
         str_ref = SimSootValue_StringRef(self.state.memory.get_new_uuid())
-        self.state.memory.store(str_ref, StringS("scanner_return", 100))
+        self.state.memory.store(str_ref, StringS("scanner_return"))
         # save reference in global dict, so we can easily access it later
         try:
             self.state.globals["java.util.Scanner"].append(str_ref)

angr/procedures/libc/fseek.py

@@ -3,7 +3,7 @@ import claripy
 from cle.backends.externs.simdata.io_file import io_file_data_for_arch
 
 import angr
-from ...errors import SimSolverError
+from angr.errors import SimSolverError
 
 
 class fseek(angr.SimProcedure):

angr/procedures/libc/memcpy.py

@@ -35,4 +35,4 @@ class memcpy(angr.SimProcedure):
         return dst_addr
 
 
-from ...sim_options import ABSTRACT_MEMORY
+from angr.sim_options import ABSTRACT_MEMORY

angr/procedures/libc/strlen.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import logging
+from functools import reduce
 
 import claripy
 
@@ -39,7 +41,7 @@ class strlen(angr.SimProcedure):
             addr_desc: AbstractAddressDescriptor = self.state.memory._normalize_address(s)
 
             # size_t
-            length = claripy.ESI(self.arch.bits)
+            lengths = []
             for s_aw in self.state.memory._concretize_address_descriptor(addr_desc, None):
                 s_ptr = s_aw.to_valueset(self.state)
                 r, c, i = self.state.memory.find(
@@ -65,9 +67,15 @@ class strlen(angr.SimProcedure):
 
                 for r_aw in r_aw_iter:
                     r_ptr = r_aw.to_valueset(self.state)
-                    length = length.union(r_ptr - s_ptr)
-
-            return length
+                    lengths.append(r_ptr - s_ptr)
+
+            match len(lengths):
+                case 0:
+                    return claripy.BVS("unnamed", self.state.arch.bits)
+                case 1:
+                    return lengths[0]
+                case _:
+                    return reduce(claripy.union, lengths)
 
         search_len = max_str_len
         r, c, i = self.state.memory.find(

angr/procedures/libc/strncmp.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import logging
+from functools import reduce
 
 import claripy
 
@@ -152,10 +154,13 @@ class strncmp(angr.SimProcedure):
             return claripy.BVV(0, 32)
 
         if self.state.mode == "static":
-            ret_expr = claripy.ESI(8)
-            for expr in return_values:
-                ret_expr = ret_expr.union(expr)
-
+            match len(return_values):
+                case 0:
+                    ret_expr = claripy.BVS("unnamed", self.state.arch.bits - 24)
+                case 1:
+                    ret_expr = return_values[0]
+                case _:
+                    ret_expr = reduce(claripy.union, return_values)
             ret_expr = ret_expr.sign_extend(24)
 
         else:

angr/procedures/linux_kernel/iovec.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 import angr
-from ..posix.read import read
-from ..posix.write import write
-from ...sim_type import register_types, parse_types
+from angr.procedures.posix.read import read
+from angr.procedures.posix.write import write
+from angr.sim_type import register_types, parse_types
 
 register_types(
     parse_types(

angr/procedures/linux_kernel/mmap.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..posix.mmap import mmap
+from angr.procedures.posix.mmap import mmap
 
 
 class old_mmap(mmap):

angr/procedures/linux_kernel/stat.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import angr
 
-from ...storage.file import Flags
+from angr.storage.file import Flags
 from .fstat import fstat
 
 

angr/procedures/linux_kernel/sysinfo.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import angr
 
-from ...sim_type import SimStruct, SimTypeLong, SimTypeFixedSizeArray, SimTypeShort, SimTypeInt
+from angr.sim_type import SimStruct, SimTypeLong, SimTypeFixedSizeArray, SimTypeShort, SimTypeInt
 
 # struct sysinfo {
 #    long uptime;             /* Seconds since boot */

angr/procedures/linux_kernel/vsyscall.py

@@ -13,4 +13,4 @@ class _vsyscall(angr.SimProcedure):
         else:
             ret_addr = self.state.registers.load(self.state.arch.lr_offset, self.state.arch.bytes)
 
-        self.successors.add_successor(self.state, ret_addr, claripy.true, "Ijk_Sys")
+        self.successors.add_successor(self.state, ret_addr, claripy.true(), "Ijk_Sys")

angr/procedures/posix/bzero.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import claripy
 
-from ..libc import memset
+from angr.procedures.libc import memset
 
 
 class bzero(memset.memset):

angr/procedures/posix/mmap.py

@@ -4,7 +4,7 @@ import logging
 import claripy
 
 import angr
-from ...storage.file import SimFileDescriptor
+from angr.storage.file import SimFileDescriptor
 
 
 l = logging.getLogger(name=__name__)

angr/procedures/posix/send.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 
 import angr
-from ...sim_options import ALLOW_SEND_FAILURES
+from angr.sim_options import ALLOW_SEND_FAILURES
 
 
 class send(angr.SimProcedure):

angr/procedures/posix/syslog.py

@@ -1,14 +1,13 @@
 from __future__ import annotations
 import logging
 
-from ..stubs.format_parser import FormatParser
+from angr.procedures.stubs.format_parser import FormatParser
 
 l = logging.getLogger(name=__name__)
-l.setLevel("INFO")
 
 
 class syslog(FormatParser):
-    def run(self, priority, fmt):
+    def run(self, priority, fmt):  # pylint:disable=arguments-differ
         fmt = self._parse(fmt)
         formatted = fmt.replace(self.va_arg)
         if not formatted.symbolic:

angr/procedures/procedure_dict.py

@@ -4,8 +4,8 @@ import os
 
 l = logging.getLogger(name=__name__)
 
-from ..misc import autoimport
-from ..sim_procedure import SimProcedure
+from angr.misc import autoimport
+from angr.sim_procedure import SimProcedure
 
 # Import all classes under the current directory, and group them based on
 # lib names.

angr/procedures/stubs/Redirect.py

@@ -15,4 +15,4 @@ class Redirect(angr.SimProcedure):
 
         self._custom_name = f"Redirect to 0x{redirect_to:08x}"
         # There is definitely no refs
-        self.add_successor(self.state, redirect_to, claripy.true, "Ijk_Boring")
+        self.add_successor(self.state, redirect_to, claripy.true(), "Ijk_Boring")

angr/procedures/stubs/UserHook.py

@@ -12,7 +12,7 @@ class UserHook(angr.SimProcedure):
         result = user_func(self.state)
         if result is None:
             jumpkind = "Ijk_NoHook" if length == 0 else "Ijk_Boring"
-            self.successors.add_successor(self.state, self.state.addr + length, claripy.true, jumpkind)
+            self.successors.add_successor(self.state, self.state.addr + length, claripy.true(), jumpkind)
         else:
             for state in result:
                 self.successors.add_successor(state, state.addr, state.scratch.guard, state.history.jumpkind)

angr/procedures/stubs/format_parser.py

@@ -6,9 +6,9 @@ import math
 import claripy
 
 from angr.errors import SimProcedureArgumentError, SimProcedureError, SimSolverError
-from ... import sim_type
-from ...sim_procedure import SimProcedure
-from ...storage.file import SimPackets
+from angr import sim_type
+from angr.sim_procedure import SimProcedure
+from angr.storage.file import SimPackets
 
 if TYPE_CHECKING:
     from angr.sim_type import SimType
@@ -130,7 +130,7 @@ class FormatString:
                 if type(component) is bytes:
                     sdata, _ = simfd.read_data(len(component), short_reads=False)
                     self.state.add_constraints(sdata == component)
-                elif isinstance(component, claripy.Bits):
+                elif isinstance(component, claripy.ast.Bits):
                     sdata, _ = simfd.read_data(len(component) // 8, short_reads=False)
                     self.state.add_constraints(sdata == component)
                 elif component.spec_type == b"s":
@@ -556,7 +556,7 @@ class FormatParser(SimProcedure):
         Return the result of invoking the atoi simprocedure on `str_addr`.
         """
 
-        from .. import SIM_PROCEDURES  # pylint:disable=import-outside-toplevel
+        from angr.procedures import SIM_PROCEDURES  # pylint:disable=import-outside-toplevel
 
         strtol = SIM_PROCEDURES["libc"]["strtol"]
 
@@ -567,7 +567,7 @@ class FormatParser(SimProcedure):
         Return the result of invoking the strlen simprocedure on `str_addr`.
         """
 
-        from .. import SIM_PROCEDURES  # pylint:disable=import-outside-toplevel
+        from angr.procedures import SIM_PROCEDURES  # pylint:disable=import-outside-toplevel
 
         strlen = SIM_PROCEDURES["libc"]["strlen"]
 

angr/procedures/tracer/random.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..cgc.random import random as orig_random
+from angr.procedures.cgc.random import random as orig_random
 
 
 class random(orig_random):

angr/procedures/tracer/receive.py

@@ -3,7 +3,7 @@ import logging
 
 import claripy
 
-from ..cgc.receive import receive as orig_receive
+from angr.procedures.cgc.receive import receive as orig_receive
 
 
 l = logging.getLogger(name=__name__)

angr/procedures/tracer/transmit.py

@@ -3,7 +3,7 @@ import logging
 
 import claripy
 
-from ..cgc.transmit import transmit as orig_transmit
+from angr.procedures.cgc.transmit import transmit as orig_transmit
 
 
 l = logging.getLogger(name=__name__)

angr/procedures/uclibc/__uClibc_main.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..glibc.__libc_start_main import __libc_start_main as fucker
+from angr.procedures.glibc.__libc_start_main import __libc_start_main as fucker
 
 
 class __uClibc_main(fucker):

angr/protos/__init__.py

@@ -12,3 +12,11 @@ from . import function_pb2
 from . import cfg_pb2
 from . import xrefs_pb2
 from . import variables_pb2
+
+__all__ = (
+    "primitives_pb2",
+    "function_pb2",
+    "cfg_pb2",
+    "xrefs_pb2",
+    "variables_pb2",
+)

angr/sim_options.py

@@ -232,10 +232,6 @@ KEEP_IP_SYMBOLIC = "KEEP_IP_SYMBOLIC"
 # Do not try to concretize a symbolic IP. With this option, all states with symbolic IPs will be seen as unconstrained.
 NO_IP_CONCRETIZATION = "NO_IP_CONCRETIZATION"
 
-# Do not union values from different locations when reading from the memory for a reduced loss in precision
-# It is only applied to SimAbstractMemory
-KEEP_MEMORY_READS_DISCRETE = "KEEP_MEMORY_READS_DISCRETE"
-
 # Raise a SimSegfaultError on illegal memory accesses
 STRICT_PAGE_ACCESS = "STRICT_PAGE_ACCESS"
 

angr/sim_procedure.py

@@ -477,7 +477,7 @@ class SimProcedure:
         self._prepare_ret_state()
 
         self._exit_action(self.state, ret_addr)
-        self.successors.add_successor(self.state, ret_addr, claripy.true, "Ijk_Ret")
+        self.successors.add_successor(self.state, ret_addr, claripy.true(), "Ijk_Ret")
 
     def call(self, addr, args, continue_at, cc=None, prototype=None, jumpkind="Ijk_Call"):
         """
@@ -520,7 +520,7 @@ class SimProcedure:
             call_state.regs.t9 = addr
 
         self._exit_action(call_state, addr)
-        self.successors.add_successor(call_state, addr, claripy.true, jumpkind)
+        self.successors.add_successor(call_state, addr, claripy.true(), jumpkind)
         if jumpkind != "Ijk_Call":
             call_state.callstack.call(
                 self.state.addr, addr, retn_target=ret_addr, stack_pointer=call_state.regs.sp.concrete_value
@@ -531,7 +531,7 @@ class SimProcedure:
             ret_state = self.state.copy()
             cc.setup_callsite(ret_state, ret_addr, args, prototype)
             ret_state.callstack.top.procedure_data = simcallstack_entry
-            guard = claripy.true if o.TRUE_RET_EMULATION_GUARD in ret_state.options else claripy.false
+            guard = claripy.true() if o.TRUE_RET_EMULATION_GUARD in ret_state.options else claripy.false()
             self.successors.add_successor(ret_state, ret_addr, guard, "Ijk_FakeRet")
 
     def jump(self, addr, jumpkind="Ijk_Boring"):
@@ -540,7 +540,7 @@ class SimProcedure:
         """
         self.inhibit_autoret = True
         self._exit_action(self.state, addr)
-        self.successors.add_successor(self.state, addr, claripy.true, jumpkind)
+        self.successors.add_successor(self.state, addr, claripy.true(), jumpkind)
 
     def exit(self, exit_code):
         """
@@ -553,7 +553,7 @@ class SimProcedure:
         if isinstance(exit_code, int):
             exit_code = claripy.BVV(exit_code, self.state.arch.bits)
         self.state.history.add_event("terminate", exit_code=exit_code)
-        self.successors.add_successor(self.state, self.state.regs.ip, claripy.true, "Ijk_Exit")
+        self.successors.add_successor(self.state, self.state.regs.ip, claripy.true(), "Ijk_Exit")
 
     @staticmethod
     def _exit_action(state, addr):

angr/sim_state.py

@@ -1,25 +1,36 @@
 from __future__ import annotations
+
+import contextlib
 import functools
 import itertools
-import contextlib
-import weakref
-
 import logging
-
+import weakref
 from typing import TypeVar, TYPE_CHECKING
 
-from archinfo import Arch
-
-l = logging.getLogger(name=__name__)
-
-import claripy
 import archinfo
+import claripy
+from archinfo import Arch
 from archinfo.arch_soot import SootAddressDescriptor
 
+from . import sim_options as o
+from .errors import SimMergeError, SimValueError, SimStateError, SimSolverModeError
 from .misc.plugins import PluginHub, PluginPreset
 from .sim_state_options import SimStateOptions
 from .state_plugins import SimStatePlugin
 
+if TYPE_CHECKING:
+    from .storage import DefaultMemory
+    from .state_plugins.solver import SimSolver
+    from .state_plugins.posix import SimSystemPosix
+    from .state_plugins.view import SimRegNameView, SimMemView
+    from .state_plugins.callstack import CallStack
+    from .state_plugins.inspect import SimInspector
+    from .state_plugins.jni_references import SimStateJNIReferences
+    from .state_plugins.scratch import SimStateScratch
+
+
+l = logging.getLogger(name=__name__)
+
 
 def arch_overridable(f):
     @functools.wraps(f)
@@ -513,16 +524,6 @@ class SimState(PluginHub):
                 if self.solver.is_true(arg):
                     continue
 
-                # `is_true` and `is_false` does not use VSABackend currently (see commits 97a75366 and 2dfba73e in
-                # claripy). There is a chance that VSA backend can in fact handle it.
-                # Therefore we try to resolve it with VSABackend again
-                if claripy.backends.vsa.is_false(arg):
-                    self._satisfiable = False
-                    return
-
-                if claripy.backends.vsa.is_true(arg):
-                    continue
-
                 # It's neither True or False. Let's try to apply the condition
 
                 # We take the argument, extract a list of constrained SIs out of it (if we could, of course), and
@@ -678,7 +679,7 @@ class SimState(PluginHub):
             merge_conditions = [merge_flag == b for b in merge_values]
         else:
             merge_conditions = [
-                (claripy.true if len(mc) == 0 else claripy.And(*[c.to_claripy() for c in mc]))
+                (claripy.true() if len(mc) == 0 else claripy.And(*[c.to_claripy() for c in mc]))
                 for mc in merge_conditions
             ]
 
@@ -976,17 +977,3 @@ SimState.register_preset("default", default_state_plugin_preset)
 from .state_plugins.history import SimStateHistory
 from .state_plugins.inspect import BP_AFTER, BP_BEFORE
 from .state_plugins.sim_action import SimActionConstraint
-
-from . import sim_options as o
-from .errors import SimMergeError, SimValueError, SimStateError, SimSolverModeError
-
-# Type imports for annotations
-if TYPE_CHECKING:
-    from .storage import DefaultMemory
-    from .state_plugins.solver import SimSolver
-    from .state_plugins.posix import SimSystemPosix
-    from .state_plugins.view import SimRegNameView, SimMemView
-    from .state_plugins.callstack import CallStack
-    from .state_plugins.inspect import SimInspector
-    from .state_plugins.jni_references import SimStateJNIReferences
-    from .state_plugins.scratch import SimStateScratch