Merge recent stager changes

Author: OJ

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

@@ -76,8 +76,11 @@ def required_space
     # Add 100 bytes for the encoder to have some room
     space += 100
 
-    # Make room for the maximum possible URL length
-    space += 256
+    # Make room for the maximum possible URL length (wchars)
+    space += 512 * 2
+
+    # proxy (wchars)
+    space += 128 * 2
 
     # EXITFUNK processing adds 31 bytes at most (for ExitThread, only ~16 for others)
     space += 31

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

@@ -73,8 +73,11 @@ def required_space
     # Add 100 bytes for the encoder to have some room
     space += 100
 
-    # Make room for the maximum possible URL length
-    space += 256
+    # Make room for the maximum possible URL length (wchars)
+    space += 512 * 2
+
+    # proxy (wchars)
+    space += 128 * 2
 
     # EXITFUNK processing adds 31 bytes at most (for ExitThread, only ~16 for others)
     space += 31

modules/exploits/windows/smb/psexec.rb

@@ -52,7 +52,7 @@ def initialize(info = {})
         ],
       'Payload'        =>
         {
-          'Space'        => 2048,
+          'Space'        => 3072,
           'DisableNops'  => true,
           'StackAdjustment' => -3500
         },

modules/exploits/windows/smb/psexec_psh.rb

@@ -44,7 +44,7 @@ def initialize(info = {})
         },
       'Payload'          =>
         {
-          'Space'        => 2048,
+          'Space'        => 3072,
           'DisableNops'  => true
         },
       'Platform'         => 'win',