Merge branch 'main' of https://github.com/dobin/SuperMega

helper.py

@@ -127,17 +127,6 @@ def file_readall_binary(filepath) -> bytes:
     return data
 
 
-def carrier_invoke_style_str(carrier_invoke_style):
-    carrier_invoke_style = str(carrier_invoke_style)
-    if carrier_invoke_style == "1":
-        return "change address of entrypoint"
-    elif carrier_invoke_style == "2":
-        return "hijack branching instruction in entrypoint"
-    else:
-        return "Invalid: {}".format(carrier_invoke_style)
-
-
-
 def file_to_lf(filename):
     with open(filename, 'rb') as f:
         data = f.read()

model/defs.py

@@ -34,8 +34,8 @@ class PayloadLocation(Enum):
     
 
 class CarrierInvokeStyle(Enum):
-    ChangeEntryPoint = "change AddressOfEntryPoint"
+    ChangeEntryPoint = "change EntryPoint"
-    BackdoorCallInstr = "hijack branching instruction in entrypoint"
+    BackdoorCallInstr = "hijack Main"
 
 
 class FunctionInvokeStyle(Enum):

supermega.py

@@ -67,9 +67,7 @@ def main():
         elif args.carrier_invoke == "backdoor":
             settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
         else:
-            logging.error("Invalid carrier_invoke, use one of:")
+            logging.error("Invalid carrier_invoke, use: eop, backdoor")
-            for i in ["eop", "backdoor"]:
-                logging.error("  {}  {}".format(i, carrier_invoke_style_str(i)))
             return
 
     if not args.shellcode or not args.inject: