Merge pull request #1 from todb-r7/exe_only_patch

Exe only patch : avoid merge conflict and don't use win32pe_only everywhere by default.

Author: agix

lib/msf/util/exe.rb

@@ -1,21 +1,13 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
-###
-#
-# framework-util-exe
-# --------------
+module Msf
+module Util
+
 #
 # The class provides methods for creating and encoding executable file
 # formats for various platforms. It is a replacement for the previous
 # code in Rex::Text
 #
-###
-
-module Msf
-module Util
 class EXE
 
 require 'rex'
@@ -74,7 +66,7 @@ def self.to_executable(framework, arch, plat, code='', opts={})
 		if (arch.index(ARCH_X86))
 
 			if (plat.index(Msf::Module::Platform::Windows))
-				return to_win32pe_only(framework, code, opts)
+				return to_win32pe(framework, code, opts)
 			end
 
 			if (plat.index(Msf::Module::Platform::Linux))
@@ -368,19 +360,19 @@ def self.to_win32pe_only(framework, code, opts={})
 
 		sections_header = []
 		pe._file_header.v['NumberOfSections'].times { |i| sections_header << [(i*0x28)+pe.rva_to_file_offset(pe._dos_header.v['e_lfanew']+pe._file_header.v['SizeOfOptionalHeader']+0x18+0x24),exe[(i*0x28)+pe.rva_to_file_offset(pe._dos_header.v['e_lfanew']+pe._file_header.v['SizeOfOptionalHeader']+0x18),0x28]] }
-		
+
 
 		#look for section with entry point
 		sections_header.each do |sec|
 			virtualAddress = sec[1][0xc,0x4].unpack('L')[0]
 			sizeOfRawData = sec[1][0x10,0x4].unpack('L')[0]
 			characteristics = sec[1][0x24,0x4].unpack('L')[0]
 			if pe.hdr.opt.AddressOfEntryPoint >= virtualAddress && pe.hdr.opt.AddressOfEntryPoint < virtualAddress+sizeOfRawData
-			 	#put this section writable
-			 	characteristics|=0x80000000
-			 	newcharacteristics = [characteristics].pack('L')
-			 	exe[sec[0],newcharacteristics.length]=newcharacteristics
-			 end
+				#put this section writable
+				characteristics|=0x80000000
+				newcharacteristics = [characteristics].pack('L')
+				exe[sec[0],newcharacteristics.length]=newcharacteristics
+			end
 		end
 
 		#put the shellcode at the entry point, overwriting template
@@ -936,7 +928,7 @@ def self.to_vba(framework,code,opts={})
 	end
 
 	def self.to_win32pe_vba(framework, code, opts={})
-		to_exe_vba(to_win32pe_only(framework, code, opts))
+		to_exe_vba(to_win32pe(framework, code, opts))
 	end
 
 	def self.to_exe_vbs(exes = '', opts={})
@@ -1204,15 +1196,15 @@ def self.to_win32pe_psh(framework, code, opts={})
 	end
 
 	def self.to_win32pe_vbs(framework, code, opts={})
-		to_exe_vbs(to_win32pe_only(framework, code, opts), opts)
+		to_exe_vbs(to_win32pe(framework, code, opts), opts)
 	end
 
 	def self.to_win32pe_asp(framework, code, opts={})
-		to_exe_asp(to_win32pe_only(framework, code, opts), opts)
+		to_exe_asp(to_win32pe(framework, code, opts), opts)
 	end
 
 	def self.to_win32pe_aspx(framework, code, opts={})
-		to_exe_aspx(to_win32pe_only(framework, code, opts), opts)
+		to_exe_aspx(to_win32pe(framework, code, opts), opts)
 	end
 
 	# Creates a jar file that drops the provided +exe+ into a random file name
@@ -1940,7 +1932,7 @@ def self.to_executable_fmt(framework, arch, plat, code, fmt, exeopts)
 			output = Msf::Util::EXE.to_vba(framework, code, exeopts)
 
 		when 'vba-exe'
-			exe = Msf::Util::EXE.to_win32pe_only(framework, code, exeopts)
+			exe = Msf::Util::EXE.to_win32pe(framework, code, exeopts)
 			output = Msf::Util::EXE.to_exe_vba(exe)
 
 		when 'vbs'