remove senduuid for now, give RC4PASSWORD a default

Brent Cook · Brent Cook · commit 8612eaa553d6 · 2016-05-26T06:34:51.000-05:00
diff --git a/lib/msf/core/payload/windows/bind_tcp_rc4.rb b/lib/msf/core/payload/windows/bind_tcp_rc4.rb
@@ -4,7 +4,6 @@
 require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/bind_tcp'
 require 'msf/core/payload/windows/rc4'
-require 'msf/core/payload/windows/send_uuid'
 
 module Msf
 
@@ -19,7 +18,6 @@ module Payload::Windows::BindTcpRc4
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows::BindTcp
   include Msf::Payload::Windows::Rc4
-  include Msf::Payload::Windows::SendUUID
 
   #
   # Generate the first stage
diff --git a/lib/msf/core/payload/windows/rc4.rb b/lib/msf/core/payload/windows/rc4.rb
@@ -15,7 +15,7 @@ module Payload::Windows::Rc4
   #
   def initialize(*args)
     super
-    register_options([ OptString.new("RC4PASSWORD", [true, "Password to derive RC4 key from"]) ], self.class)
+    register_options([ OptString.new('RC4PASSWORD', [true, 'Password to derive RC4 key from', 'msf']) ], self.class)
   end
 
   #
diff --git a/lib/msf/core/payload/windows/reverse_tcp_rc4.rb b/lib/msf/core/payload/windows/reverse_tcp_rc4.rb
@@ -4,7 +4,6 @@
 require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/reverse_tcp'
 require 'msf/core/payload/windows/rc4'
-require 'msf/core/payload/windows/send_uuid'
 
 module Msf
 
@@ -19,7 +18,6 @@ module Payload::Windows::ReverseTcpRc4
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows::ReverseTcp
   include Msf::Payload::Windows::Rc4
-  include Msf::Payload::Windows::SendUUID
 
   #
   # Generate the first stage

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ module Payload::Windows::Rc4`
`15`	`15`	`#`
`16`	`16`	`def initialize(*args)`
`17`	`17`	`super`
`18`		`- register_options([ OptString.new("RC4PASSWORD", [true, "Password to derive RC4 key from"]) ], self.class)`
	`18`	`+ register_options([ OptString.new('RC4PASSWORD', [true, 'Password to derive RC4 key from', 'msf']) ], self.class)`
`19`	`19`	`end`
`20`	`20`
`21`	`21`	`#`