Fix up meterpreter patching arguments and names

Author: HD Moore

lib/msf/core/handler/reverse_hop_http.rb

@@ -259,8 +259,8 @@ def send_new_stage
       :proxy_host     => datastore['PayloadProxyHost'],
       :proxy_port     => datastore['PayloadProxyPort'],
       :proxy_type     => datastore['PayloadProxyType'],
-      :proxy_username => datastore['PayloadProxyUser'],
-      :proxy_password => datastore['PayloadProxyPass']
+      :proxy_user => datastore['PayloadProxyUser'],
+      :proxy_pass => datastore['PayloadProxyPass']
 
     blob = encode_stage(blob)
 

lib/msf/core/handler/reverse_http.rb

@@ -302,8 +302,8 @@ def on_request(cli, req, obj)
           :proxy_host     => datastore['PayloadProxyHost'],
           :proxy_port     => datastore['PayloadProxyPort'],
           :proxy_type     => datastore['PayloadProxyType'],
-          :proxy_username => datastore['PayloadProxyUser'],
-          :proxy_password => datastore['PayloadProxyPass']
+          :proxy_user => datastore['PayloadProxyUser'],
+          :proxy_pass => datastore['PayloadProxyPass']
 
         resp.body = encode_stage(blob)
 

lib/rex/payloads/meterpreter/patch.rb

@@ -123,8 +123,8 @@ def self.patch_passive_service! blob, options
             options[:proxy_type]
           )
           patch_proxy_auth!(blob,
-            options[:proxy_username],
-            options[:proxy_password],
+            options[:proxy_user],
+            options[:proxy_pass],
             options[:proxy_type]
           )
 

lib/rex/post/meterpreter/client_core.rb

@@ -411,11 +411,11 @@ def generate_windows_stub(process)
         :expiration     => self.client.expiration,
         :comm_timeout   =>  self.client.comm_timeout,
         :ua             =>  client.exploit_datastore['MeterpreterUserAgent'],
-        :proxyhost      =>  client.exploit_datastore['PROXYHOST'],
-        :proxyport      =>  client.exploit_datastore['PROXYPORT'],
-        :proxy_type     =>  client.exploit_datastore['PROXY_TYPE'],
-        :proxy_username =>  client.exploit_datastore['PROXY_USERNAME'],
-        :proxy_password =>  client.exploit_datastore['PROXY_PASSWORD']
+        :proxy_host     =>  client.exploit_datastore['PayloadProxyHost'],
+        :proxy_port     =>  client.exploit_datastore['PayloadProxyPort'],
+        :proxy_type     =>  client.exploit_datastore['PayloadProxyType'],
+        :proxy_user     =>  client.exploit_datastore['PayloadProxyUser'],
+        :proxy_pass     =>  client.exploit_datastore['PayloadProxyPass']
 
     end