diff options
| -rw-r--r-- | nsploit/payload/__init__.py | 2 | ||||
| -rw-r--r-- | nsploit/tech/fmtstring.py | 4 | ||||
| -rw-r--r-- | nsploit/tech/ret2dlresolve.py | 4 | ||||
| -rw-r--r-- | nsploit/tech/rop.py | 4 | ||||
| -rw-r--r-- | nsploit/types/__init__.py | 2 | ||||
| -rw-r--r-- | nsploit/types/payload.py (renamed from nsploit/payload/payload.py) | 2 | ||||
| -rw-r--r-- | nsploit/types/payload_entry.py (renamed from nsploit/payload/payload_entry.py) | 0 |
7 files changed, 9 insertions, 9 deletions
diff --git a/nsploit/payload/__init__.py b/nsploit/payload/__init__.py deleted file mode 100644 index d4b9be7..0000000 --- a/nsploit/payload/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .payload import * -from .payload_entry import * diff --git a/nsploit/tech/fmtstring.py b/nsploit/tech/fmtstring.py index 1ec4609..6ac74c5 100644 --- a/nsploit/tech/fmtstring.py +++ b/nsploit/tech/fmtstring.py @@ -30,8 +30,8 @@ See `man 3 printf` for more details. """ from nsploit.arch import arch, btoi, itob -from nsploit.payload.payload import Payload -from nsploit.payload.payload_entry import padalign, padrel +from nsploit.types.payload import Payload +from nsploit.types.payload_entry import padalign, padrel _FMTSTR_MAGIC = b"\xcd" diff --git a/nsploit/tech/ret2dlresolve.py b/nsploit/tech/ret2dlresolve.py index 8446ead..4e9aff4 100644 --- a/nsploit/tech/ret2dlresolve.py +++ b/nsploit/tech/ret2dlresolve.py @@ -73,11 +73,11 @@ Elf64_Rel.r_info = 0xAAAAAAAABBBBBBBB """ from nsploit.arch import arch, itob -from nsploit.payload.payload import Payload -from nsploit.payload.payload_entry import padalign, padlen, pointer from nsploit.rev.r2 import run_cmd from nsploit.tech.gadhint import GadHint from nsploit.tech.rop import ROP +from nsploit.types.payload import Payload +from nsploit.types.payload_entry import padalign, padlen, pointer _JMP_SLOT = 0x07 diff --git a/nsploit/tech/rop.py b/nsploit/tech/rop.py index c5b3ef8..a2c348e 100644 --- a/nsploit/tech/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.payload import Payload -from nsploit.payload.payload_entry import padalign, padlen from nsploit.tech.gadhint import GadHint +from nsploit.types.payload import Payload +from nsploit.types.payload_entry import padalign, padlen _POP_MAGIC = 0xdead _SPM_MAGIC = b"\x69" diff --git a/nsploit/types/__init__.py b/nsploit/types/__init__.py index a618162..9f2fb30 100644 --- a/nsploit/types/__init__.py +++ b/nsploit/types/__init__.py @@ -1,3 +1,5 @@ from .indextbl import * from .index_entry import * from .lict import * +from .payload import * +from .payload_entry import * diff --git a/nsploit/payload/payload.py b/nsploit/types/payload.py index 295e3c8..2f522b4 100644 --- a/nsploit/payload/payload.py +++ b/nsploit/types/payload.py @@ -1,8 +1,8 @@ from nsploit.arch import itob -from nsploit.payload.payload_entry import PayloadEntry from nsploit.types.indextbl import IndexTbl from nsploit.types.index_entry import IndexEntry from nsploit.types.lict import Lict +from nsploit.types.payload_entry import PayloadEntry _REPR_DATA_LEN = 64 diff --git a/nsploit/payload/payload_entry.py b/nsploit/types/payload_entry.py index 31eb4f8..31eb4f8 100644 --- a/nsploit/payload/payload_entry.py +++ b/nsploit/types/payload_entry.py |