keep advanced options on the fat side of the conditional

Author: Brent Cook

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

@@ -32,9 +32,7 @@ def generate(opts={})
     conf = {
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'] || '127.127.127.127',
-      port:        datastore['LPORT'],
-      retry_count: datastore['StagerRetryCount'],
-      proxy_ie:    datastore['PayloadProxyIE']
+      port:        datastore['LPORT']
     }
 
     # Add extra options if we have enough space
@@ -47,6 +45,8 @@ def generate(opts={})
       conf[:proxy_user]       = datastore['PayloadProxyUser']
       conf[:proxy_pass]       = datastore['PayloadProxyPass']
       conf[:proxy_type]       = datastore['PayloadProxyType']
+      conf[:retry_count]      = datastore['StagerRetryCount']
+      conf[:proxy_ie]         = datastore['PayloadProxyIE']
     else
       # Otherwise default to small URIs
       conf[:uri]              = generate_small_uri

lib/msf/core/payload/windows/x64/reverse_winhttp.rb

@@ -33,9 +33,7 @@ def generate(opts={})
     conf = {
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'] || '127.127.127.127',
-      port:        datastore['LPORT'],
-      retry_count: datastore['StagerRetryCount'],
-      proxy_ie:    datastore['PayloadProxyIE']
+      port:        datastore['LPORT']
     }
 
     # Add extra options if we have enough space
@@ -48,6 +46,8 @@ def generate(opts={})
       conf[:proxy_user]       = datastore['PayloadProxyUser']
       conf[:proxy_pass]       = datastore['PayloadProxyPass']
       conf[:proxy_type]       = datastore['PayloadProxyType']
+      conf[:retry_count]      = datastore['StagerRetryCount']
+      conf[:proxy_ie]         = datastore['PayloadProxyIE']
     else
       # Otherwise default to small URIs
       conf[:uri]              = generate_small_uri