dalvik -> android

Author: timwr

lib/msf/core/payload.rb

@@ -28,7 +28,7 @@ class Payload < Msf::Module
   require 'msf/core/payload/windows'
   require 'msf/core/payload/netware'
   require 'msf/core/payload/java'
-  require 'msf/core/payload/dalvik'
+  require 'msf/core/payload/android'
   require 'msf/core/payload/firefox'
   require 'msf/core/payload/mainframe'
 

lib/msf/core/payload/dalvik.rb renamed to lib/msf/core/payload/android.rb

@@ -3,7 +3,7 @@
 require 'msf/core/payload/uuid/options'
 require 'msf/core/payload/transport_config'
 
-module Msf::Payload::Dalvik
+module Msf::Payload::Android
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::UUID::Options

modules/payloads/singles/android/meterpreter_reverse_http.rb

@@ -6,7 +6,7 @@
 require 'msf/core'
 require 'msf/core/handler/reverse_http'
 require 'msf/core/payload/transport_config'
-require 'msf/core/payload/dalvik'
+require 'msf/core/payload/android'
 require 'msf/core/payload/uuid/options'
 require 'msf/base/sessions/meterpreter_android'
 require 'msf/base/sessions/meterpreter_options'
@@ -18,7 +18,7 @@ module MetasploitModule
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Single
-  include Msf::Payload::Dalvik
+  include Msf::Payload::Android
   include Msf::Payload::UUID::Options
   include Msf::Sessions::MeterpreterOptions
 

modules/payloads/singles/android/meterpreter_reverse_tcp.rb

@@ -3,7 +3,7 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 require 'msf/core'
-require 'msf/core/payload/dalvik'
+require 'msf/core/payload/android'
 require 'msf/core/payload/transport_config'
 require 'msf/base/sessions/meterpreter_android'
 require 'msf/base/sessions/meterpreter_options'
@@ -15,7 +15,7 @@ module MetasploitModule
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Single
-  include Msf::Payload::Dalvik
+  include Msf::Payload::Android
   include Msf::Sessions::MeterpreterOptions
 
   def initialize(info = {})

modules/payloads/stagers/android/reverse_http.rb

@@ -12,12 +12,12 @@ module MetasploitModule
   CachedSize = :dynamic
 
   include Msf::Payload::Stager
-  include Msf::Payload::Dalvik
+  include Msf::Payload::Android
   include Msf::Payload::UUID::Options
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'        => 'Dalvik Reverse HTTP Stager',
+      'Name'        => 'Android Reverse HTTP Stager',
       'Description' => 'Tunnel communication over HTTP',
       'Author'      => ['anwarelmakrahy', 'OJ Reeves'],
       'License'     => MSF_LICENSE,

modules/payloads/stagers/android/reverse_https.rb

@@ -12,12 +12,12 @@ module MetasploitModule
   CachedSize = :dynamic
 
   include Msf::Payload::Stager
-  include Msf::Payload::Dalvik
+  include Msf::Payload::Android
   include Msf::Payload::UUID::Options
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'        => 'Dalvik Reverse HTTPS Stager',
+      'Name'        => 'Android Reverse HTTPS Stager',
       'Description' => 'Tunnel communication over HTTPS',
       'Author'      => ['anwarelmakrahy', 'OJ Reeves'],
       'License'     => MSF_LICENSE,

modules/payloads/stagers/android/reverse_tcp.rb

@@ -16,12 +16,12 @@ module MetasploitModule
 
   include Msf::Payload::Stager
   include Msf::Payload::TransportConfig
-  include Msf::Payload::Dalvik
+  include Msf::Payload::Android
   include Msf::Payload::UUID::Options
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'        => 'Dalvik Reverse TCP Stager',
+      'Name'        => 'Android Reverse TCP Stager',
       'Description' => 'Connect back stager',
       'Author'      => ['timwr', 'OJ Reeves'],
       'License'     => MSF_LICENSE,

modules/payloads/stages/android/meterpreter.rb

@@ -4,7 +4,7 @@
 ##
 
 require 'msf/core'
-require 'msf/core/payload/dalvik'
+require 'msf/core/payload/android'
 require 'msf/base/sessions/meterpreter_android'
 require 'msf/base/sessions/meterpreter_options'
 require 'rex/payloads/meterpreter/config'
@@ -30,7 +30,7 @@ def initialize(info = {})
   end
 
   #
-  # Override the Payload::Dalvik version so we can load a prebuilt jar to be
+  # Override the Payload::Android version so we can load a prebuilt jar to be
   # used as the final stage
   #
   def generate_stage(opts={})

modules/payloads/stages/android/shell.rb

@@ -4,7 +4,7 @@
 ##
 
 require 'msf/core'
-require 'msf/core/payload/dalvik'
+require 'msf/core/payload/android'
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/command_shell'
 require 'msf/base/sessions/command_shell_options'
@@ -31,7 +31,7 @@ def initialize(info = {})
   end
 
   #
-  # Override the {Payload::Dalvik} version so we can load a prebuilt jar
+  # Override the {Payload::Android} version so we can load a prebuilt jar
   # to be used as the final stage
   #
   def generate_stage(opts={})