add require, fix module context generate

rapid7 · Oct 29, 2019 · a042916 · a042916
1 parent f65c5a3
commit a042916
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/msf/core/payload/windows/encrypted_reverse_tcp.rb b/lib/msf/core/payload/windows/encrypted_reverse_tcp.rb
@@ -104,10 +104,11 @@ def include_send_uuid
     true
   end
 
-  def generate_stage(opts)
-    conf = opts[:datastore]
+  def generate_stage(opts={})
+    conf = opts[:datastore] || datastore
     conf[:staged] = true
-    key, nonce = get_key_nonce(opts[:uuid])
+    stage_uuid = opts[:uuid] || uuid
+    key, nonce = get_key_nonce(stage_uuid)
 
     unless key && nonce
       print_status('No existing key/nonce in db. Resorting to datastore options.')

diff --git a/modules/payloads/stages/windows/x64/encrypted_shell.rb b/modules/payloads/stages/windows/x64/encrypted_shell.rb
@@ -5,6 +5,7 @@
 
 require 'msf/base/sessions/encrypted_shell'
 require 'msf/base/sessions/command_shell_options'
+require 'msf/core/payload/windows/encrypted_reverse_tcp'
 
 module MetasploitModule