diff options
Diffstat (limited to 'example/asm')
| -rwxr-xr-x | example/asm/shellcode.py | 19 | ||||
| -rw-r--r-- | example/asm/simple.py | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/example/asm/shellcode.py b/example/asm/shellcode.py index 0ee32146..331e4d69 100755 --- a/example/asm/shellcode.py +++ b/example/asm/shellcode.py @@ -8,6 +8,7 @@ from elfesteem.strpatchwork import StrPatchwork from miasm2.core import parse_asm, asmblock from miasm2.analysis.machine import Machine from miasm2.core.interval import interval +from miasm2.core.locationdb import LocationDB parser = ArgumentParser("Multi-arch (32 bits) assembler") parser.add_argument('architecture', help="architecture: " + @@ -65,15 +66,15 @@ with open(args.source) as fstream: source = fstream.read() -symbol_pool = asmblock.AsmSymbolPool() +loc_db = LocationDB() -asmcfg, symbol_pool = parse_asm.parse_txt(machine.mn, attrib, source, symbol_pool) +asmcfg, loc_db = parse_asm.parse_txt(machine.mn, attrib, source, loc_db) # Fix shellcode addrs -symbol_pool.set_offset(symbol_pool.getby_name("main"), addr_main) +loc_db.set_offset(loc_db.getby_name("main"), addr_main) if args.PE: - symbol_pool.set_offset(symbol_pool.getby_name_create("MessageBoxA"), + loc_db.set_offset(loc_db.getby_name_create("MessageBoxA"), pe.DirImport.get_funcvirt('USER32.dll', 'MessageBoxA')) # Print and graph firsts blocks before patching it @@ -84,14 +85,14 @@ open("graph.dot", "w").write(asmcfg.dot()) # Apply patches patches = asmblock.asm_resolve_final(machine.mn, asmcfg, - symbol_pool, + loc_db, dst_interval) if args.encrypt: # Encrypt code - loc_start = symbol_pool.getby_name_create(args.encrypt[0]) - loc_stop = symbol_pool.getby_name_create(args.encrypt[1]) - ad_start = symbol_pool.loc_key_to_offset(loc_start) - ad_stop = symbol_pool.loc_key_to_offset(loc_stop) + loc_start = loc_db.getby_name_create(args.encrypt[0]) + loc_stop = loc_db.getby_name_create(args.encrypt[1]) + ad_start = loc_db.loc_key_to_offset(loc_start) + ad_stop = loc_db.loc_key_to_offset(loc_stop) new_patches = dict(patches) for ad, val in patches.items(): diff --git a/example/asm/simple.py b/example/asm/simple.py index 09df8d94..068d3627 100644 --- a/example/asm/simple.py +++ b/example/asm/simple.py @@ -6,7 +6,7 @@ from miasm2.core import parse_asm, asmblock # Assemble code -asmcfg, symbol_pool = parse_asm.parse_txt(mn_x86, 32, ''' +asmcfg, loc_db = parse_asm.parse_txt(mn_x86, 32, ''' main: MOV EAX, 1 MOV EBX, 2 @@ -22,10 +22,10 @@ loop: ''') # Set 'main' loc_key's offset -symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x0) +loc_db.set_offset(loc_db.getby_name("main"), 0x0) # Spread information and resolve instructions offset -patches = asmblock.asm_resolve_final(mn_x86, asmcfg, symbol_pool) +patches = asmblock.asm_resolve_final(mn_x86, asmcfg, loc_db) # Show resolved asmcfg for block in asmcfg.blocks: |