From fc792bdaae3184d8b516b51529168eb0918f3979 Mon Sep 17 00:00:00 2001 From: Timothy Swartz Date: Sat, 21 Dec 2013 02:49:44 -0700 Subject: [PATCH] Fix for Rspec failure in Msf::Util::EXE [FixRM #8723] --- spec/support/shared/contexts/msf/util/exe.rb | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/support/shared/contexts/msf/util/exe.rb b/spec/support/shared/contexts/msf/util/exe.rb index 9b86fe33c6..ebf7851836 100644 --- a/spec/support/shared/contexts/msf/util/exe.rb +++ b/spec/support/shared/contexts/msf/util/exe.rb @@ -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 }, ], }