Land #7493, remove unneeded badchars from payload specification

rapid7 · Oct 26, 2016 · 33e0d1f · 33e0d1f
2 parents 4cafe5a + 1a1841d
commit 33e0d1f
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 17 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,7 +14,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.25)
+      metasploit-payloads (= 1.1.26)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.0.8)
       msgpack
@@ -168,7 +168,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.25)
+    metasploit-payloads (1.1.26)
     metasploit_data_models (2.0.5)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)

diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
@@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '1.1.25'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.1.26'
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.0.8'
   # Needed by msfgui and other rpc components

diff --git a/modules/exploits/windows/http/manageengine_connectionid_write.rb b/modules/exploits/windows/http/manageengine_connectionid_write.rb
@@ -42,10 +42,6 @@ def initialize(info={})
         [
           [ 'ManageEngine Desktop Central 9 on Windows', {} ]
         ],
-      'Payload'        =>
-        {
-          'BadChars' => "\x00"
-        },
       'Privileged'     => false,
       'DisclosureDate' => "Dec 14 2015",
       'DefaultTarget'  => 0))

diff --git a/modules/payloads/singles/windows/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/meterpreter_bind_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 983599
+  CachedSize = 957999
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/meterpreter_reverse_http.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 984643
+  CachedSize = 959043
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/meterpreter_reverse_https.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 984643
+  CachedSize = 959043
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 983599
+  CachedSize = 957999
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 983599
+  CachedSize = 957999
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1217071
+  CachedSize = 1189423
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1218115
+  CachedSize = 1190467
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1218115
+  CachedSize = 1190467
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1217071
+  CachedSize = 1189423
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb
@@ -13,7 +13,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1217071
+  CachedSize = 1189423
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows