Merge branch 'feature/rm7605-version-for-MSCACHE-v1-and-v2' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-feature/rm7605-version-for-MSCACHE-v1-and-v2

Author: sinn3r

modules/post/windows/gather/cachedump.rb

@@ -516,9 +516,6 @@ def run
 				end
 			end
 
-			store_loot("mscache.creds", "text/csv", session, @credentials.to_csv,
-				"mscache_credentials.txt", "MSCACHE Credentials")
-
 			print_status("John the Ripper format:")
 
 			john.split("\n").each do |pass|
@@ -527,8 +524,11 @@ def run
 
 			if( @vista == 1 )
 				print_status("Hash are in MSCACHE_VISTA format. (mscash2)")
+				store_loot("mscache2.creds", "text/csv", session, @credentials.to_csv, "mscache2_credentials.txt", "MSCACHE v2 Credentials")
+
 			else
 				print_status("Hash are in MSCACHE format. (mscash)")
+				store_loot("mscache.creds", "text/csv", session, @credentials.to_csv, "mscache_credentials.txt", "MSCACHE v1 Credentials")
 			end
 
 		rescue ::Interrupt