Bumped the metasploit-payloads version and cache sizes with PR#8043

Author: bwatters-r7

Gemfile.lock

@@ -14,7 +14,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.16)
+      metasploit-payloads (= 1.2.17)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.1.7)
       msgpack
@@ -190,7 +190,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.16)
+    metasploit-payloads (1.2.17)
     metasploit_data_models (2.0.14)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)

lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_kernel32.rb

@@ -1435,7 +1435,7 @@ def self.create_dll(dll_path = 'kernel32')
       ["PDWORD","phModule","out"],
       ])
 
-    dll.add_function( 'GetModuleHandleW', 'DWORD',[
+    dll.add_function( 'GetModuleHandleW', 'HANDLE',[
       ["PWCHAR","lpModuleName","in"],
       ])
 
@@ -1591,7 +1591,7 @@ def self.create_dll(dll_path = 'kernel32')
       ["PDWORD","pdwHandleCount","out"],
       ])
 
-    dll.add_function( 'GetProcessHeap', 'DWORD',[
+    dll.add_function( 'GetProcessHeap', 'HANDLE',[
       ])
 
     dll.add_function( 'GetProcessHeaps', 'DWORD',[
@@ -2078,7 +2078,7 @@ def self.create_dll(dll_path = 'kernel32')
       ["DWORD","dwFlags","in"],
       ])
 
-    dll.add_function( 'HeapCreate', 'DWORD',[
+    dll.add_function( 'HeapCreate', 'HANDLE',[
       ["DWORD","flOptions","in"],
       ["DWORD","dwInitialSize","in"],
       ["DWORD","dwMaximumSize","in"],
@@ -2258,23 +2258,23 @@ def self.create_dll(dll_path = 'kernel32')
       ["PBLOB","lpCriticalSection","inout"],
       ])
 
-    dll.add_function( 'LoadLibraryA', 'DWORD',[
+    dll.add_function( 'LoadLibraryA', 'HANDLE',[
       ["PCHAR","lpLibFileName","in"],
       ])
 
-    dll.add_function( 'LoadLibraryExA', 'DWORD',[
+    dll.add_function( 'LoadLibraryExA', 'HANDLE',[
       ["PCHAR","lpLibFileName","in"],
       ["HANDLE","hFile","inout"],
       ["DWORD","dwFlags","in"],
       ])
 
-    dll.add_function( 'LoadLibraryExW', 'DWORD',[
+    dll.add_function( 'LoadLibraryExW', 'HANDLE',[
       ["PWCHAR","lpLibFileName","in"],
       ["HANDLE","hFile","inout"],
       ["DWORD","dwFlags","in"],
       ])
 
-    dll.add_function( 'LoadLibraryW', 'DWORD',[
+    dll.add_function( 'LoadLibraryW', 'HANDLE',[
       ["PWCHAR","lpLibFileName","in"],
       ])
 

lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb

@@ -49,7 +49,7 @@ def initialize( client, parent, win_consts )
       # needed by DLL helper
       @win_consts = win_consts
 
-      if @client.arch == ARCH_X64
+      if @client.native_arch == ARCH_X64
         @native = 'Q<'
       else
         @native = 'V'

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.2.16'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.2.17'
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.1.7'
   # Needed by msfgui and other rpc components

modules/payloads/singles/python/meterpreter_bind_tcp.rb

@@ -12,7 +12,7 @@
 
 module MetasploitModule
 
-  CachedSize = 53370
+  CachedSize = 53382
 
   include Msf::Payload::Single
   include Msf::Payload::Python

modules/payloads/singles/python/meterpreter_reverse_http.rb

@@ -12,7 +12,7 @@
 
 module MetasploitModule
 
-  CachedSize = 53334
+  CachedSize = 53346
 
   include Msf::Payload::Single
   include Msf::Payload::Python

modules/payloads/singles/python/meterpreter_reverse_https.rb

@@ -12,7 +12,7 @@
 
 module MetasploitModule
 
-  CachedSize = 53334
+  CachedSize = 53346
 
   include Msf::Payload::Single
   include Msf::Payload::Python

modules/payloads/singles/python/meterpreter_reverse_tcp.rb

@@ -12,7 +12,7 @@
 
 module MetasploitModule
 
-  CachedSize = 53286
+  CachedSize = 53302
 
   include Msf::Payload::Single
   include Msf::Payload::Python

test/modules/post/test/railgun.rb

@@ -21,7 +21,7 @@ def initialize(info={})
 
   def test_api_function_calls
 
-    it "Results should include error information" do
+    it "Should include error information in the results" do
       ret = true
       result = session.railgun.kernel32.GetCurrentProcess()
       ret &&= result['GetLastError'] == 0
@@ -51,6 +51,25 @@ def test_api_function_calls
       ret &&= result['nSize'].to_i == result['ComputerName'].length
     end
 
+    it "Should support calling multiple functions at once" do
+      ret = true
+      multi_rail = [
+        ['kernel32', 'LoadLibraryA', ['kernel32.dll']],
+        ['kernel32', 'GetModuleHandleA', ['kernel32.dll']],
+        ['kernel32', 'GetCurrentProcessId', []]
+      ]
+      results = session.railgun.multi(multi_rail)
+      ret &&= results.length == multi_rail.length
+      results.each do |result|
+        ret &&= result['GetLastError'] == 0
+        ret &&= result['return'] != 0
+      end
+
+      # LoadLibraryA('kernel32.dll') == GetModuleHandleA('kernel32.dll')
+      ret &&= results[0]['return'] == results[1]['return']
+      ret &&= results[2]['return'] == session.sys.process.getpid
+    end
+
     it "Should support reading memory" do
       ret = true
       result = client.railgun.kernel32.GetModuleHandleA('kernel32')