refactor: remove some parameters

This commit is contained in:
Dobin
2024-02-16 15:34:12 +00:00
parent ca8e830ec6
commit a886bffd0b
2 changed files with 5 additions and 8 deletions
+3 -4
View File
@@ -15,8 +15,7 @@ use_templates = True
def compile(
c_in: FilePath,
asm_out: FilePath,
payload_len: int,
exe_info: ExeInfo
payload_len: int
):
logger.info("--[ Compile C to ASM: {} -> {} ".format(c_in, asm_out))
@@ -36,7 +35,7 @@ def compile(
# Assembly text fixup (SuperMega)
logger.info("---[ Fixup : {} ".format(asm_out))
if not fixup_asm_file(asm_out, payload_len, exe_info):
if not fixup_asm_file(asm_out, payload_len):
raise Exception("Error: Fixup failed")
observer.add_text("payload_asm_fixup", file_readall_text(asm_out))
@@ -64,7 +63,7 @@ def bytes_to_asm_db(byte_data: bytes) -> bytes:
return "\tDB " + formatted_string
def fixup_asm_file(filename: FilePath, payload_len: int, exe_info: ExeInfo):
def fixup_asm_file(filename: FilePath, payload_len: int):
with open(filename, 'r', encoding='utf-8') as asmfile:
lines = asmfile.readlines()
+2 -4
View File
@@ -150,8 +150,7 @@ def start():
phases.compiler.compile(
c_in = main_c_file,
asm_out = main_asm_file,
payload_len = len(project.payload_data),
exe_info = project.exe_info)
payload_len = len(project.payload_data))
# Decide if we can use IAT_REUSE (all function calls available as import)
required_functions = phases.compiler.get_function_stubs(main_asm_file)
@@ -178,8 +177,7 @@ def start():
phases.compiler.compile(
c_in = main_c_file,
asm_out = main_asm_file,
payload_len = len(project.payload_data),
exe_info = project.exe_info)
payload_len = len(project.payload_data))
# Assemble: ASM -> Shellcode
if project.generate_shc_from_asm: