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

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_type.py

@@ -1,24 +1,21 @@
 # pylint:disable=abstract-method,line-too-long,missing-class-docstring,wrong-import-position
 from __future__ import annotations
-from __future__ import annotations
 
 import contextlib
-from collections import OrderedDict, defaultdict, ChainMap
 import copy
 import re
-from typing import Literal, Optional, Any, Union, TYPE_CHECKING, cast, overload
-from collections.abc import Iterable
 import logging
-
-try:
-    import CppHeaderParser
-except ImportError:
-    CppHeaderParser = None
+from collections import OrderedDict, defaultdict, ChainMap
+from collections.abc import Iterable
+from typing import Literal, Any, TYPE_CHECKING, cast, overload
 
 from archinfo import Endness, Arch
 import claripy
+import CppHeaderParser
+import pycparser
 
 from angr.errors import AngrMissingTypeError, AngrTypeError
+from angr.sim_state import SimState
 from .misc.ux import deprecated
 
 if TYPE_CHECKING:
@@ -26,12 +23,7 @@ if TYPE_CHECKING:
     from angr.procedures.definitions import SimTypeCollection
     from angr.storage.memory_mixins import _Coerce
 
-    StoreType = Union[_Coerce, claripy.ast.BV]
-else:
-    try:
-        import pycparser
-    except ImportError:
-        pycparser = None
+    StoreType = _Coerce
 
 
 l = logging.getLogger(name=__name__)
@@ -69,7 +61,7 @@ class SimType:
         return self_type.__eq__(other, avoid=avoid)  # pylint:disable=unnecessary-dunder-call
 
     def __eq__(self, other, avoid=None):
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
 
         for attr in self._fields:
@@ -3499,7 +3491,7 @@ def parse_cpp_file(cpp_decl, with_param_names: bool = False):
     func_decls: dict[str, SimTypeCppFunction] = {}
     for the_func in h.functions:
         # FIXME: We always assume that there is a "this" pointer but it is not the case for static methods.
-        proto = cast(Optional[SimTypeCppFunction], _cpp_decl_to_type(the_func, {}, opaque_classes=True))
+        proto = cast(SimTypeCppFunction | None, _cpp_decl_to_type(the_func, {}, opaque_classes=True))
         if proto is not None and the_func["class"]:
             func_name = cast(str, the_func["class"] + "::" + the_func["name"])
             proto.args = (
@@ -3599,4 +3591,3 @@ struct timeval {
     )
 
 from .state_plugins.view import SimMemView
-from .state_plugins import SimState

angr/simos/__init__.py

@@ -31,3 +31,15 @@ register_simos("windows", SimWindows)
 register_simos("cgc", SimCGC)
 register_simos("javavm", SimJavaVM)
 register_simos("snimmuc_nxp", SimSnimmucNxp)
+
+
+__all__ = (
+    "SimOS",
+    "SimUserland",
+    "SimLinux",
+    "SimCGC",
+    "SimWindows",
+    "SimJavaVM",
+    "SimSnimmucNxp",
+    "os_mapping",
+)

angr/simos/cgc.py

@@ -4,9 +4,9 @@ import logging
 import claripy
 from cle import BackedCGC
 
-from ..procedures import SIM_LIBRARIES as L
-from ..state_plugins import SimActionData
-from .. import sim_options as o
+from angr.procedures import SIM_LIBRARIES as L
+from angr.state_plugins import SimActionData
+from angr import sim_options as o
 from .userland import SimUserland
 
 _l = logging.getLogger(name=__name__)
@@ -27,9 +27,9 @@ class SimCGC(SimUserland):
         :param allocate_stack_page_count:   Number of pages to pre-allocate for stack
         """
         # default stack as specified in the cgc abi
-        if kwargs.get("stack_end", None) is None:
+        if kwargs.get("stack_end") is None:
             kwargs["stack_end"] = 0xBAAAB000
-        if kwargs.get("stack_size", None) is None:
+        if kwargs.get("stack_size") is None:
             kwargs["stack_size"] = 1024 * 1024 * 8
 
         s = super().state_blank(**kwargs)  # pylint:disable=invalid-name

angr/simos/javavm.py

@@ -9,19 +9,19 @@ from claripy.ast.bv import BV
 
 from angr import SIM_PROCEDURES, options
 
-from ..calling_conventions import default_cc, SimCCSoot
-from ..engines.soot import SootMixin
-from ..engines.soot.expressions import SimSootExpr_NewArray
-from ..engines.soot.values import (
+from angr.calling_conventions import default_cc, SimCCSoot
+from angr.engines.soot import SootMixin
+from angr.engines.soot.expressions import SimSootExpr_NewArray
+from angr.engines.soot.values import (
     SimSootValue_ArrayRef,
     SimSootValue_StringRef,
     SimSootValue_ThisRef,
     SimSootValue_StaticFieldRef,
 )
-from ..errors import AngrSimOSError
-from ..procedures.java_jni import jni_functions
-from ..sim_state import SimState
-from ..sim_type import SimTypeFunction, SimTypeNum
+from angr.errors import AngrSimOSError
+from angr.procedures.java_jni import jni_functions
+from angr.sim_state import SimState
+from angr.sim_type import SimTypeFunction, SimTypeNum
 from .simos import SimOS
 
 l = logging.getLogger("angr.simos.JavaVM")
@@ -102,11 +102,11 @@ class SimJavaVM(SimOS):
     #
 
     def state_blank(self, addr=None, **kwargs):  # pylint: disable=arguments-differ
-        if not kwargs.get("mode", None):
+        if not kwargs.get("mode"):
             kwargs["mode"] = self.project._default_analysis_mode
-        if not kwargs.get("arch", None):
+        if not kwargs.get("arch"):
             kwargs["arch"] = self.arch
-        if not kwargs.get("os_name", None):
+        if not kwargs.get("os_name"):
             kwargs["os_name"] = self.name
 
         if self.is_javavm_with_jni_support:
@@ -161,7 +161,7 @@ class SimJavaVM(SimOS):
 
         # initialize class containing the current method
         state.javavm_classloader.get_class(
-            state.addr.method.class_name, init_class=True, step_func=kwargs.get("step_function", None)
+            state.addr.method.class_name, init_class=True, step_func=kwargs.get("step_function")
         )
 
         # initialize the Java environment

angr/simos/linux.py

@@ -11,11 +11,11 @@ from cle.address_translator import AT
 from cle.backends.elf.relocation.arm64 import R_AARCH64_TLSDESC
 from archinfo import ArchX86, ArchAMD64, ArchARM, ArchAArch64, ArchMIPS32, ArchMIPS64, ArchPPC32, ArchPPC64
 
-from ..tablespecs import StringTableSpec
-from ..procedures import SIM_PROCEDURES as P, SIM_LIBRARIES as L
-from ..state_plugins import SimFilesystem, SimHostFilesystem
-from ..storage.file import SimFile, SimFileBase
-from ..errors import AngrSyscallError
+from angr.tablespecs import StringTableSpec
+from angr.procedures import SIM_PROCEDURES as P, SIM_LIBRARIES as L
+from angr.state_plugins import SimFilesystem, SimHostFilesystem
+from angr.storage.file import SimFile, SimFileBase
+from angr.errors import AngrSyscallError
 from .userland import SimUserland
 
 _l = logging.getLogger(name=__name__)

angr/simos/simos.py

@@ -6,17 +6,13 @@ from archinfo import ArchMIPS32, ArchS390X
 import claripy
 
 import angr
-from ..errors import (
-    AngrCallableError,
-    AngrCallableMultistateError,
-    AngrSimOSError,
-)
-from ..sim_state import SimState
-from ..state_plugins import SimSystemPosix
-from ..calling_conventions import default_cc
-from ..procedures import SIM_PROCEDURES as P
-from .. import sim_options as o
-from ..storage.file import SimFileStream, SimFileBase
+from angr.errors import AngrCallableError, AngrCallableMultistateError, AngrSimOSError
+from angr.sim_state import SimState
+from angr.state_plugins import SimSystemPosix
+from angr.calling_conventions import default_cc
+from angr.procedures import SIM_PROCEDURES as P
+from angr import sim_options as o
+from angr.storage.file import SimFileStream, SimFileBase
 
 
 _l = logging.getLogger(name=__name__)
@@ -112,20 +108,20 @@ class SimOS:
         Any additional arguments will be passed to the SimState constructor
         """
         # TODO: move ALL of this into the SimState constructor
-        if kwargs.get("mode", None) is None:
+        if kwargs.get("mode") is None:
             kwargs["mode"] = self.project._default_analysis_mode
         if permissions_backer is not None:
             kwargs["permissions_map"] = permissions_backer[1]
             kwargs["default_permissions"] = 7 if permissions_backer[0] else 3
-        if kwargs.get("cle_memory_backer", None) is None:
+        if kwargs.get("cle_memory_backer") is None:
             kwargs["cle_memory_backer"] = self.project.loader
-        if kwargs.get("os_name", None) is None:
+        if kwargs.get("os_name") is None:
             kwargs["os_name"] = self.name
         actual_stack_end = stack_end
         if stack_end is None:
             stack_end = self.arch.initial_sp
 
-        if kwargs.get("permissions_map", None) is None:
+        if kwargs.get("permissions_map") is None:
             # just a dict of address ranges to permission bits
             permission_map = {}
             for obj in self.project.loader.all_objects:

angr/simos/userland.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 import logging
 
-from ..calling_conventions import SYSCALL_CC, SimCCSyscall
-from ..errors import AngrUnsupportedSyscallError, SimSolverError
-from ..procedures import SIM_PROCEDURES as P
+from angr.calling_conventions import SYSCALL_CC, SimCCSyscall
+from angr.errors import AngrUnsupportedSyscallError, SimSolverError
+from angr.procedures import SIM_PROCEDURES as P
 from .simos import SimOS
 
 _l = logging.getLogger(name=__name__)

angr/simos/windows.py

@@ -10,16 +10,11 @@ import claripy
 from archinfo import ArchX86, ArchAMD64
 import cle.backends
 
-from ..errors import (
-    AngrSimOSError,
-    SimSegfaultException,
-    SimUnsupportedError,
-    SimZeroDivisionException,
-)
-from .. import sim_options as o
-from ..tablespecs import StringTableSpec
-from ..procedures import SIM_LIBRARIES as L
-from ..procedures.definitions import load_win32api_definitions
+from angr.errors import AngrSimOSError, SimSegfaultException, SimUnsupportedError, SimZeroDivisionException
+from angr import sim_options as o
+from angr.tablespecs import StringTableSpec
+from angr.procedures import SIM_LIBRARIES as L
+from angr.procedures.definitions import load_win32api_definitions
 from .simos import SimOS
 
 _l = logging.getLogger(name=__name__)

angr/state_plugins/__init__.py

@@ -1,30 +1,86 @@
-# pylint:disable=wildcard-import
 from __future__ import annotations
-from .plugin import *
-from .libc import *
-from .inspect import *
-from .posix import *
-from .solver import *
-from .light_registers import *
-from .log import *
-from .history import *
-from .scratch import *
-from .cgc import *
-from .gdb import *
-from .uc_manager import *
+
+from .plugin import SimStatePlugin
+from .libc import SimStateLibc
+from .inspect import SimInspector, NO_OVERRIDE, BP_BEFORE, BP_AFTER, BP_BOTH, BP_IPDB, BP_IPYTHON
+from .posix import PosixDevFS, PosixProcFS, SimSystemPosix
+from .solver import SimSolver
+from .light_registers import SimLightRegisters
+from .log import SimStateLog
+from .history import SimStateHistory
+from .scratch import SimStateScratch
+from .cgc import SimStateCGC
+from .gdb import GDB
+from .uc_manager import SimUCManager
 from .unicorn_engine import Unicorn
-from .sim_action import *
-from .sim_action_object import *
-from .sim_event import *
-from .callstack import *
-from .globals import *
-from .preconstrainer import *
-from .loop_data import *
-from .view import *
-from .filesystem import *
-from .heap import *
-from .concrete import *
-from .jni_references import *
-from .javavm_classloader import *
-from .symbolizer import *
-from .debug_variables import *
+from .sim_action import SimAction, SimActionExit, SimActionConstraint, SimActionOperation, SimActionData
+from .sim_action_object import SimActionObject
+from .sim_event import SimEvent, resource_event
+from .callstack import CallStack
+from .globals import SimStateGlobals
+from .preconstrainer import SimStatePreconstrainer
+from .loop_data import SimStateLoopData
+from .view import SimRegNameView, SimMemView, StructMode
+from .filesystem import Stat, SimFilesystem, SimMount, SimHostFilesystem
+from .heap import SimHeapBase, SimHeapBrk, SimHeapLibc, SimHeapPTMalloc, PTChunk, PTChunkIterator
+from .concrete import Concrete
+from .jni_references import SimStateJNIReferences
+from .javavm_classloader import SimJavaVmClassloader
+from .symbolizer import SimSymbolizer
+from .debug_variables import SimDebugVariable, SimDebugVariablePlugin
+
+
+__all__ = (
+    "SimStatePlugin",
+    "SimStateLibc",
+    "SimInspector",
+    "NO_OVERRIDE",
+    "BP_BEFORE",
+    "BP_AFTER",
+    "BP_BOTH",
+    "BP_IPDB",
+    "BP_IPYTHON",
+    "PosixDevFS",
+    "PosixProcFS",
+    "SimSystemPosix",
+    "SimSolver",
+    "SimLightRegisters",
+    "SimStateLog",
+    "SimStateHistory",
+    "SimStateScratch",
+    "SimStateCGC",
+    "GDB",
+    "SimUCManager",
+    "Unicorn",
+    "SimAction",
+    "SimActionExit",
+    "SimActionConstraint",
+    "SimActionOperation",
+    "SimActionData",
+    "SimActionObject",
+    "SimEvent",
+    "resource_event",
+    "CallStack",
+    "SimStateGlobals",
+    "SimStatePreconstrainer",
+    "SimStateLoopData",
+    "SimRegNameView",
+    "SimMemView",
+    "StructMode",
+    "Stat",
+    "SimFilesystem",
+    "SimMount",
+    "SimHostFilesystem",
+    "SimHeapBase",
+    "SimHeapBrk",
+    "SimHeapLibc",
+    "SimHeapPTMalloc",
+    "PTChunk",
+    "PTChunkIterator",
+    "Concrete",
+    "SimStateJNIReferences",
+    "SimJavaVmClassloader",
+    "SimSymbolizer",
+    "SimDebugVariable",
+    "SimDebugVariablePlugin",
+)

angr/state_plugins/callstack.py

@@ -5,7 +5,7 @@ import logging
 from collections.abc import Iterator
 
 from .plugin import SimStatePlugin
-from ..errors import AngrError, SimEmptyCallStackError
+from angr.errors import AngrError, SimEmptyCallStackError
 
 l = logging.getLogger(name=__name__)
 

angr/state_plugins/concrete.py

@@ -7,11 +7,10 @@ import re
 import struct
 
 from .plugin import SimStatePlugin
-from ..errors import SimConcreteRegisterError
+from angr.errors import SimConcreteRegisterError
 from archinfo import ArchX86, ArchAMD64
 
 l = logging.getLogger("state_plugin.concrete")
-# l.setLevel(logging.DEBUG)
 
 
 class Concrete(SimStatePlugin):
@@ -290,7 +289,7 @@ class Concrete(SimStatePlugin):
                                 new_reloc.relocate([])
 
 
-from ..sim_state import SimState
-from .. import sim_options as options
+from angr.sim_state import SimState
+from angr import sim_options as options
 
 SimState.register_default("concrete", Concrete)

angr/state_plugins/filesystem.py

@@ -4,9 +4,9 @@ import logging
 from collections import namedtuple
 
 from .plugin import SimStatePlugin
-from ..storage.file import SimFile
-from ..errors import SimMergeError
-from ..misc.ux import once
+from angr.storage.file import SimFile
+from angr.errors import SimMergeError
+from angr.misc.ux import once
 
 l = logging.getLogger(name=__name__)
 

angr/state_plugins/gdb.py

@@ -6,7 +6,7 @@ import claripy
 import binascii
 
 from .plugin import SimStatePlugin
-from ..errors import SimStateError
+from angr.errors import SimStateError
 
 l = logging.getLogger(name=__name__)
 

angr/state_plugins/heap/__init__.py

@@ -1,6 +1,15 @@
-# pylint:disable=wildcard-import
 from __future__ import annotations
-from .heap_base import *
-from .heap_brk import *
-from .heap_libc import *
-from .heap_ptmalloc import *
+
+from .heap_base import SimHeapBase
+from .heap_brk import SimHeapBrk
+from .heap_libc import SimHeapLibc
+from .heap_ptmalloc import SimHeapPTMalloc, PTChunk, PTChunkIterator
+
+__all__ = (
+    "SimHeapBase",
+    "SimHeapBrk",
+    "SimHeapLibc",
+    "SimHeapPTMalloc",
+    "PTChunk",
+    "PTChunkIterator",
+)

angr/state_plugins/heap/heap_base.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
-from ..plugin import SimStatePlugin
-
-from ...errors import SimMemoryError
-from .. import sim_options as opts
 
 import logging
 
+import angr.sim_options as opts
+from angr.state_plugins.plugin import SimStatePlugin
+from angr.errors import SimMemoryError
+
+
 l = logging.getLogger("angr.state_plugins.heap.heap_base")
 
 # TODO: derive heap location from SimOS and binary info for something more realistic (and safe?)

angr/state_plugins/heap/heap_brk.py

@@ -4,7 +4,7 @@ import logging
 import claripy
 
 from angr.errors import SimSolverError
-from ..plugin import SimStatePlugin
+from angr.state_plugins.plugin import SimStatePlugin
 from . import SimHeapBase
 
 l = logging.getLogger(__name__)

angr/state_plugins/heap/heap_freelist.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import logging
 from . import SimHeapLibc
 from .utils import concretize
-from ...errors import SimHeapError
+from angr.errors import SimHeapError
 
 
 l = logging.getLogger("angr.state_plugins.heap.heap_freelist")

angr/state_plugins/heap/heap_ptmalloc.py

@@ -3,30 +3,18 @@ import logging
 
 import claripy
 
-from ..plugin import SimStatePlugin
+from angr.state_plugins.plugin import SimStatePlugin
 from .heap_freelist import SimHeapFreelist, Chunk
 from .utils import concretize
-from ...errors import SimHeapError, SimMergeError, SimSolverError
+from angr.errors import SimHeapError, SimMergeError, SimSolverError
 
 
 l = logging.getLogger("angr.state_plugins.heap.heap_ptmalloc")
-sml = logging.getLogger("angr.state_plugins.symbolic_memory")
 
 CHUNK_FLAGS_MASK = 0x07
 CHUNK_P_MASK = 0x01
 
 
-# These are included as sometimes the heap will touch uninitialized locations, which normally causes a warning
-def silence_logger():
-    level = sml.getEffectiveLevel()
-    sml.setLevel("ERROR")
-    return level
-
-
-def unsilence_logger(level):
-    sml.setLevel(level)
-
-
 class PTChunk(Chunk):
     """
     A chunk, inspired by the implementation of chunks in ptmalloc. Provides a representation of a chunk via a view into
@@ -60,11 +48,9 @@ class PTChunk(Chunk):
         return chunk_size - 2 * self._chunk_size_t_size
 
     def _set_leading_size(self, size):
-        level = silence_logger()
         chunk_flags = (
             self.state.memory.load(self.base + self._chunk_size_t_size, self._chunk_size_t_size) & CHUNK_FLAGS_MASK
         )
-        unsilence_logger(level)
         self.state.memory.store(self.base + self._chunk_size_t_size, size | chunk_flags, size=self.state.arch.bytes)
 
     def _set_trailing_size(self, size):
@@ -98,9 +84,7 @@ class PTChunk(Chunk):
 
         :param is_free: if True, sets the previous chunk to be free; if False, sets it to be allocated
         """
-        level = silence_logger()
         size_field = self.state.memory.load(self.base + self._chunk_size_t_size, self._chunk_size_t_size)
-        unsilence_logger(level)
         if is_free:
             self.state.memory.store(
                 self.base + self._chunk_size_t_size, size_field & ~CHUNK_P_MASK, size=self.state.arch.bytes
@@ -550,9 +534,7 @@ class SimHeapPTMalloc(SimHeapFreelist):
                 return 0
             # Copy the old data over
             old_data_ptr = chunk.data_ptr()
-            level = silence_logger()
             old_data = self.state.memory.load(old_data_ptr, size=old_size - 2 * self._chunk_size_t_size)
-            unsilence_logger(level)
             self.state.memory.store(new_data_ptr, old_data)
             self.free(old_data_ptr)  # Free the old chunk
             return new_data_ptr

angr/state_plugins/heap/utils.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ...errors import SimSolverError
+from angr.errors import SimSolverError
 
 
 def concretize(x, solver, sym_handler):

angr/state_plugins/history.py

@@ -9,8 +9,8 @@ import claripy
 from claripy.ast.bv import BV
 
 from .plugin import SimStatePlugin
-from .. import sim_options
-from ..state_plugins.sim_action import SimActionObject
+from angr import sim_options
+from angr.state_plugins.sim_action import SimActionObject
 
 l = logging.getLogger(name=__name__)
 

angr/state_plugins/javavm_classloader.py

@@ -3,9 +3,9 @@ import logging
 
 from archinfo.arch_soot import SootAddressDescriptor, SootAddressTerminator, SootClassDescriptor
 
-from ..engines.soot.method_dispatcher import resolve_method
-from ..engines import UberEngine
-from ..sim_state import SimState
+from angr.engines.soot.method_dispatcher import resolve_method
+from angr.engines import UberEngine
+from angr.sim_state import SimState
 from .plugin import SimStatePlugin
 
 l = logging.getLogger("angr.state_plugins.javavm_classloader")

angr/state_plugins/jni_references.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-from ..sim_state import SimState
+from angr.sim_state import SimState
 from .plugin import SimStatePlugin
 
 l = logging.getLogger("angr.state_plugins.jni_references")

angr/state_plugins/light_registers.py

@@ -3,9 +3,9 @@ import claripy
 import logging
 
 from .plugin import SimStatePlugin
-from ..errors import SimFastMemoryError
-from ..misc.ux import once
-from .. import sim_options as options
+from angr.errors import SimFastMemoryError
+from angr.misc.ux import once
+from angr import sim_options as options
 
 l = logging.getLogger(__name__)
 

angr/state_plugins/log.py

@@ -76,7 +76,7 @@ class SimStateLog(SimStatePlugin):
         # self.input_variables.clear()
 
 
-from ..errors import SimEventError
+from angr.errors import SimEventError
 from .sim_event import SimEvent
 from .sim_action import SimAction, SimActionConstraint