Merge branch 'tech'

Breaks up the "payload" subpackage for a more logical project structure.

A few modules have been appearing in the payload package which implement
support for specific exploit techniques.  These are moved to a new home
in the "tech" subpackage.

The remaining payload class and modules are moved into the "types"
subpackage, as they extend from, and provide similar services as the
content currently found there.

* tech:
  payload: Move to types package
  ret2dlresolve: Move to tech package
  fmtstring: Move to tech package
  rop: Move to new package tech

8 files changed, 12 insertions, 12 deletions

diff --git a/nsploit/payload/__init__.py b/nsploit/tech/__init__.py
index da47cc1..a517e7f 100644
--- a/nsploit/payload/__init__.py
+++ b/nsploit/tech/__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/fmtstring.py b/nsploit/tech/fmtstring.py
index 1ec4609..6ac74c5 100644
--- a/nsploit/payload/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/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/ret2dlresolve.py b/nsploit/tech/ret2dlresolve.py
index 3dbd2ed..4e9aff4 100644
--- a/nsploit/payload/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.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
+from nsploit.types.payload import Payload
+from nsploit.types.payload_entry import padalign, padlen, pointer
 
 _JMP_SLOT = 0x07
 
diff --git a/nsploit/payload/rop.py b/nsploit/tech/rop.py
index 78f9950..a2c348e 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
+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