remove elfutil

Author: lunixbochs

core/binary.py

@@ -1,5 +1,4 @@
 import contextlib
-import elfutil
 import os
 
 from util import autolink
@@ -27,7 +26,7 @@ def __init__(self, path):
         end = 0
         # TODO: doesn't handle new mem being mapped or unmapped
         for ph in reversed(self.elf.progs):
-            if elfutil.is_load(ph):
+            if ph.isload:
                 start = min(start, ph.vaddr)
                 end = max(ph.vaddr + ph.vsize, end)
 

core/context.py

@@ -3,7 +3,6 @@
 
 import arch
 import compiler
-import elfutil
 from func import Func
 from util import stdlib
 from util.elffile import EM
@@ -143,7 +142,7 @@ def ir(self, asm, **kwargs):
 
     def make_writable(self, addr):
         for prog in self.elf.progs:
-            if elfutil.is_load(prog):
+            if prog.isload:
                 if addr in prog and prog.flags & 2 == 0:
                     self.debug('[!] Segment made writable: 0x%x-0x%x' % (prog.vaddr, prog.vaddr + prog.memsz))
                     prog.flags |= 2

core/elfutil.py

@@ -1,4 +1,3 @@
-import elfutil
 import glob
 import inspect
 import os
@@ -68,7 +67,7 @@ def patch(self):
                                 traceback.print_exc()
                                 print 'Memory maps:'
                                 for prog in self.bin.elf.progs:
-                                    if elfutil.is_load(prog):
+                                    if prog.isload:
                                         print '0x%x-0x%x' % (prog.vaddr, prog.vaddr + prog.vsize)
                                 sys.exit(1)
                 print

core/patcher.py

@@ -1,9 +1,8 @@
 import os
-from core import elfutil
 from util.crypto.xor import xor_mem
 
 def xor_patches(pt):
     for prog in pt.elf.progs:
-        if elfutil.is_load(prog) and prog.offset == 0:
+        if prog.isload and prog.offset == 0:
             xor_mem(pt, prog.vaddr, prog.memsz, ord(os.urandom(1)))
             break

samples/cgc/obfuscate/04_xor_prog.py

@@ -1,12 +1,11 @@
 import struct
 from capstone.x86_const import *
 
-from core.elfutil import is_load
 from util.patch.syscall import find_syscall_funcs
 
 def patch(pt):
     for prog in pt.elf.progs:
-        if is_load(prog) and prog.offset == 0:
+        if prog.isload and prog.offset == 0:
             magic_addr = prog.vaddr
 
     receive = pt.resolve('receive')

samples/cgc/obfuscate/06_xor_magic.py

@@ -1432,6 +1432,10 @@ def vsize(self):
     def vend(self):
         return self.vaddr + self.memsz
 
+    @property
+    def isload(self):
+        return PT[self.type].name == 'PT_LOAD'
+
     def __contains__(self, vaddr):
         return vaddr >= self.vaddr and vaddr < self.vaddr + self.vsize
 

util/elffile.py

@@ -9,8 +9,6 @@
 from capstone import *
 from capstone.x86_const import *
 
-from core.elfutil import is_load
-
 def align(addr, size):
     start = addr
     end = addr + size
@@ -190,7 +188,7 @@ def emu(self):
         # map memory
         todo = []
         for prog in self.binary.elf.progs:
-            if is_load(prog) and prog.memsz:
+            if prog.isload and prog.memsz:
                 addr, size = align(prog.vaddr, prog.memsz)
                 uc.mem_map(addr, size)
                 todo.append(prog)