comply with the changes in angrop

angr · Jan 31, 2024 · 5ee1b67 · 5ee1b67
1 parent 6943bd7
commit 5ee1b67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rex/crash.py b/rex/crash.py
@@ -67,7 +67,7 @@ def initialize_rop(self):
             return
 
         # finally, create an angrop object
-        rop = self.project.analyses.ROP(fast_mode=self._rop_fast_mode, rebase=False)
+        rop = self.project.analyses.ROP(fast_mode=self._rop_fast_mode)
         rop.set_badbytes(self._bad_bytes)
         if self._rop_cache and self._rop_cache[0]:
             l.info("Loading rop gadgets from cache")
@@ -107,7 +107,7 @@ def initialize_libc_rop(self):
         # finally, create an angrop object
         bin_opts = {"base_addr": base_addr}
         project = angr.Project(self.libc_binary, auto_load_libs=False, main_opts=bin_opts)
-        libc_rop = project.analyses.ROP(fast_mode=self._rop_fast_mode, rebase=False)
+        libc_rop = project.analyses.ROP(fast_mode=self._rop_fast_mode)
         libc_rop.set_badbytes(self._bad_bytes)
         if self._rop_cache and self._rop_cache[1]:
             l.info("Loading libc rop gadgets from cache")

diff --git a/rex/exploit/techniques/rop_leak_memory.py b/rex/exploit/techniques/rop_leak_memory.py
@@ -109,7 +109,7 @@ def apply(self, **kwargs):
         address_var = claripy.BVS('address_var', self.crash.project.arch.bits, explicit_name=True)
         length_var = claripy.BVS('length_var', self.crash.project.arch.bits, explicit_name=True)
         chain = self.rop.do_syscall(2, [1, address_var, length_var, 0x0],
-                ignore_registers=rop_uncontrolled)
+                preserve_regs=rop_uncontrolled)
 
         chain, chain_addr = self._ip_overwrite_with_chain(chain)