angr 9.2.119__py3-none-manylinux2014_x86_64.whl → 9.2.120__py3-none-manylinux2014_x86_64.whl

angr/storage/memory_mixins/regioned_memory/region_category_mixin.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from .. import MemoryMixin
+from angr.storage.memory_mixins import MemoryMixin
 
 
 class RegionCategoryMixin(MemoryMixin):

angr/storage/memory_mixins/regioned_memory/region_data.py

@@ -3,8 +3,8 @@ from sortedcontainers import SortedDict
 
 import claripy
 
-from ....errors import SimRegionMapError
-from ....state_plugins import SimStatePlugin
+from angr.errors import SimRegionMapError
+from angr.state_plugins import SimStatePlugin
 
 
 class AddressWrapper:

angr/storage/memory_mixins/regioned_memory/region_meta_mixin.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import copy
 from typing import Any
 
-from .. import MemoryMixin
+from angr.storage.memory_mixins import MemoryMixin
 
 
 class Segment:

angr/storage/memory_mixins/regioned_memory/regioned_address_concretization_mixin.py

@@ -3,10 +3,10 @@ from collections.abc import Generator
 
 import claripy
 
-from ....sim_options import HYBRID_SOLVER, APPROXIMATE_FIRST
-from .... import concretization_strategies
-from ....errors import SimMergeError, SimMemoryAddressError
-from .. import MemoryMixin
+from angr.sim_options import HYBRID_SOLVER, APPROXIMATE_FIRST
+from angr import concretization_strategies
+from angr.errors import SimMergeError, SimMemoryAddressError
+from angr.storage.memory_mixins import MemoryMixin
 from .abstract_address_descriptor import AbstractAddressDescriptor
 from .region_data import AddressWrapper
 

angr/storage/memory_mixins/regioned_memory/regioned_memory_mixin.py

@@ -8,20 +8,15 @@ import claripy
 from claripy.annotation import RegionAnnotation
 from claripy.ast import Bool, Bits, BV
 
-from ....sim_options import (
-    AVOID_MULTIVALUED_READS,
-    CONSERVATIVE_READ_STRATEGY,
-    KEEP_MEMORY_READS_DISCRETE,
-    CONSERVATIVE_WRITE_STRATEGY,
-)
-from ....state_plugins.sim_action_object import _raw_ast
-from ....errors import SimMemoryError, SimAbstractMemoryError
-from .. import MemoryMixin
+from angr.sim_options import AVOID_MULTIVALUED_READS, CONSERVATIVE_READ_STRATEGY, CONSERVATIVE_WRITE_STRATEGY
+from angr.state_plugins.sim_action_object import _raw_ast
+from angr.errors import SimMemoryError, SimAbstractMemoryError
+from angr.storage.memory_mixins import MemoryMixin
 from .region_data import AddressWrapper, RegionMap
 from .abstract_address_descriptor import AbstractAddressDescriptor
 
 if TYPE_CHECKING:
-    from ....sim_state import SimState
+    from angr.sim_state import SimState
 
 
 _l = logging.getLogger(name=__name__)
@@ -59,7 +54,7 @@ class RegionedMemoryMixin(MemoryMixin):
 
         if regioned_memory_cls is None:
             # delayed import
-            from .. import RegionedMemory  # pylint:disable=import-outside-toplevel
+            from angr.storage.memory_mixins import RegionedMemory  # pylint:disable=import-outside-toplevel
 
             regioned_memory_cls = RegionedMemory
 
@@ -126,13 +121,7 @@ class RegionedMemoryMixin(MemoryMixin):
                 **kwargs,
             )
 
-            if val is None:
-                if KEEP_MEMORY_READS_DISCRETE in self.state.options:
-                    val = self.state.solver.DSIS(to_conv=new_val, max_card=100000)
-                else:
-                    val = new_val
-            else:
-                val = val.union(new_val)
+            val = new_val if val is None else val.union(new_val)
 
         if val is None:
             # address_wrappers is empty - we cannot concretize the address in static mode.
@@ -358,7 +347,6 @@ class RegionedMemoryMixin(MemoryMixin):
 
         :param addr:
         :param is_write:
-        :param convert_to_valueset:
         :param target_region:
         :return:
         """

angr/storage/memory_mixins/regioned_memory/static_find_mixin.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import claripy
 
-from ..smart_find_mixin import SmartFindMixin
+from angr.storage.memory_mixins.smart_find_mixin import SmartFindMixin
 
 
 class StaticFindMixin(SmartFindMixin):  # pylint:disable=abstract-method

angr/storage/memory_mixins/simple_interface_mixin.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 
 from . import MemoryMixin
-from ...errors import SimMemoryError
+from angr.errors import SimMemoryError
 
 
 class SimpleInterfaceMixin(MemoryMixin):

angr/storage/memory_mixins/simplification_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from . import MemoryMixin
-from ... import sim_options as options
+from angr import sim_options as options
 
 
 class SimplificationMixin(MemoryMixin):

angr/storage/memory_mixins/size_resolution_mixin.py

@@ -4,7 +4,7 @@ import logging
 import claripy
 
 from . import MemoryMixin
-from ...errors import SimMemoryLimitError, SimMemoryError, SimUnsatError
+from angr.errors import SimMemoryLimitError, SimMemoryError, SimUnsatError
 
 l = logging.getLogger(__name__)
 

angr/storage/memory_mixins/slotted_memory.py

@@ -3,7 +3,7 @@ import claripy
 
 from . import MemoryMixin
 from .paged_memory.pages.ispo_mixin import ISPOMixin
-from ...errors import SimMergeError
+from angr.errors import SimMergeError
 
 
 class SlottedMemoryMixin(MemoryMixin):

angr/storage/memory_mixins/smart_find_mixin.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 
 from . import MemoryMixin
-from ...errors import SimSegfaultException
+from angr.errors import SimSegfaultException
 
 
 class SmartFindMixin(MemoryMixin):

angr/storage/memory_mixins/underconstrained_mixin.py

@@ -3,7 +3,7 @@ import claripy
 import logging
 
 from . import MemoryMixin
-from ... import sim_options as o
+from angr import sim_options as o
 
 l = logging.getLogger(__name__)
 

angr/storage/memory_mixins/unwrapper_mixin.py

@@ -24,4 +24,4 @@ class UnwrapperMixin(MemoryMixin):
         return super().copy_contents(_raw_ast(dst), _raw_ast(src), _raw_ast(size), _raw_ast(condition), **kwargs)
 
 
-from ...state_plugins.sim_action_object import _raw_ast
+from angr.state_plugins.sim_action_object import _raw_ast

angr/storage/memory_object.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import claripy
 
-from ..errors import SimMemoryError
+from angr.errors import SimMemoryError
 
 
 def obj_bit_size(o):

angr/utils/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from .timing import timethis
 from . import graph
 from . import constants
@@ -32,3 +33,14 @@ def looks_like_sql(s: str) -> bool:
                 return True
 
     return False
+
+
+__all__ = (
+    "timethis",
+    "graph",
+    "constants",
+    "enums_conv",
+    "lazy_import",
+    "is_pyinstaller",
+    "looks_like_sql",
+)

angr/utils/enums_conv.py

@@ -4,7 +4,7 @@ import logging
 
 l = logging.getLogger(name=__name__)
 
-from ..protos.primitives_pb2 import Edge
+from angr.protos.primitives_pb2 import Edge
 
 
 _CFG_JUMPKINDS = {

angr/utils/library.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from ..sim_type import (
+from angr.sim_type import (
     parse_file,
     parse_cpp_file,
     normalize_cpp_function_name,
@@ -12,7 +12,7 @@ from ..sim_type import (
 )
 
 if TYPE_CHECKING:
-    from ..sim_type import SimTypeFunction
+    from angr.sim_type import SimTypeFunction
 
 
 def get_function_name(s):

angr/utils/mp.py

@@ -3,7 +3,7 @@ from typing import NamedTuple, Any
 from collections.abc import Callable
 import multiprocessing
 import platform
-from ..errors import AngrRuntimeError
+from angr.errors import AngrRuntimeError
 
 
 class Closure(NamedTuple):

{angr-9.2.119.dist-info → angr-9.2.120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.119
+Version: 9.2.120
 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,14 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.119
-Requires-Dist: archinfo==9.2.119
+Requires-Dist: ailment==9.2.120
+Requires-Dist: archinfo==9.2.120
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.119
-Requires-Dist: cle==9.2.119
-Requires-Dist: dpkt
+Requires-Dist: claripy==9.2.120
+Requires-Dist: cle==9.2.120
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -31,7 +30,7 @@ Requires-Dist: protobuf>=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.119
+Requires-Dist: pyvex==9.2.120
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy