angr 9.2.117__py3-none-manylinux2014_aarch64.whl → 9.2.119__py3-none-manylinux2014_aarch64.whl

angr/procedures/posix/unlink.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/posix/usleep.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/posix/write.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/procedure_dict.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import os
 

angr/procedures/stubs/CallReturn.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 

angr/procedures/stubs/NoReturnUnconstrained.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/Nop.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/PathTerminator.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/Redirect.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr
@@ -12,6 +13,6 @@ class Redirect(angr.SimProcedure):
         if redirect_to is None:
             raise Exception("Please specify where you wanna jump to.")
 
-        self._custom_name = "Redirect to 0x%08x" % redirect_to
+        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/ReturnChar.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/stubs/ReturnUnconstrained.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -15,7 +16,7 @@ class ReturnUnconstrained(angr.SimProcedure):
                 o = None
             else:
                 o = self.state.solver.Unconstrained(
-                    "unconstrained_ret_%s" % self.display_name, size, key=("api", "?", self.display_name)
+                    f"unconstrained_ret_{self.display_name}", size, key=("api", "?", self.display_name)
                 )
         else:
             o = return_val

angr/procedures/stubs/UnresolvableCallTarget.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/UnresolvableJumpTarget.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/UserHook.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr
@@ -11,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/b64_decode.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/stubs/caller.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/stubs/crazy_scanf.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/stubs/format_parser.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import TYPE_CHECKING
 from string import digits as ascii_digits
 import logging
@@ -81,10 +82,7 @@ class FormatString:
                 # what type of format specifier is it?
                 fmt_spec = component
                 if fmt_spec.spec_type == b"s":
-                    if fmt_spec.length_spec == b".*":
-                        str_length = va_arg("size_t")
-                    else:
-                        str_length = None
+                    str_length = va_arg("size_t") if fmt_spec.length_spec == b".*" else None
                     str_ptr = va_arg("char*")
                     string = self._add_to_string(string, self._get_str_at(str_ptr, max_length=str_length))
                 # integers, for most of these we'll end up concretizing values..
@@ -96,9 +94,7 @@ class FormatString:
                     if fmt_spec.signed and (c_val & (1 << ((fmt_spec.size * 8) - 1))):
                         c_val -= 1 << fmt_spec.size * 8
 
-                    if fmt_spec.spec_type in (b"d", b"i"):
-                        s_val = str(c_val)
-                    elif fmt_spec.spec_type == b"u":
+                    if fmt_spec.spec_type in (b"d", b"i") or fmt_spec.spec_type == b"u":
                         s_val = str(c_val)
                     elif fmt_spec.spec_type == b"c":
                         s_val = chr(c_val & 0xFF)
@@ -109,7 +105,7 @@ class FormatString:
                     elif fmt_spec.spec_type == b"p":
                         s_val = hex(c_val)
                     else:
-                        raise SimProcedureError("Unimplemented format specifier '%s'" % fmt_spec.spec_type)
+                        raise SimProcedureError(f"Unimplemented format specifier '{fmt_spec.spec_type}'")
 
                     if isinstance(fmt_spec.length_spec, int):
                         s_val = s_val.rjust(fmt_spec.length_spec, fmt_spec.pad_chr)
@@ -134,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":
@@ -174,7 +170,7 @@ class FormatString:
                     spec_digits = component.length_spec
 
                     # how many bits can we specify as input?
-                    available_bits = float("inf") if spec_digits is None else spec_digits * math.log(base, 2)
+                    available_bits = float("inf") if spec_digits is None else spec_digits * math.log2(base)
                     not_enough_bits = available_bits < bits
 
                     # how many digits will we model this input as?
@@ -295,7 +291,7 @@ class FormatString:
                         i = i.zero_extend(bits - 8)
                         position += 1
                     else:
-                        raise SimProcedureError("unsupported format spec '%s' in interpret" % fmt_spec.spec_type)
+                        raise SimProcedureError(f"unsupported format spec '{fmt_spec.spec_type}' in interpret")
 
                     i = claripy.Extract(fmt_spec.size * 8 - 1, 0, i)
                     self.parser.state.memory.store(
@@ -346,7 +342,7 @@ class FormatSpecifier:
         return self.string[-1:].lower()
 
     def __str__(self):
-        return "%%%s" % self.string.decode()
+        return f"%{self.string.decode()}"
 
     def __len__(self):
         return len(self.string)
@@ -433,7 +429,7 @@ class FormatParser(SimProcedure):
         return FormatParser._MOD_SPEC
 
     @property
-    def _all_spec(self) -> dict[bytes, "SimType"]:
+    def _all_spec(self) -> dict[bytes, SimType]:
         """
         All specifiers and their lengths.
         """
@@ -496,11 +492,11 @@ class FormatParser(SimProcedure):
                 # this is gross coz sim_type is gross..
                 nugget = nugget[: len(spec)]
                 original_nugget = original_nugget[: (length_spec_str_len + len(spec))]
-                nugtype: "SimType" = all_spec[nugget]
+                nugtype: SimType = all_spec[nugget]
                 try:
                     typeobj = nugtype.with_arch(self.state.arch if self.state is not None else self.project.arch)
-                except Exception:
-                    raise SimProcedureError("format specifier uses unknown type '%s'" % repr(nugtype))
+                except Exception as err:
+                    raise SimProcedureError(f"format specifier uses unknown type '{nugtype!r}'") from err
                 return FormatSpecifier(original_nugget, length_spec, pad_chr, typeobj.size // 8, typeobj.signed)
 
         return None

angr/procedures/stubs/syscall_stub.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -13,13 +14,11 @@ class syscall(angr.SimProcedure):
         size = self.prototype.returnty.size
         if size is None:
             return None
-        else:
-            return self.state.solver.Unconstrained(
-                "syscall_stub_%s" % self.display_name, size, key=("syscall", "?", self.display_name)
-            )
+        return self.state.solver.Unconstrained(
+            f"syscall_stub_{self.display_name}", size, key=("syscall", "?", self.display_name)
+        )
 
     def __repr__(self):
         if "resolves" in self.kwargs:
-            return "<Syscall stub (%s)>" % self.kwargs["resolves"]
-        else:
-            return "<Syscall stub>"
+            return "<Syscall stub ({})>".format(self.kwargs["resolves"])
+        return "<Syscall stub>"

angr/procedures/testing/manyargs.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/testing/retreg.py

@@ -1,8 +1,8 @@
+from __future__ import annotations
 import angr
 
 
 class retreg(angr.SimProcedure):
     def run(self, reg=None):
-        r = self.state.registers.load(reg)
+        return self.state.registers.load(reg)
         # print self.state.options
-        return r

angr/procedures/tracer/random.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ..cgc.random import random as orig_random
 
 

angr/procedures/tracer/receive.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -15,9 +16,8 @@ class receive(orig_receive):
     """
 
     def run(self, fd, buf, count, rx_bytes):
-        if len(self.state.solver.eval_upto(fd, 2)) < 2:
-            if self.state.solver.eval(fd) == 1:
-                l.debug("Fixed receive call's fd.")
-                fd = claripy.BVV(0, self.state.arch.bits)
+        if len(self.state.solver.eval_upto(fd, 2)) < 2 and self.state.solver.eval(fd) == 1:
+            l.debug("Fixed receive call's fd.")
+            fd = claripy.BVV(0, self.state.arch.bits)
 
         return super().run(fd, buf, count, rx_bytes)

angr/procedures/tracer/transmit.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -15,10 +16,9 @@ class transmit(orig_transmit):
     """
 
     def run(self, fd, buf, count, tx_bytes):
-        if len(self.state.solver.eval_upto(fd, 2)) < 2:
-            if self.state.solver.eval(fd) == 0:
-                l.debug("Fixed transmit's call fd.")
-                fd = claripy.BVV(1, self.state.arch.bits)
+        if len(self.state.solver.eval_upto(fd, 2)) < 2 and self.state.solver.eval(fd) == 0:
+            l.debug("Fixed transmit's call fd.")
+            fd = claripy.BVV(1, self.state.arch.bits)
 
         if self.state.has_plugin("zen_plugin"):
             self.state.get_plugin("zen_plugin").analyze_transmit(self.state, buf)

angr/procedures/uclibc/__uClibc_main.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ..glibc.__libc_start_main import __libc_start_main as fucker
 
 

angr/procedures/win32/EncodePointer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/ExitProcess.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/GetCommandLine.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/GetCurrentProcessId.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/GetCurrentThreadId.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/GetLastInputInfo.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy

angr/procedures/win32/GetModuleHandle.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 
@@ -8,8 +9,7 @@ class GetModuleHandleA(angr.SimProcedure):
     def run(self, pointer):
         if self.state.solver.is_true(pointer == 0):
             return self.handle(None)
-        else:
-            return self.handle(self.state.mem[pointer].string.concrete.decode("utf-8"))
+        return self.handle(self.state.mem[pointer].string.concrete.decode("utf-8"))
 
     def handle(self, module_name):
         if module_name is None:
@@ -26,5 +26,4 @@ class GetModuleHandleW(GetModuleHandleA):
     def run(self, pointer):
         if self.state.solver.is_true(pointer == 0):
             return self.handle(None)
-        else:
-            return self.handle(self.state.mem[pointer].wstring.concrete)
+        return self.handle(self.state.mem[pointer].wstring.concrete)

angr/procedures/win32/GetProcessAffinityMask.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy

angr/procedures/win32/InterlockedExchange.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -8,7 +9,7 @@ class InterlockedExchange(angr.SimProcedure):
             self.state.memory.store(target, value)
         else:
             old_value = self.state.solver.Unconstrained(
-                "unconstrained_ret_%s" % self.display_name, self.state.arch.bits, key=("api", "InterlockedExchange")
+                f"unconstrained_ret_{self.display_name}", self.state.arch.bits, key=("api", "InterlockedExchange")
             )
 
         return old_value

angr/procedures/win32/IsProcessorFeaturePresent.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/VirtualAlloc.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 
@@ -25,7 +26,7 @@ def convert_prot(prot):
         return 3
     if prot & 0x08:
         return 3
-    raise angr.errors.SimValueError("Unknown windows memory protection constant: %#x" % prot)
+    raise angr.errors.SimValueError(f"Unknown windows memory protection constant: {prot:#x}")
 
 
 def deconvert_prot(prot):

angr/procedures/win32/VirtualProtect.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 

angr/procedures/win32/critical_section.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/dynamic_loading.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import claripy
 import logging
@@ -42,7 +43,7 @@ class LoadLibraryExW(LoadLibraryA):
 class GetProcAddress(angr.SimProcedure):
     def run(self, lib_handle, name_addr):
         if lib_handle.symbolic:
-            raise angr.errors.SimValueError("GetProcAddress called with symbolic library handle %s" % lib_handle)
+            raise angr.errors.SimValueError(f"GetProcAddress called with symbolic library handle {lib_handle}")
         lib_handle = self.state.solver.eval(lib_handle)
 
         if lib_handle == 0:

angr/procedures/win32/file_handles.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 # pylint: disable=unused-argument,arguments-differ
@@ -11,12 +12,11 @@ class GetStdHandle(angr.SimProcedure):
         # for now, return file descriptors + 1000 as handles
         if (handle == -10).is_true():
             return 1000
-        elif (handle == -11).is_true():
+        if (handle == -11).is_true():
             return 1001
-        elif (handle == -12).is_true():
+        if (handle == -12).is_true():
             return 1002
-        else:
-            return -1
+        return -1
 
 
 class ReadFile(angr.SimProcedure):

angr/procedures/win32/gethostbyname.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 
@@ -8,5 +9,4 @@ l = logging.getLogger("angr.procedures.win32.gethostbyname")
 
 class gethostbyname(angr.SimProcedure):
     def run(self, _):  # pylint:disable=arguments-differ
-        ret_expr = self.state.solver.BVS("gethostbyname_retval", 32, key=("api", "gethostbyname_retval"))
-        return ret_expr
+        return self.state.solver.BVS("gethostbyname_retval", 32, key=("api", "gethostbyname_retval"))

angr/procedures/win32/heap.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/win32/is_bad_ptr.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/local_storage.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr
@@ -29,10 +30,10 @@ class TlsSetValue(angr.SimProcedure):
     KEY = "win32_tls"
 
     def run(self, index, value):
-        conc_indexs = self.state.solver.eval_upto(index, 2)
-        if len(conc_indexs) != 1:
+        conc_indexes = self.state.solver.eval_upto(index, 2)
+        if len(conc_indexes) != 1:
             raise angr.errors.SimValueError("Can't handle symbolic index in TlsSetValue/FlsSetValue")
-        conc_index = conc_indexs[0]
+        conc_index = conc_indexes[0]
 
         if not has_index(self.state, conc_index, self.KEY):
             return 0
@@ -45,10 +46,10 @@ class TlsGetValue(angr.SimProcedure):
     KEY = "win32_tls"
 
     def run(self, index):
-        conc_indexs = self.state.solver.eval_upto(index, 2)
-        if len(conc_indexs) != 1:
+        conc_indexes = self.state.solver.eval_upto(index, 2)
+        if len(conc_indexes) != 1:
             raise angr.errors.SimValueError("Can't handle symbolic index in TlsGetValue/FlsGetValue")
-        conc_index = conc_indexs[0]
+        conc_index = conc_indexes[0]
 
         if not has_index(self.state, conc_index, self.KEY):
             return 0

angr/procedures/win32/mutex.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/sim_time.py

@@ -1,7 +1,7 @@
+from __future__ import annotations
 import datetime
 import time
 
-import claripy
 
 import angr
 
@@ -110,10 +110,10 @@ class GetLocalTime(angr.SimProcedure):
 class QueryPerformanceCounter(angr.SimProcedure):
     def run(self, ptr):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            val = int(time.clock() * 1000000) + 12345678
+            val = int(time.process_time() * 1000000) + 12345678
             self.state.mem[ptr].qword = val
         else:
-            self.state.mem[ptr].qword = claripy.BVS(
+            self.state.mem[ptr].qword = self.state.solver.BVS(
                 "QueryPerformanceCounter_result", 64, key=("api", "QueryPerformanceCounter")
             )
         return 1
@@ -122,10 +122,8 @@ class QueryPerformanceCounter(angr.SimProcedure):
 class GetTickCount(angr.SimProcedure):
     def run(self):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            return int(time.clock() * 1000) + 12345
-        else:
-            val = claripy.BVS("GetTickCount_result", 32, key=("api", "GetTickCount"))
-            return val
+            return int(time.process_time() * 1000) + 12345
+        return self.state.solver.BVS("GetTickCount_result", 32, key=("api", "GetTickCount"))
 
 
 class GetTickCount64(angr.SimProcedure):
@@ -133,6 +131,5 @@ class GetTickCount64(angr.SimProcedure):
 
     def run(self):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            return int(time.clock() * 1000) + 12345
-        else:
-            return claripy.BVS("GetTickCount64_result", 64, key=("api", "GetTickCount64"))
+            return int(time.process_time() * 1000) + 12345
+        return self.state.solver.BVS("GetTickCount64_result", 64, key=("api", "GetTickCount64"))

angr/procedures/win32/system_paths.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import claripy
 
@@ -8,8 +9,8 @@ class GetTempPathA(angr.SimProcedure):
     def run(self, nBufferLength, lpBuffer):
         try:
             length = self.state.solver.eval_one(nBufferLength)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimProcedureError("Can't handle symbolic nBufferLength in GetTempPath")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimProcedureError("Can't handle symbolic nBufferLength in GetTempPath") from err
 
         copy_len = min(self.RESULT.length // 8, length - 1)
         self.state.memory.store(
@@ -24,8 +25,8 @@ class GetWindowsDirectoryA(angr.SimProcedure):
     def run(self, lpBuffer, uSize):
         try:
             length = self.state.solver.eval_one(uSize)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimProcedureError("Can't handle symbolic uSize in GetWindowsDirectory")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimProcedureError("Can't handle symbolic uSize in GetWindowsDirectory") from err
 
         copy_len = min(self.RESULT.length // 8, length - 1)
         self.state.memory.store(

angr/procedures/win32_kernel/ExAllocatePool.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-class-docstring
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/win32_kernel/ExFreePoolWithTag.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-class-docstring
+from __future__ import annotations
 from angr import SimProcedure
 
 

angr/procedures/win_user32/chars.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/win_user32/keyboard.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win_user32/messagebox.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr
@@ -6,10 +7,7 @@ import angr
 class MessageBoxA(angr.SimProcedure):
     def run(self, hWnd, lpText, lpCaption, uType):
         text = self.extract(lpText)
-        if not self.state.solver.is_true(lpCaption == 0):
-            caption = self.extract(lpCaption)
-        else:
-            caption = "Error"
+        caption = self.extract(lpCaption) if not self.state.solver.is_true(lpCaption == 0) else "Error"
 
         result = claripy.If(
             uType & 0xF == 0, 1, self.state.solver.BVS("messagebox_button", 32, key=("api", "messagebox", "button"))