From 836feaa2d838aa8399c6d91c9f80c8996b1aff9e Mon Sep 17 00:00:00 2001
From: OJ <oj@buffered.io>
Date: Tue, 12 May 2015 10:24:11 +1000
Subject: [PATCH] Fix uuid setting, fix reverse_https x64 payload

The payload changes in this PR will be fixed up/removed in the
update-x64-stagers PR.
---
 lib/msf/base/sessions/meterpreter.rb                  | 4 ++--
 lib/msf/core/payload/windows/reverse_https.rb         | 2 ++
 lib/rex/post/meterpreter/client_core.rb               | 6 ++++--
 modules/payloads/stagers/windows/x64/reverse_https.rb | 9 +++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/msf/base/sessions/meterpreter.rb b/lib/msf/base/sessions/meterpreter.rb
index 8839ea853f..35227de609 100644
--- a/lib/msf/base/sessions/meterpreter.rb
+++ b/lib/msf/base/sessions/meterpreter.rb
@@ -307,6 +307,8 @@ class Meterpreter < Rex::Post::Meterpreter::Client
 
     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 @@ class Meterpreter < Rex::Post::Meterpreter::Client
         username = self.sys.config.getuid
         sysinfo  = self.sys.config.sysinfo
 
-        self.payload_uuid = self.core.uuid unless self.payload_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
diff --git a/lib/msf/core/payload/windows/reverse_https.rb b/lib/msf/core/payload/windows/reverse_https.rb
index b1bc4ab265..77aa143048 100644
--- a/lib/msf/core/payload/windows/reverse_https.rb
+++ b/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
@@ -15,6 +16,7 @@ module Msf
 
 module Payload::Windows::ReverseHttps
 
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Windows::ReverseHttp
 
   #
diff --git a/lib/rex/post/meterpreter/client_core.rb b/lib/rex/post/meterpreter/client_core.rb
index 60787e8f06..6a67471bbe 100644
--- a/lib/rex/post/meterpreter/client_core.rb
+++ b/lib/rex/post/meterpreter/client_core.rb
@@ -296,10 +296,12 @@ class ClientCore < Extension
     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)
 
diff --git a/modules/payloads/stagers/windows/x64/reverse_https.rb b/modules/payloads/stagers/windows/x64/reverse_https.rb
index c6710fd46c..e8e9860732 100644
--- a/modules/payloads/stagers/windows/x64/reverse_https.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_https.rb
@@ -5,12 +5,14 @@
 
 
 require 'msf/core'
+require 'msf/core/payload/transport_config'
 require 'msf/core/handler/reverse_https'
 
 module Metasploit3
 
   CachedSize = 578
 
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Stager
   include Msf::Payload::Windows
 
@@ -91,6 +93,13 @@ module Metasploit3
     ))
   end
 
+  #
+  # Generate the transport-specific configuration
+  #
+  def transport_config(opts={})
+    transport_config_reverse_https(opts)
+  end
+
   #
   # Do not transmit the stage over the connection.  We handle this via HTTPS
   #