Check equality instead of regex

Thanks, @Meatballs1 for finding the cause of this bug!

[FixRM rapid7#8149]

Author: egypt

.yardopts

@@ -3,5 +3,5 @@
 --exclude \.ut\.rb/
 --exclude \.ts\.rb/
 --files CONTRIBUTING.md,COPYING,HACKING,LICENSE
-lib/msf/**/*.rb
-lib/rex/**/*.rb
+#lib/msf/**/*.rb
+#lib/rex/**/*.rb

lib/msf/util/exe.rb

@@ -1959,22 +1959,17 @@ def self.to_executable_fmt(framework, arch, plat, code, fmt, exeopts)
 			output = Msf::Util::EXE.to_win32pe_aspx(framework, code, exeopts)
 
 		when 'dll'
-			if (not arch or (arch.index(ARCH_X86)))
-				output = Msf::Util::EXE.to_win32pe_dll(framework, code, exeopts)
-			end
-
-			if(arch and (arch.index( ARCH_X86_64 ) or arch.index( ARCH_X64 )))
-				output = Msf::Util::EXE.to_win64pe_dll(framework, code, exeopts)
-			end
-
+			output = case arch
+				when ARCH_X86,nil then to_win32pe_dll(framework, code, exeopts)
+				when ARCH_X86_64  then to_win64pe_dll(framework, code, exeopts)
+				when ARCH_64      then to_win64pe_dll(framework, code, exeopts)
+				end
 		when 'exe'
-			if (not arch or (arch.index(ARCH_X86)))
-				output = Msf::Util::EXE.to_win32pe(framework, code, exeopts)
-			end
-
-			if(arch and (arch.index( ARCH_X86_64 ) or arch.index( ARCH_X64 )))
-				output = Msf::Util::EXE.to_win64pe(framework, code, exeopts)
-			end
+			output = case arch
+				when ARCH_X86,nil then to_win32pe(framework, code, exeopts)
+				when ARCH_X86_64  then to_win64pe(framework, code, exeopts)
+				when ARCH_64      then to_win64pe(framework, code, exeopts)
+				end
 
 		when 'exe-small'
 			if(not arch or (arch.index(ARCH_X86)))
@@ -2010,11 +2005,6 @@ def self.to_executable_fmt(framework, arch, plat, code, fmt, exeopts)
 					end
 			end
 
-		# this should really be 'jar'
-		when 'java'
-
-
-
 		when 'macho'
 			output = case arch
 				when ARCH_X86,nil then to_osx_x86_macho(framework, code, exeopts)

spec/support/shared/contexts/msf/util/exe.rb

@@ -7,6 +7,7 @@
       { :format => "dll",       :arch => "x64", :file_fp => /PE32\+.*DLL/ },
       { :format => "exe",       :arch => "x86", :file_fp => /PE32 /  },
       { :format => "exe",       :arch => "x64", :file_fp => /PE32\+/ },
+      { :format => "exe",       :arch => "x86_64", :file_fp => /PE32\+/ },
       { :format => "exe-small", :arch => "x86", :file_fp => /PE32 /  },
       # No template for 64-bit exe-small. That's fine, we probably
       # don't need one.