diff options
| -rw-r--r-- | nsploit/payload/__init__.py | 2 | ||||
| -rw-r--r-- | nsploit/payload/ret2dlresolve.py | 4 | ||||
| -rw-r--r-- | nsploit/tech/__init__.py | 2 | ||||
| -rw-r--r-- | nsploit/tech/gadhint.py (renamed from nsploit/payload/gadhint.py) | 0 | ||||
| -rw-r--r-- | nsploit/tech/rop.py (renamed from nsploit/payload/rop.py) | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nsploit/payload/__init__.py b/nsploit/payload/__init__.py index da47cc1..9066a05 100644 --- a/nsploit/payload/__init__.py +++ b/nsploit/payload/__init__.py @@ -1,6 +1,4 @@ from .fmtstring import * -from .gadhint import * from .payload import * from .payload_entry import * from .ret2dlresolve import * -from .rop import * diff --git a/nsploit/payload/ret2dlresolve.py b/nsploit/payload/ret2dlresolve.py index 3dbd2ed..8446ead 100644 --- a/nsploit/payload/ret2dlresolve.py +++ b/nsploit/payload/ret2dlresolve.py @@ -73,11 +73,11 @@ Elf64_Rel.r_info = 0xAAAAAAAABBBBBBBB """ from nsploit.arch import arch, itob -from nsploit.payload.gadhint import GadHint from nsploit.payload.payload import Payload from nsploit.payload.payload_entry import padalign, padlen, pointer -from nsploit.payload.rop import ROP from nsploit.rev.r2 import run_cmd +from nsploit.tech.gadhint import GadHint +from nsploit.tech.rop import ROP _JMP_SLOT = 0x07 diff --git a/nsploit/tech/__init__.py b/nsploit/tech/__init__.py new file mode 100644 index 0000000..d7e4b6d --- /dev/null +++ b/nsploit/tech/__init__.py @@ -0,0 +1,2 @@ +from .gadhint import * +from .rop import * diff --git a/nsploit/payload/gadhint.py b/nsploit/tech/gadhint.py index 1918a79..1918a79 100644 --- a/nsploit/payload/gadhint.py +++ b/nsploit/tech/gadhint.py diff --git a/nsploit/payload/rop.py b/nsploit/tech/rop.py index 78f9950..c5b3ef8 100644 --- a/nsploit/payload/rop.py +++ b/nsploit/tech/rop.py @@ -1,9 +1,9 @@ from graphlib import TopologicalSorter from nsploit.arch import arch, btoi, itob -from nsploit.payload.gadhint import GadHint from nsploit.payload.payload import Payload from nsploit.payload.payload_entry import padalign, padlen +from nsploit.tech.gadhint import GadHint _POP_MAGIC = 0xdead _SPM_MAGIC = b"\x69" |