Land rapid7#9146, add e500v2 and reduce size of x86_64

Author: busterb

Gemfile.lock

@@ -19,7 +19,7 @@ PATH
       metasploit-model
       metasploit-payloads (= 1.3.13)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.2.2)
+      metasploit_payloads-mettle (= 0.2.5)
       msgpack
       nessus_rest
       net-ssh
@@ -189,7 +189,7 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.2.2)
+    metasploit_payloads-mettle (0.2.5)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
@@ -252,7 +252,7 @@ GEM
     recog (2.1.16)
       nokogiri
     redcarpet (3.4.0)
-    rex-arch (0.1.11)
+    rex-arch (0.1.13)
       rex-text
     rex-bin_tools (0.1.4)
       metasm

lib/msf/base/sessions/meterpreter_ppce500v2_linux.rb

@@ -0,0 +1,29 @@
+# -*- coding: binary -*-
+
+require 'msf/base/sessions/meterpreter'
+
+module Msf
+module Sessions
+
+###
+#
+# This class creates a platform-specific meterpreter session type
+#
+###
+class Meterpreter_ppce500v2_Linux < Msf::Sessions::Meterpreter
+  def supports_ssl?
+    false
+  end
+  def supports_zlib?
+    false
+  end
+  def initialize(rstream, opts={})
+    super
+    self.base_platform = 'linux'
+    self.base_arch = ARCH_PPCE500V2
+  end
+end
+
+end
+end
+

lib/msf/core/payload/uuid.rb

@@ -43,7 +43,8 @@ class Msf::Payload::UUID
     24 => ARCH_AARCH64,
     25 => ARCH_MIPS64,
     26 => ARCH_PPC64LE,
-    27 => ARCH_R
+    27 => ARCH_R,
+    28 => ARCH_PPCE500V2
   }
 
   Platforms = {

metasploit-framework.gemspec

@@ -72,7 +72,7 @@ Gem::Specification.new do |spec|
   # Needed for Meterpreter
   spec.add_runtime_dependency 'metasploit-payloads', '1.3.13'
   # Needed for the next-generation POSIX Meterpreter
-  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.2.2'
+  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.2.5'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # get list of network interfaces, like eth* from OS.

modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675112
+  CachedSize = 692384
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_AARCH64,

modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675112
+  CachedSize = 692384
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_AARCH64,

modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675112
+  CachedSize = 692384
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_AARCH64,

modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668392
+  CachedSize = 678568
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_ARMBE,

modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668392
+  CachedSize = 678568
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_ARMBE,

modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668392
+  CachedSize = 678568
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -24,7 +24,8 @@ def initialize(info = {})
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
         'Platform'      => 'linux',
         'Arch'          => ARCH_ARMBE,