Land rapid7#4835, new hex format for msfvenom

Author: wvu

lib/msf/base/simple/buffer.rb

@@ -25,6 +25,8 @@ def self.transform(buf, fmt = "ruby", var_name = 'buf')
       when 'raw'
       when 'num'
         buf = Rex::Text.to_num(buf)
+      when 'hex'
+        buf = Rex::Text.to_hex(buf, '')
       when 'dword', 'dw'
         buf = Rex::Text.to_dword(buf)
       when 'python', 'py'
@@ -65,7 +67,7 @@ def self.transform(buf, fmt = "ruby", var_name = 'buf')
   def self.comment(buf, fmt = "ruby")
     case fmt
       when 'raw'
-      when 'num', 'dword', 'dw'
+      when 'num', 'dword', 'dw', 'hex'
         buf = Rex::Text.to_js_comment(buf)
       when 'ruby', 'rb', 'python', 'py'
         buf = Rex::Text.to_ruby_comment(buf)
@@ -98,6 +100,7 @@ def self.transform_formats
       'csharp',
       'dw',
       'dword',
+      'hex',
       'java',
       'js_be',
       'js_le',

lib/rex/text.rb

@@ -1810,4 +1810,3 @@ def self.checksum32_be(str)
 
 end
 end
-

msfvenom

@@ -331,6 +331,8 @@ if __FILE__ == $0
     output_stream = $stdout
     output_stream.binmode
     output_stream.write payload
+    # trailing newline for pretty output
+    $stderr.puts unless payload =~ /\n$/
   end
 
 end