angr 9.2.116__py3-none-win_amd64.whl → 9.2.118__py3-none-win_amd64.whl

angr/procedures/linux_kernel/fstat64.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 import angr
 
@@ -23,7 +24,7 @@ class fstat64(angr.SimProcedure):
         elif self.arch.name.startswith("ARM"):
             self._store_arm(stat_buf, stat)
         else:
-            raise angr.errors.SimProcedureError("Unsupported fstat64 arch: %s" % self.arch.name)
+            raise angr.errors.SimProcedureError(f"Unsupported fstat64 arch: {self.arch.name}")
         return result
 
     def _store_arm(self, stat_buf, stat):
@@ -62,7 +63,7 @@ class fstat64(angr.SimProcedure):
         store(0x2C, stat.st_size)
         store(0x34, stat.st_blksize)
         store(0x38, stat.st_blocks)
-        store(0x3C, self.state.solver.BVV(0, 32))  # padding
+        store(0x3C, claripy.BVV(0, 32))  # padding
         store(0x40, stat.st_atime)
         store(0x44, stat.st_atimensec)
         store(0x48, stat.st_mtime)
@@ -81,7 +82,7 @@ class fstat64(angr.SimProcedure):
         store(0x18, stat.st_nlink)
         store(0x1C, stat.st_uid)
         store(0x20, stat.st_gid)
-        store(0x24, self.state.solver.BVV(0, 32))
+        store(0x24, claripy.BVV(0, 32))
         store(0x28, stat.st_rdev)
         store(0x30, stat.st_size)
         store(0x38, stat.st_blksize)
@@ -92,9 +93,9 @@ class fstat64(angr.SimProcedure):
         store(0x60, stat.st_mtimensec)
         store(0x68, stat.st_ctime)
         store(0x70, stat.st_ctimensec)
-        store(0x78, self.state.solver.BVV(0, 64))
-        store(0x80, self.state.solver.BVV(0, 64))
-        store(0x88, self.state.solver.BVV(0, 64))
+        store(0x78, claripy.BVV(0, 64))
+        store(0x80, claripy.BVV(0, 64))
+        store(0x88, claripy.BVV(0, 64))
 
     def _store_ppc32(self, stat_buf, stat):
         def store(offset, val):
@@ -107,10 +108,10 @@ class fstat64(angr.SimProcedure):
         store(0x18, stat.st_uid)
         store(0x1C, stat.st_gid)
         store(0x20, stat.st_rdev)
-        store(0x28, self.state.solver.BVV(0, 64))
+        store(0x28, claripy.BVV(0, 64))
         store(0x30, stat.st_size)
         store(0x38, stat.st_blksize)
-        store(0x3C, self.state.solver.BVV(0, 32))
+        store(0x3C, claripy.BVV(0, 32))
         store(0x40, stat.st_blocks)
         store(0x48, stat.st_atime)
         store(0x4C, stat.st_atimensec)
@@ -118,20 +119,20 @@ class fstat64(angr.SimProcedure):
         store(0x54, stat.st_mtimensec)
         store(0x58, stat.st_ctime)
         store(0x5C, stat.st_ctimensec)
-        store(0x60, self.state.solver.BVV(0, 32))
-        store(0x64, self.state.solver.BVV(0, 32))
+        store(0x60, claripy.BVV(0, 32))
+        store(0x64, claripy.BVV(0, 32))
 
     def _store_mips32(self, stat_buf, stat):
         def store(offset, val):
             return self.state.memory.store(stat_buf + offset, val, endness=self.state.arch.memory_endness)
 
         store(0x00, stat.st_dev)
-        store(0x04, self.state.solver.BVV(0, 32 * 3))
+        store(0x04, claripy.BVV(0, 32 * 3))
         store(0x10, stat.st_ino)
         store(0x18, stat.st_uid)
         store(0x1C, stat.st_gid)
         store(0x20, stat.st_rdev)
-        store(0x24, self.state.solver.BVV(0, 32 * 3))
+        store(0x24, claripy.BVV(0, 32 * 3))
         store(0x30, stat.st_size)
         store(0x38, stat.st_atime)
         store(0x3C, stat.st_atimensec)
@@ -140,7 +141,7 @@ class fstat64(angr.SimProcedure):
         store(0x48, stat.st_ctime)
         store(0x4C, stat.st_ctimensec)
         store(0x50, stat.st_blksize)
-        store(0x54, self.state.solver.BVV(0, 32))
+        store(0x54, claripy.BVV(0, 32))
         store(0x58, stat.st_blocks)
 
     def _store_arm_eabi(self, stat_buf, stat):
@@ -148,18 +149,18 @@ class fstat64(angr.SimProcedure):
             return self.state.memory.store(stat_buf + offset, val, endness=self.state.arch.memory_endness)
 
         store(0x00, stat.st_dev)
-        store(0x02, self.state.solver.BVV(0, 8 * 10))
+        store(0x02, claripy.BVV(0, 8 * 10))
         store(0x0C, stat.st_ino)
         store(0x10, stat.st_mode)
         store(0x14, stat.st_nlink)
         store(0x18, stat.st_uid)
         store(0x1C, stat.st_gid)
         store(0x20, stat.st_rdev)
-        store(0x22, self.state.solver.BVV(0, 8 * 10))
+        store(0x22, claripy.BVV(0, 8 * 10))
         store(0x2C, stat.st_size)
         store(0x34, stat.st_blksize)
         store(0x38, stat.st_blocks)
-        store(0x3C, self.state.solver.BVV(0, 32))
+        store(0x3C, claripy.BVV(0, 32))
         store(0x40, stat.st_atime)
         store(0x44, stat.st_atimensec)
         store(0x48, stat.st_mtime)

angr/procedures/linux_kernel/futex.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import angr
 
@@ -12,6 +13,5 @@ class futex(angr.SimProcedure):
         if op & 1:  # FUTEX_WAKE
             l.debug("futex(FUTEX_WAKE)")
             return 0
-        else:
-            l.debug("futex(futex_op=%d)", op)
-            return self.state.solver.Unconstrained("futex", self.arch.sizeof["int"], key=("api", "futex"))
+        l.debug("futex(futex_op=%d)", op)
+        return self.state.solver.Unconstrained("futex", self.arch.sizeof["int"], key=("api", "futex"))

angr/procedures/linux_kernel/getegid.py

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

angr/procedures/linux_kernel/geteuid.py

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

angr/procedures/linux_kernel/getgid.py

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

angr/procedures/linux_kernel/getpid.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 # pylint:disable=arguments-differ

angr/procedures/linux_kernel/getrlimit.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import angr
 
@@ -15,9 +16,8 @@ class getrlimit(angr.SimProcedure):
                 rlim + 8, self.state.solver.Unconstrained("rlim_max", 8 * 8, key=("api", "rlimit", "stack"))
             )
             return 0
-        else:
-            l.debug("running getrlimit(other)")
-            return self.state.solver.Unconstrained("rlimit", self.arch.sizeof["int"], key=("api", "rlimit", "other"))
+        l.debug("running getrlimit(other)")
+        return self.state.solver.Unconstrained("rlimit", self.arch.sizeof["int"], key=("api", "rlimit", "other"))
 
 
 class ugetrlimit(getrlimit):

angr/procedures/linux_kernel/gettid.py

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

angr/procedures/linux_kernel/getuid.py

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

angr/procedures/linux_kernel/iovec.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 from ..posix.read import read
 from ..posix.write import write

angr/procedures/linux_kernel/lseek.py

@@ -1,7 +1,10 @@
-import angr
-
+from __future__ import annotations
 import logging
 
+import claripy
+
+import angr
+
 l = logging.getLogger(name=__name__)
 
 
@@ -36,4 +39,4 @@ class lseek(angr.SimProcedure):
         success = simfd.seek(seek, whence_str)
         if self.state.solver.is_false(success):
             return -1
-        return self.state.solver.If(success, simfd.tell(), -1)
+        return claripy.If(success, simfd.tell(), -1)

angr/procedures/linux_kernel/mmap.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ..posix.mmap import mmap
 
 

angr/procedures/linux_kernel/mprotect.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 
@@ -8,18 +9,18 @@ class mprotect(angr.SimProcedure):
     def run(self, addr, length, prot):  # pylint:disable=arguments-differ,unused-argument
         try:
             addr = self.state.solver.eval_one(addr)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimValueError("mprotect can't handle symbolic addr")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimValueError("mprotect can't handle symbolic addr") from err
 
         try:
             length = self.state.solver.eval_one(length)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimValueError("mprotect can't handle symbolic length")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimValueError("mprotect can't handle symbolic length") from err
 
         try:
             prot = self.state.solver.eval_one(prot)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimValueError("mprotect can't handle symbolic prot")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimValueError("mprotect can't handle symbolic prot") from err
 
         l.debug("mprotect(%#x, %#x, %#x) = ...", addr, length, prot)
 

angr/procedures/linux_kernel/munmap.py

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

angr/procedures/linux_kernel/openat.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -16,11 +17,8 @@ class openat(angr.SimProcedure):
         # simply check the unsigned value.
         # TODO: Is above described way to check dirfd okay?
         dirfd_val = self.state.solver.eval(dirfd)
-        if path.startswith(b"/") or dirfd_val == 0xFFFFFF9C:
-            fd = self.state.posix.open(path, flags)
-        else:
-            # TODO: Implement support for opening path relative to directory corresponding to dirfd
-            fd = None
+        # TODO: Implement support for opening path relative to directory corresponding to dirfd
+        fd = self.state.posix.open(path, flags) if path.startswith(b"/") or dirfd_val == 4294967196 else None
 
         if fd is None:
             return -1

angr/procedures/linux_kernel/set_tid_address.py

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

angr/procedures/linux_kernel/sigaction.py

@@ -1,10 +1,13 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
 class sigaction(angr.SimProcedure):
     def run(self, signum, act, oldact):  # pylint:disable=arguments-differ,unused-argument
         # TODO: actually do something
-        return self.state.solver.BVV(0, self.arch.sizeof["long"])
+        return claripy.BVV(0, self.arch.sizeof["long"])
 
 
 class rt_sigaction(angr.SimProcedure):
@@ -13,4 +16,4 @@ class rt_sigaction(angr.SimProcedure):
         # ...hack
         if self.state.solver.is_true(signum == 33):
             return self.state.libc.ret_errno("EINVAL")
-        return self.state.solver.BVV(0, self.arch.sizeof["long"])
+        return claripy.BVV(0, self.arch.sizeof["long"])

angr/procedures/linux_kernel/sigprocmask.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
@@ -9,12 +12,12 @@ class sigprocmask(angr.SimProcedure):
         self.state.posix.sigprocmask(how, self.state.memory.load(set_, sigsetsize), sigsetsize, valid_ptr=set_ != 0)
 
         # TODO: EFAULT
-        return self.state.solver.If(
-            self.state.solver.And(
+        return claripy.If(
+            claripy.And(
                 how != self.state.posix.SIG_BLOCK,
                 how != self.state.posix.SIG_UNBLOCK,
                 how != self.state.posix.SIG_SETMASK,
             ),
-            self.state.solver.BVV(self.state.posix.EINVAL, self.arch.sizeof["int"]),
+            claripy.BVV(self.state.posix.EINVAL, self.arch.sizeof["int"]),
             0,
         )

angr/procedures/linux_kernel/stat.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 from ...storage.file import Flags
@@ -6,7 +7,7 @@ from .fstat import fstat
 
 class stat(fstat):
     def run(self, p_addr, stat_buf):
-        # open tempory fd
+        # open temporary fd
         strlen = angr.SIM_PROCEDURES["libc"]["strlen"]
         p_strlen = self.inline_call(strlen, p_addr)
         p_expr = self.state.memory.load(p_addr, p_strlen.max_null_index, endness="Iend_BE")
@@ -16,7 +17,7 @@ class stat(fstat):
         # Use fstat to get the result and everything
         result = super().run(fd, stat_buf)
 
-        # close tempory fd
+        # close temporary fd
         self.state.posix.close(fd)
 
         return result

angr/procedures/linux_kernel/sysinfo.py

@@ -1,4 +1,5 @@
 # pylint:disable=missing-class-docstring
+from __future__ import annotations
 import angr
 
 from ...sim_type import SimStruct, SimTypeLong, SimTypeFixedSizeArray, SimTypeShort, SimTypeInt

angr/procedures/linux_kernel/tgkill.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
 class tgkill(angr.SimProcedure):
     def run(self, tgid, tid, sig):  # pylint:disable=arguments-differ,unused-argument
         # TODO: actually do something
-        return self.state.solver.BVV(0, self.arch.sizeof["int"])
+        return claripy.BVV(0, self.arch.sizeof["int"])

angr/procedures/linux_kernel/time.py

@@ -1,5 +1,9 @@
+from __future__ import annotations
+import time as py_time
+
+import claripy
+
 import angr
-import time as _time
 
 
 class time(angr.SimProcedure):
@@ -17,8 +21,8 @@ class time(angr.SimProcedure):
     def run(self, pointer):
         # TODO lord have mercy. how big is time_t?
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            ts = int(_time.time())
-            result = self.state.solver.BVV(ts, self.state.arch.bits)
+            ts = int(py_time.time())
+            result = claripy.BVV(ts, self.state.arch.bits)
         else:
             result = self.state.solver.BVS("sys_time", self.state.arch.bits, key=("api", "time"))
             if self.last_time is not None:

angr/procedures/linux_kernel/uid.py

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

angr/procedures/linux_kernel/uname.py

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

angr/procedures/linux_kernel/unlink.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -18,5 +19,4 @@ class unlink(angr.SimProcedure):  # pylint:disable=W0622
 
         if self.state.fs.delete(str_val):
             return 0
-        else:
-            return -1
+        return -1

angr/procedures/linux_kernel/vsyscall.py

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

angr/procedures/linux_loader/_dl_initial_error_catch_tsd.py

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

angr/procedures/linux_loader/_dl_rtld_lock.py

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

angr/procedures/linux_loader/sim_loader.py

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

angr/procedures/linux_loader/tls.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 from angr.errors import SimValueError
 
@@ -22,8 +23,7 @@ class ___tls_get_addr(angr.SimProcedure):
             ptr = self.state.regs.eax
             # use SIM_PROCEDURES so name-mangling doesn't fuck us :|
             return self.inline_call(angr.SIM_PROCEDURES["linux_loader"]["__tls_get_addr"], ptr).ret_expr
-        else:
-            raise angr.errors.SimUnsupportedError("___tls_get_addr only implemented for x86. Talk to @rhelmot.")
+        raise angr.errors.SimUnsupportedError("___tls_get_addr only implemented for x86. Talk to @rhelmot.")
 
 
 class tlsdesc_resolver(angr.SimProcedure):

angr/procedures/msvcr/__getmainargs.py

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

angr/procedures/msvcr/_initterm.py

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

angr/procedures/msvcr/fmode.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
@@ -17,7 +20,7 @@ class _get_fmode(angr.SimProcedure):
 
 class _set_fmode(angr.SimProcedure):
     def run(self, val):
-        if not self.state.solver.is_true(self.state.solver.Or(val == 0x4000, val == 0x8000)):
+        if not self.state.solver.is_true(claripy.Or(val == 0x4000, val == 0x8000)):
             return 22
         self.state.mem[self.project.simos.fmode_ptr].int = val
         return 0

angr/procedures/ntdll/exceptions.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
@@ -13,7 +16,7 @@ class KiUserExceptionDispatcher(angr.SimProcedure):
         if self.state.arch.name != "X86":
             raise angr.errors.SimUnsupportedError("KiUserDispatchException is only implemented for X86")
 
-        self.tib_ptr = self.state.regs._fs.concat(self.state.solver.BVV(0, 16))
+        self.tib_ptr = self.state.regs._fs.concat(claripy.BVV(0, 16))
         self.top_record = self.state.mem[self.tib_ptr].uint32_t.resolved
         self.cur_ptr = self.top_record
 
@@ -26,15 +29,15 @@ class KiUserExceptionDispatcher(angr.SimProcedure):
         if self.call_ret_expr is not None:
             try:
                 disposition = self.state.solver.eval_one(self.call_ret_expr)
-            except angr.errors.SimSolverError:
-                raise angr.errors.SimError("Exception handler returned symbolic value %s" % self.call_ret_expr)
+            except angr.errors.SimSolverError as err:
+                raise angr.errors.SimError(f"Exception handler returned symbolic value {self.call_ret_expr}") from err
             if disposition == 0:  # Handled!!!
                 self.project.simos._load_regs(self.state, context)
                 # TODO: re-set the exception handler somehow?
                 # self.state.mem[self.tib_ptr].uint32_t
                 self.jump(self.state.regs._ip)
                 return
-            elif disposition == 1:  # unhandled, continue search
+            if disposition == 1:  # unhandled, continue search
                 pass
             elif disposition == 2:
                 raise angr.errors.SimUnsupportedError("Exception disposition ExceptionNestedException is unsupported")

angr/procedures/posix/accept.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -25,5 +26,4 @@ class accept(angr.SimProcedure):
         ident_counters = dict(self.state.globals.get("accept_idents", {}))
         ident_counters[ident] = ident_counters.get(ident, 0) + 1
         self.state.globals["accept_idents"] = ident_counters
-        fd = self.state.posix.open_socket(("accept", ident, ident_counters[ident]))
-        return fd
+        return self.state.posix.open_socket(("accept", ident, ident_counters[ident]))

angr/procedures/posix/bind.py

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

angr/procedures/posix/bzero.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+import claripy
+
 from ..libc import memset
 
 
 class bzero(memset.memset):
     def run(self, addr, size):
-        return super().run(addr, self.state.solver.BVV(0, self.arch.byte_width), size)
+        return super().run(addr, claripy.BVV(0, self.arch.byte_width), size)

angr/procedures/posix/chroot.py

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

angr/procedures/posix/close.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 
@@ -5,5 +6,4 @@ class close(angr.SimProcedure):
     def run(self, fd):  # pylint:disable=arguments-differ
         if self.state.posix.close(fd):
             return 0
-        else:
-            return -1
+        return -1

angr/procedures/posix/closedir.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .close import close
 
 

angr/procedures/posix/dup.py

@@ -1,10 +1,11 @@
+from __future__ import annotations
 import angr
 
 
 class dup(angr.SimProcedure):  # pylint:disable=W0622
     def run(self, oldfd):  # pylint:disable=arguments-differ
         oldfd = self.state.solver.eval(oldfd)
-        if oldfd not in self.state.posix.fd.keys():
+        if oldfd not in self.state.posix.fd:
             return self.state.libc.ret_errno("EBADF")
 
         # The new fd gets the lowest free number, so we search
@@ -22,7 +23,7 @@ class dup2(angr.SimProcedure):
         oldfd = self.state.solver.eval(oldfd)
         newfd = self.state.solver.eval(newfd)
 
-        if oldfd not in self.state.posix.fd.keys():
+        if oldfd not in self.state.posix.fd:
             return self.state.libc.ret_errno("EBADF")
 
         if oldfd == newfd:
@@ -41,7 +42,7 @@ class dup3(angr.SimProcedure):
         oldfd = self.state.solver.eval(oldfd)
         newfd = self.state.solver.eval(newfd)
 
-        if oldfd not in self.state.posix.fd.keys():
+        if oldfd not in self.state.posix.fd:
             return self.state.libc.ret_errno("EBADF")
 
         if oldfd == newfd:

angr/procedures/posix/fcntl.py

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