Fixed variable names

Author: ohjeongwook

shellcode_emulator/api.py

@@ -32,11 +32,11 @@ def return_function(self, uc, return_address, arg_count, return_value):
         uc.reg_write(self.emulator.get_register_by_name("eax"), return_value)
 
     def callback(self, uc, address, size, user_data):
-        self.emulator.instruction.dump_disassembly(address, size, resolve_symbol = True)
+        self.emulator.instruction.dump_disassembly(address, size, find_symbol = True)
 
         code = uc.mem_read(address, size)
         try:
-            name = self.emulator.debugger.resolve_symbol(instruction.address)
+            name = self.emulator.debugger.find_symbol(instruction.address)
         except:
             name = ''
 

shellcode_emulator/instruction.py

@@ -35,7 +35,7 @@ def disassemble(self, code, address):
             md = capstone.Cs(capstone.CS_ARCH_X86, capstone.CS_MODE_64)
         return md.disasm(code, address)
 
-    def dump_disassembly(self, address, size, resolve_symbol = False, dump_instruction_count = 1):
+    def dump_disassembly(self, address, size, find_symbol = False, dump_instruction_count = 1):
         code = self.uc.mem_read(address, size)
 
         try:            
@@ -50,7 +50,7 @@ def dump_disassembly(self, address, size, resolve_symbol = False, dump_instructi
             symbol_str = ''
             if self.emulator.debugger:
                 try:
-                    symbol_str = self.emulator.debugger.resolve_symbol(instruction.address) + ':\t'
+                    symbol_str = self.emulator.debugger.find_symbol(instruction.address) + ':\t'
                 except:
                     pass
 

shellcode_emulator/run.py

@@ -73,16 +73,16 @@ def add_unicorn_hook(self, hook_type, callback, arg = None, start = 0, end = 0):
     def start(self, start, end):
         self.uc.emu_start(start, end)
 
-class ShellEmu:
-    def __init__(self, shellcode_filename, shellcode_bytes = '', dump_filename = '', exhaustive_loop_dump_frequency = 0x10000):
+class ShellcodeEmulator:
+    def __init__(self, shellcode_filename, shellcode_bytes = '', dump_filename = '', arch = 'AMD64', exhaustive_loop_dump_frequency = 0x10000):
         self.shellcode_filename = shellcode_filename
         self.shellcode_bytes = shellcode_bytes
         self.exhaustive_loop_dump_frequency = exhaustive_loop_dump_frequency
         self.address_hit_map = {}            
         self.last_code_address = 0
         self.last_code_size = 0
 
-        self.emulator = Emulator(dump_filename = dump_filename)
+        self.emulator = Emulator(dump_filename = dump_filename, arch = arch)
 
     def instruction_callback(self, uc, address, size, user_data):
         self.emulator.instruction.dump_context()
@@ -151,6 +151,9 @@ def run(self, trace_self_modification = False, print_first_instructions = False)
     parser.add_option("-d", "--dump_filename", dest = "dump_filename", 
                         type = "string", default = "", metavar = "DUMP_FILENAME", 
                         help = "A process dump file from normal Windows process")
+    parser.add_option("-a", "--arch", dest = "arch",
+                        type = "string", default = "AMD64", metavar = "ARCH",
+                        help = "A process dump file from normal Windows process")
     parser.add_option("-l", "--list_filename", dest = "list_filename", 
                         type = "string", default = "", metavar = "LIST_FILENAME", 
                         help = "A list filename generated by IDA (this can be used instead of shellcode filename)")
@@ -173,5 +176,5 @@ def run(self, trace_self_modification = False, print_first_instructions = False)
         parser.print_help()
         sys.exit(0)
 
-    shell_emu = ShellEmu(shellcode_filename, shellcode_bytes = shellcode_bytes, dump_filename = options.dump_filename)
+    shell_emu = ShellcodeEmulator(shellcode_filename, shellcode_bytes = shellcode_bytes, arch = options.arch, dump_filename = options.dump_filename)
     shell_emu.run(trace_self_modification = True, print_first_instructions = True)