Merge branch 'master' of https://github.com/rapid7/metasploit-framework into upstream-master

Author: h00die

modules/auxiliary/scanner/ssh/ssh_login.rb

@@ -132,6 +132,7 @@ def run_host(ip)
       case result.status
       when Metasploit::Model::Login::Status::SUCCESSFUL
         print_brute :level => :good, :ip => ip, :msg => "Success: '#{result.credential}' '#{result.proof.to_s.gsub(/[\r\n\e\b\a]/, ' ')}'"
+        credential_data[:private_type] = :password
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
         create_credential_login(credential_data)