angr 9.2.111__py3-none-manylinux2014_x86_64.whl → 9.2.112__py3-none-manylinux2014_x86_64.whl

angr/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import
 # pylint: disable=wrong-import-position
 
-__version__ = "9.2.111"
+__version__ = "9.2.112"
 
 if bytes is str:
     raise Exception(

angr/analyses/cfg/cfg_base.py

@@ -7,7 +7,6 @@ import networkx
 from sortedcontainers import SortedDict
 
 import pyvex
-from claripy.utils.orderedset import OrderedSet
 from cle import ELF, PE, Blob, TLSObject, MachO, ExternObject, KernelObject, FunctionHintSource, Hex, Coff, SRec, XBE
 from cle.backends import NamedRegion
 import archinfo
@@ -34,6 +33,7 @@ from angr.codenode import HookNode, BlockNode
 from angr.engines.vex.lifter import VEX_IRSB_MAX_SIZE, VEX_IRSB_MAX_INST
 from angr.analyses import Analysis
 from angr.analyses.stack_pointer_tracker import StackPointerTracker
+from angr.utils.orderedset import OrderedSet
 from .indirect_jump_resolvers.default_resolvers import default_indirect_jump_resolvers
 
 if TYPE_CHECKING:

angr/knowledge_plugins/variables/variable_manager.py

@@ -7,8 +7,8 @@ import networkx
 
 from cle.backends.elf.compilation_unit import CompilationUnit
 from cle.backends.elf.variable import Variable
-from claripy.utils.orderedset import OrderedSet
 
+from angr.utils.orderedset import OrderedSet
 from ...protos import variables_pb2
 from ...serializable import Serializable
 from ...sim_variable import SimVariable, SimStackVariable, SimMemoryVariable, SimRegisterVariable

angr/state_plugins/solver.py

@@ -1,8 +1,12 @@
 import functools
 import time
 import logging
+import os
 from typing import TypeVar, overload
 
+from angr import sim_options as o
+from angr.errors import SimValueError, SimUnsatError, SimSolverModeError, SimSolverOptionError
+import claripy
 from claripy import backend_manager
 
 from .plugin import SimStatePlugin
@@ -72,8 +76,6 @@ def disable_timing():
     _timing_enabled = False
 
 
-import os
-
 if os.environ.get("SOLVER_TIMING", False):
     enable_timing()
 else:
@@ -191,8 +193,6 @@ def concrete_path_list(f):
 # The main event
 #
 
-import claripy
-
 
 class SimSolver(SimStatePlugin):
     """
@@ -306,13 +306,7 @@ class SimSolver(SimStatePlugin):
             elif "smtlib_abc" in backend_manager.backends._backends_by_name:
                 our_backend = backend_manager.backends.smtlib_abc
             else:
-                l.error(
-                    "Cannot find a suitable string solver. Please ensure you have installed a string solver that "
-                    "angr supports, and have imported the corresponding solver backend in claripy. You can try "
-                    'adding "from claripy.backends.backend_smtlib_solvers import *" at the beginning of your '
-                    "script."
-                )
-                raise ValueError("Cannot find a suitable string solver")
+                our_backend = backend_manager.backends.z3
             if o.COMPOSITE_SOLVER in self.state.options:
                 self._stored_solver = claripy.SolverComposite(
                     template_solver_string=claripy.SolverCompositeChild(backend=our_backend, track=track)
@@ -1124,6 +1118,4 @@ from angr.sim_state import SimState
 
 SimState.register_default("solver", SimSolver)
 
-from .. import sim_options as o
 from .inspect import BP_AFTER
-from ..errors import SimValueError, SimUnsatError, SimSolverModeError, SimSolverOptionError

angr/storage/memory_mixins/multi_value_merger_mixin.py

@@ -35,7 +35,7 @@ class MultiValueMergerMixin(MemoryMixin):
                 # python implicitly calls __eq__ to determine if the two objects are actually the same
                 # and that just results in a new AST for a BV. Python then tries to convert that AST to a bool
                 # which fails with the safeguard in claripy.ast.bool.Bool.__bool__.
-                stripped_values_set = {v._apply_to_annotations(lambda alist: None).cache_key for v in values_set}
+                stripped_values_set = {v.clear_annotations().cache_key for v in values_set}
                 if len(stripped_values_set) > 1:
                     ret_val = self._top_func(merged_size * self.state.arch.byte_width)
                 else:

angr/utils/orderedset.py

@@ -0,0 +1,70 @@
+import collections.abc
+
+
+class OrderedSet(collections.abc.MutableSet):
+    """
+    Adapted from http://code.activestate.com/recipes/576694/
+    Originally created by Raymond Hettinger and licensed under MIT.
+    """
+
+    def __init__(self, iterable=None):
+        self.end = end = []
+        end += [None, end, end]  # sentinel node for doubly linked list
+        self.map = {}  # key --> [key, prev, next]
+        if iterable is not None:
+            self |= iterable
+
+    def __len__(self):
+        return len(self.map)
+
+    def __contains__(self, key):
+        return key in self.map
+
+    def add(self, value):
+        if value not in self.map:
+            end = self.end
+            curr = end[1]
+            curr[2] = end[1] = self.map[value] = [value, curr, end]
+
+    def discard(self, value):
+        if value in self.map:
+            value, prev, next_ = self.map.pop(value)
+            prev[2] = next_
+            next_[1] = prev
+
+    def __iter__(self):
+        end = self.end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def pop(self, last=True):  # pylint:disable=arguments-differ
+        if not self:
+            raise KeyError("set is empty")
+        key = self.end[1][0] if last else self.end[2][0]
+        self.discard(key)
+        return key
+
+    def __repr__(self):
+        if not self:
+            return f"{self.__class__.__name__}()"
+        return f"{self.__class__.__name__}({list(self)!r})"
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedSet):
+            return len(self) == len(other) and list(self) == list(other)
+        return set(self) == set(other)
+
+    def __getstate__(self):
+        return list(self)
+
+    def __setstate__(self, state):
+        self.__init__(state)

angr/vaults.py

@@ -88,7 +88,6 @@ class Vault(collections.abc.MutableMapping):
             claripy.ast.BV,
             claripy.ast.FP,
             claripy.ast.Bool,
-            claripy.ast.Int,
             claripy.ast.Bits,
         }
         self.module_dedup = set()  # {'claripy', 'angr', 'archinfo', 'pyvex' } # cle causes recursion

{angr-9.2.111.dist-info → angr-9.2.112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.111
+Version: 9.2.112
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -15,13 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment ==9.2.111
-Requires-Dist: archinfo ==9.2.111
+Requires-Dist: ailment ==9.2.112
+Requires-Dist: archinfo ==9.2.112
 Requires-Dist: cachetools
 Requires-Dist: capstone ==5.0.0.post1
 Requires-Dist: cffi >=1.14.0
-Requires-Dist: claripy ==9.2.111
-Requires-Dist: cle ==9.2.111
+Requires-Dist: claripy ==9.2.112
+Requires-Dist: cle ==9.2.112
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -31,7 +31,7 @@ Requires-Dist: protobuf >=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser >=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex ==9.2.111
+Requires-Dist: pyvex ==9.2.112
 Requires-Dist: rich >=13.1.0
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.111.dist-info → angr-9.2.112.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=Kf0h-gf3w0Msnfqn-ZlTg2_pLo9i_vygjYlrf1-vibA,3708
+angr/__init__.py,sha256=7GtszOzKM8MNvheOzxnDDovJkFtQptSuglD58PO1S1M,3708
 angr/__main__.py,sha256=kaO56Te6h73SM94BVtASF00q5QbBbC3eBs9poVc9sVI,1887
 angr/annocfg.py,sha256=1tnBfxgLJh9I6Brm1JDdsWLHGmCQYdD6PTC_bFTOMrg,10775
 angr/blade.py,sha256=B8QXVQ93jz1YCIlb-dZLeBqYmVFdMXI5GleP1Wnxjrw,15519
@@ -25,7 +25,7 @@ angr/sim_variable.py,sha256=FC2FHlMWeBDYrFI_pK6C5WuqmImvxRdTQDFTAC-q4qY,17203
 angr/slicer.py,sha256=kbLKMAjf2kC6ov-OiGb95BqLmgV0QRl5mmEANcvzuAk,10640
 angr/state_hierarchy.py,sha256=w_5Tl-7h9xUXBsIKZRAWw8Xh0we8GIAaN6nbKgYH_Qo,8467
 angr/tablespecs.py,sha256=RRtYqHneKd1ZHhnm9sUdLflplk_K3EP7_gBJaSlX6UY,3239
-angr/vaults.py,sha256=A9vhsvbPpem6HpcA4u4HmOt8dR5vJH9Vd5rK5ugXV90,9701
+angr/vaults.py,sha256=qtSdOBpgQ2Qopkh1y0QgEvPtqpbBj-gRq_2Xxc2Q1PM,9672
 angr/analyses/__init__.py,sha256=lYtaal5RD-EWBW4oScD3Yob1Jk1ZYYqUUCBeTxH7IpE,1773
 angr/analyses/analysis.py,sha256=BNpBoQOkgbtV9cmMiO8e0WcTgIJKraikYISLDQ-cC6w,12301
 angr/analyses/backward_slice.py,sha256=grgjobcuTGq-rporwoBLNWf6aEoemCB7BvwE0dDeMp0,27287
@@ -63,7 +63,7 @@ angr/analyses/cfg/__init__.py,sha256=DRCry4KO2k5VJLyfxD_O6dWAdi21IUoaN5TqCnukJJs
 angr/analyses/cfg/cfb.py,sha256=e-Jlf9B7gkx0GpKl2TvK8VdTWZU8s-A9U9id5MP-R10,15456
 angr/analyses/cfg/cfg.py,sha256=1JpPGlqXXRFwE0tk26xjabT_-dq-kqAxMv7o6-DUhp4,3146
 angr/analyses/cfg/cfg_arch_options.py,sha256=YONHg6y-h6BCsBkJK9tuxb94DDfeOoy9CUS-LVyyDyg,3112
-angr/analyses/cfg/cfg_base.py,sha256=6FWPJtfJGtvdtVSN_5TPYpppgYZhkcgQwh_nATAoUEE,123076
+angr/analyses/cfg/cfg_base.py,sha256=aaLtljuGeqccd4IO8Zi5CLvSc8Yr-7YevHE7Mb3DdFQ,123073
 angr/analyses/cfg/cfg_emulated.py,sha256=Bi5PJzv0-0iQoCHzexSGAtkUAp6npb_RSODwW0Nv7zk,152812
 angr/analyses/cfg/cfg_fast.py,sha256=yeCEAlJTuz4jyFCZvUU6olaAMS07bA9tGg1lFBVn-BY,218149
 angr/analyses/cfg/cfg_fast_soot.py,sha256=dQglRl4h10i8DNd5oCSJ4umpSotMthjKc5E03bd3BJI,26023
@@ -484,7 +484,7 @@ angr/knowledge_plugins/sync/__init__.py,sha256=RN3y0UhYax-GdPyAhondMXEBuWIu-enHj
 angr/knowledge_plugins/sync/sync_controller.py,sha256=gZ1NUg8iJWu2EaOYY6WYj_W13tRtreIu5CA1VvpTmTA,9270
 angr/knowledge_plugins/variables/__init__.py,sha256=tmh_2i0X6Y41TkEgxHRQ4y-kVEGZnlDIpJZ_wUkCISI,60
 angr/knowledge_plugins/variables/variable_access.py,sha256=RzT-6C3cPXqSlWpQ_vZUf6s4tfYXp2lfOvgfYWkTLyo,3726
-angr/knowledge_plugins/variables/variable_manager.py,sha256=r8w2xIP-VN1_DS3r9y2GK3LAy8fMndL1m-7_obiIsbY,47315
+angr/knowledge_plugins/variables/variable_manager.py,sha256=5tESKmGiHLSSQRmyBjbmQ0oMMO1_TDN1tDo8Sj1J5yo,47312
 angr/knowledge_plugins/xrefs/__init__.py,sha256=-5A2h048WTRu6Et7q7bqlc-AyBXNuJ9AF9nE9zc3M4I,94
 angr/knowledge_plugins/xrefs/xref.py,sha256=1BMphrr8iViDtVWPXWidmY1_uNmw9LRvEwwZLt3Zqw8,4907
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=a4uvTJkdM0PQIuyYcd7t76IddrrVjPGe9SZrRaqp2II,3980
@@ -1206,7 +1206,7 @@ angr/state_plugins/scratch.py,sha256=7j-J4xq8A9Axh6fJzQoUpLpobtIe0va7eeX-glGfYk0
 angr/state_plugins/sim_action.py,sha256=IDPLtcqN04APpStuVYarv00LF2u6JVFfdxEBEw_v_a0,9763
 angr/state_plugins/sim_action_object.py,sha256=4_f7ry76pG4XBnF7O48_7krt_ibG4DZkIMrjmmk_MGg,4268
 angr/state_plugins/sim_event.py,sha256=pRQtMet5g--GmH97BMrS3bDErgUOWAOocjPLGNzmelU,2061
-angr/state_plugins/solver.py,sha256=HrEQgqNJtzdB8I8Qu8XG_3LjMBt6OdbAIewUFZiNZHk,45179
+angr/state_plugins/solver.py,sha256=YnuLKze1Ls-NWJZVIiH41yhvAVWyBBdaGyBinmQKh-I,44755
 angr/state_plugins/symbolizer.py,sha256=3UAfStON-0GuuHhkD4JD6Y5WveqEfTD3JLK3uj0R-co,11039
 angr/state_plugins/trace_additions.py,sha256=LRcgdGKY2QtzOwsVa-FYLGRFcl0ISOnq-WzCMayiM-8,30091
 angr/state_plugins/uc_manager.py,sha256=9yEE10rrGXTVncLzVOpgvSAGA2RdzApUu_fq_lUksDs,2643
@@ -1235,7 +1235,7 @@ angr/storage/memory_mixins/default_filler_mixin.py,sha256=Hlub-HcakhrNWWwJ0PbBYq
 angr/storage/memory_mixins/dirty_addrs_mixin.py,sha256=-UDDtjEkh19Dd5paf-62NBvSiIHTmQXPM0QtriJ5eig,317
 angr/storage/memory_mixins/hex_dumper_mixin.py,sha256=ciMIrmfTmxWPWVUUiIw5h8YNdHmrWg_GsK6Bzg5omzE,3668
 angr/storage/memory_mixins/label_merger_mixin.py,sha256=22eu5aNM-MUhBjUrqhz02sPF3T74uR6NYVmKv8dSnl0,848
-angr/storage/memory_mixins/multi_value_merger_mixin.py,sha256=3YRS_9NBP1DiRWDst4HlI1nFkd3vQ-7TKdaldfX2Y18,3043
+angr/storage/memory_mixins/multi_value_merger_mixin.py,sha256=T344CdsUX6-Iw3QkZ10cu-39VwVgRssq8ilwiFruZgE,3021
 angr/storage/memory_mixins/name_resolution_mixin.py,sha256=YOM3yDjTmybDgAVvJGHuVWUgkDqsbFsWRgkJP8vI9ho,3412
 angr/storage/memory_mixins/simple_interface_mixin.py,sha256=KTHvca8MXCWF4W8dbnQLFd7uJ-Gsab03_3kJGfFTAyY,2596
 angr/storage/memory_mixins/simplification_mixin.py,sha256=stTzmaoa0IHxhDSWsYdzKGSt2n37XRjJ7kgZdoa5Uu0,502
@@ -1290,12 +1290,13 @@ angr/utils/lazy_import.py,sha256=VgN0-cMsr6XdGIq56Js1X8YecfPdW9Z4NrB3d2jD-5Y,308
 angr/utils/library.py,sha256=6RKKn7Hm-YEw0AoTFIjL86kCdvglKI_5KtSysDAE06Q,7170
 angr/utils/loader.py,sha256=QdkatPiyRfz5KdfCzRI1Xp3TJL_Pa75wY0dsILgMbwk,1944
 angr/utils/mp.py,sha256=cv_NeysxLgyCdE-Euefnfv078ia5maHSnUn9f23zz88,1882
+angr/utils/orderedset.py,sha256=6SRZz6PkOVavOzlUd2cIiqZQyWtKO72F2he_cG0aP9Q,1943
 angr/utils/segment_list.py,sha256=5nnuVtdZk9NS2y_xUBVA9khWPueP_zagNtPSjaoMHbA,20410
 angr/utils/timing.py,sha256=uOowCP8kotDrKDOjlAod-guBuYkAA8zEtiAwpdwMlIU,1334
 angr/utils/typing.py,sha256=pCjA7JZAzcvrk-iyIE2cRHc1G66AMSGEON3aFfjtPVc,431
-angr-9.2.111.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.111.dist-info/METADATA,sha256=kLfhkitl-nsiu_raFAO--tkzI7Ot9NZUEa3yG2hC5GU,4703
-angr-9.2.111.dist-info/WHEEL,sha256=iufSf1KKWRBx2aJd9Qq5NmBm_pHichurGAybHCyxUJA,108
-angr-9.2.111.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.111.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.111.dist-info/RECORD,,
+angr-9.2.112.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.112.dist-info/METADATA,sha256=sFscmmamBc-1J83Ys64gmhGM1IPhQdpB4GyNiE7Mvtc,4703
+angr-9.2.112.dist-info/WHEEL,sha256=CWGrIEhAIhnaesk6GZ5rPGMzRtXxh4Yj8uPaSQGkP14,108
+angr-9.2.112.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.112.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.112.dist-info/RECORD,,

{angr-9.2.111.dist-info → angr-9.2.112.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-manylinux2014_x86_64