about summary refs log tree commit diff stats
path: root/example/asm/shellcode.py
diff options
context:
space:
mode:
authorAjax <commial@gmail.com>2018-07-02 19:12:53 +0200
committerAjax <commial@gmail.com>2018-07-03 14:28:18 +0200
commitd314460a5a19be1f3334baedf0105d9b72fc8620 (patch)
tree967c5856dcf37980cf80a2ea48cc7ee0e008e1bd /example/asm/shellcode.py
parent68fac2e86cc61eba9adfe520fa0e04a7e8943450 (diff)
downloadmiasm-d314460a5a19be1f3334baedf0105d9b72fc8620.tar.gz
miasm-d314460a5a19be1f3334baedf0105d9b72fc8620.zip
Update symbol_pool's deprecated API -> LocationDB
Diffstat (limited to 'example/asm/shellcode.py')
-rwxr-xr-xexample/asm/shellcode.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/example/asm/shellcode.py b/example/asm/shellcode.py
index 331e4d69..9be5b517 100755
--- a/example/asm/shellcode.py
+++ b/example/asm/shellcode.py
@@ -71,11 +71,12 @@ loc_db = LocationDB()
 asmcfg, loc_db = parse_asm.parse_txt(machine.mn, attrib, source, loc_db)
 
 # Fix shellcode addrs
-loc_db.set_offset(loc_db.getby_name("main"), addr_main)
+loc_db.set_location_offset(loc_db.get_name_location("main"), addr_main)
 
 if args.PE:
-    loc_db.set_offset(loc_db.getby_name_create("MessageBoxA"),
-                           pe.DirImport.get_funcvirt('USER32.dll', 'MessageBoxA'))
+    loc_db.set_location_offset(loc_db.get_or_create_name_location("MessageBoxA"),
+                               pe.DirImport.get_funcvirt('USER32.dll',
+                                                         'MessageBoxA'))
 
 # Print and graph firsts blocks before patching it
 for block in asmcfg.blocks:
@@ -89,10 +90,10 @@ patches = asmblock.asm_resolve_final(machine.mn,
                                     dst_interval)
 if args.encrypt:
     # Encrypt code
-    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)
+    loc_start = loc_db.get_or_create_name_location(args.encrypt[0])
+    loc_stop = loc_db.get_or_create_name_location(args.encrypt[1])
+    ad_start = loc_db.get_location_offset(loc_start)
+    ad_stop = loc_db.get_location_offset(loc_stop)
 
     new_patches = dict(patches)
     for ad, val in patches.items():