infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore win32pe as the default (not _only)

unstable
Tod Beardsley 2013-03-18 15:55:01 -05:00
parent 3a183ffa94
commit 1873053a34
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/msf/util/exe.rb
View File

@ -66,7 +66,7 @@ require 'digest/sha1'
if (arch.index(ARCH_X86)) if (arch.index(ARCH_X86))
if (plat.index(Msf::Module::Platform::Windows)) if (plat.index(Msf::Module::Platform::Windows))
return to_win32pe_only(framework, code, opts) return to_win32pe(framework, code, opts)
end end
if (plat.index(Msf::Module::Platform::Linux)) if (plat.index(Msf::Module::Platform::Linux))
@ -928,7 +928,7 @@ End Sub
end end
def self.to_win32pe_vba(framework, code, opts={}) 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 end
def self.to_exe_vbs(exes = '', opts={}) def self.to_exe_vbs(exes = '', opts={})
@ -1196,15 +1196,15 @@ End Sub
end end
def self.to_win32pe_vbs(framework, code, opts={}) 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 end
def self.to_win32pe_asp(framework, code, opts={}) 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 end
def self.to_win32pe_aspx(framework, code, opts={}) 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 end
# Creates a jar file that drops the provided +exe+ into a random file name # Creates a jar file that drops the provided +exe+ into a random file name
@ -1932,7 +1932,7 @@ End Sub
output = Msf::Util::EXE.to_vba(framework, code, exeopts) output = Msf::Util::EXE.to_vba(framework, code, exeopts)
when 'vba-exe' 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) output = Msf::Util::EXE.to_exe_vba(exe)
when 'vbs' when 'vbs'