Fix for Rspec failure in Msf::Util::EXE

[FixRM #8723]
bug/bundler_fix
Timothy Swartz 2013-12-21 02:49:44 -07:00
parent f43bc02297
commit fc792bdaae
1 changed files with 13 additions and 13 deletions

View File

@ -36,8 +36,8 @@ shared_context 'Msf::Util::Exe' do
{ :format => "psh", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "psh-net", :arch => "x86", :file_fp => /ASCII/ },
{ :format => "psh-net", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86_64", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/i },
{ :format => "war", :arch => "x86_64", :file_fp => /Zip/i },
{ :format => "msi", :arch => "x86", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi", :arch => "x64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi", :arch => "x86_64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
@ -51,29 +51,29 @@ shared_context 'Msf::Util::Exe' do
{ :format => "elf", :arch => "armle", :file_fp => /ELF 32.*ARM/ },
{ :format => "elf", :arch => "mipsbe", :file_fp => /ELF 32-bit MSB executable, MIPS/ },
{ :format => "elf", :arch => "mipsle", :file_fp => /ELF 32-bit LSB executable, MIPS/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x64", :file_fp => /Zip/ },
{ :format => "war", :arch => "armle", :file_fp => /Zip/ },
{ :format => "war", :arch => "mipsbe", :file_fp => /Zip/ },
{ :format => "war", :arch => "mipsle", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/i },
{ :format => "war", :arch => "x64", :file_fp => /Zip/i },
{ :format => "war", :arch => "armle", :file_fp => /Zip/i },
{ :format => "war", :arch => "mipsbe", :file_fp => /Zip/i },
{ :format => "war", :arch => "mipsle", :file_fp => /Zip/i },
],
"bsd" => [
{ :format => "elf", :arch => "x86", :file_fp => /ELF 32.*BSD/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/i },
],
"solaris" => [
{ :format => "elf", :arch => "x86", :file_fp => /ELF 32/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/i },
],
"osx" => [
{ :format => "macho", :arch => "x86", :file_fp => /Mach-O.*i386/ },
{ :format => "macho", :arch => "x64", :file_fp => /Mach-O 64/ },
{ :format => "macho", :arch => "armle", :file_fp => /Mach-O.*(acorn|arm)/ },
{ :format => "macho", :arch => "ppc", :file_fp => /Mach-O.*ppc/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x64", :file_fp => /Zip/ },
{ :format => "war", :arch => "armle", :file_fp => /Zip/ },
{ :format => "war", :arch => "ppc", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/i },
{ :format => "war", :arch => "x64", :file_fp => /Zip/i },
{ :format => "war", :arch => "armle", :file_fp => /Zip/i },
{ :format => "war", :arch => "ppc", :file_fp => /Zip/i },
],
}