Merge 156c156 into c3c06a3

Gallopsled · Oct 5, 2018 · 9830a83 · 9830a83
2 parents c3c06a3 + 156c156
commit 9830a83
Show file tree

Hide file tree

Showing 3 changed files with 1,006 additions and 0 deletions.
diff --git a/pwn/toplevel.py b/pwn/toplevel.py
@@ -29,6 +29,7 @@
 from pwnlib.encoders import *
 from pwnlib.exception import PwnlibException
 from pwnlib.gdb import attach, debug, debug_assembly, debug_shellcode
+from pwnlib.r2 import attach, debug, debug_assembly, debug_shellcode
 from pwnlib.flag import *
 from pwnlib.fmtstr import FmtStr, fmtstr_payload
 from pwnlib.log import getLogger

diff --git a/pwnlib/__init__.py b/pwnlib/__init__.py
@@ -25,6 +25,7 @@
     'log',
     'memleak',
     'pep237',
+    'r2',
     'regsort',
     'replacements',
     'rop',