diff --git a/helper.py b/helper.py index b704ab9..abcec80 100644 --- a/helper.py +++ b/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() diff --git a/model/defs.py b/model/defs.py index 1febb48..28c56cc 100644 --- a/model/defs.py +++ b/model/defs.py @@ -32,8 +32,8 @@ class PayloadLocation(Enum): class CarrierInvokeStyle(Enum): - ChangeEntryPoint = "change AddressOfEntryPoint" - BackdoorCallInstr = "hijack branching instruction in entrypoint" + ChangeEntryPoint = "change EntryPoint" + BackdoorCallInstr = "hijack Main" class FunctionInvokeStyle(Enum): diff --git a/supermega.py b/supermega.py index 2818291..a122c6d 100644 --- a/supermega.py +++ b/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:") - for i in ["eop", "backdoor"]: - logging.error(" {} {}".format(i, carrier_invoke_style_str(i))) + logging.error("Invalid carrier_invoke, use: eop, backdoor") return if not args.shellcode or not args.inject: