Merge branch 'dll_fix' of https://github.com/Meatballs1/metasploit-framework

Author: jvazquez-r7

lib/msf/core/exploit/exe.rb

@@ -70,7 +70,7 @@ def generate_payload_exe_service(opts = {})
 		pl = opts[:code]
 		pl ||= payload.encoded
 
-		if opts[:arch] and opts[:arch] == ARCH_X64
+		if opts[:arch] and (opts[:arch] == ARCH_X64 or opts[:arch] == ARCH_X86_64)
 			exe = Msf::Util::EXE.to_win64pe_service(framework, pl, opts)
 		else
 			exe = Msf::Util::EXE.to_win32pe_service(framework, pl, opts)
@@ -89,7 +89,7 @@ def generate_payload_dll(opts = {})
 		pl = opts[:code]
 		pl ||= payload.encoded
 
-		if opts[:arch] and opts[:arch] == ARCH_X64
+		if opts[:arch] and (opts[:arch] == ARCH_X64 or opts[:arch] == ARCH_X86_64)
 			dll = Msf::Util::EXE.to_win64pe_dll(framework, pl, opts)
 		else
 			dll = Msf::Util::EXE.to_win32pe_dll(framework, pl, opts)