Merge updated transport changes

Discard changes that were made for reverse_https transport in x64 as
they no longer apply here.

Author: OJ

lib/msf/base/sessions/meterpreter.rb

@@ -307,6 +307,8 @@ def is_valid_session?(timeout=10)
 
     begin
       self.machine_id = self.core.machine_id(timeout)
+      self.payload_uuid ||= self.core.uuid(timeout)
+
       return true
     rescue ::Rex::Post::Meterpreter::RequestError
       # This meterpreter doesn't support core_machine_id
@@ -329,8 +331,6 @@ def load_session_info()
         username = self.sys.config.getuid
         sysinfo  = self.sys.config.sysinfo
 
-        self.payload_uuid = self.core.uuid
-
         safe_info = "#{username} @ #{sysinfo['Computer']}"
         safe_info.force_encoding("ASCII-8BIT") if safe_info.respond_to?(:force_encoding)
         # Should probably be using Rex::Text.ascii_safe_hex but leave

lib/msf/core/payload/windows/reverse_https.rb

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/reverse_http'
 
 module Msf
@@ -13,6 +14,7 @@ module Msf
 
 module Payload::Windows::ReverseHttps
 
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Windows::ReverseHttp
 
   #

lib/rex/post/meterpreter/client_core.rb

@@ -296,10 +296,12 @@ def use(mod, opts = { })
     return true
   end
 
-  def uuid
+  def uuid(timeout=nil)
     request = Packet.create_request('core_uuid')
 
-    response = client.send_request(request)
+    args = [ request ]
+    args << timeout if timeout
+    response = client.send_request(*args)
 
     id = response.get_tlv_value(TLV_TYPE_UUID)