Land rapid7#2660, DLL/service creation for x64

Author: Tod Beardsley

lib/msf/core/exploit/exe.rb

@@ -75,7 +75,10 @@ def generate_payload_exe_service(opts = {})
     pl = opts[:code]
     pl ||= payload.encoded
 
-    if opts[:arch] and (opts[:arch] == ARCH_X64 or opts[:arch] == ARCH_X86_64)
+    #Ensure opts[:arch] is an array
+    opts[:arch] = [opts[:arch]] unless opts[:arch].kind_of? Array
+
+    if opts[:arch] and (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
       exe = Msf::Util::EXE.to_win64pe_service(framework, pl, opts)
     else
       exe = Msf::Util::EXE.to_win32pe_service(framework, pl, opts)
@@ -94,7 +97,10 @@ def generate_payload_dll(opts = {})
     pl = opts[:code]
     pl ||= payload.encoded
 
-    if opts[:arch] and (opts[:arch] == ARCH_X64 or opts[:arch] == ARCH_X86_64)
+    #Ensure opts[:arch] is an array
+    opts[:arch] = [opts[:arch]] unless opts[:arch].kind_of? Array
+
+    if opts[:arch] and (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
       dll = Msf::Util::EXE.to_win64pe_dll(framework, pl, opts)
     else
       dll = Msf::Util::EXE.to_win32pe_dll(framework, pl, opts)