473b92a060
Conflicts: Gemfile.lock lib/metasploit/framework/command/console.rb lib/metasploit/framework/common_engine.rb lib/metasploit/framework/credential.rb lib/metasploit/framework/credential_collection.rb lib/metasploit/framework/login_scanner/afp.rb lib/metasploit/framework/login_scanner/axis2.rb lib/metasploit/framework/login_scanner/db2.rb lib/metasploit/framework/login_scanner/ftp.rb lib/metasploit/framework/login_scanner/http.rb lib/metasploit/framework/login_scanner/mssql.rb lib/metasploit/framework/login_scanner/mysql.rb lib/metasploit/framework/login_scanner/pop3.rb lib/metasploit/framework/login_scanner/postgres.rb lib/metasploit/framework/login_scanner/result.rb lib/metasploit/framework/login_scanner/smb.rb lib/metasploit/framework/login_scanner/snmp.rb lib/metasploit/framework/login_scanner/ssh.rb lib/metasploit/framework/login_scanner/telnet.rb lib/metasploit/framework/login_scanner/vnc.rb lib/metasploit/framework/parsed_options/console.rb lib/metasploit/framework/require.rb lib/metasploit/framework/version.rb lib/msf/core/modules/namespace.rb modules/auxiliary/analyze/jtr_postgres_fast.rb modules/auxiliary/scanner/afp/afp_login.rb modules/auxiliary/scanner/db2/db2_auth.rb modules/auxiliary/scanner/ftp/ftp_login.rb modules/auxiliary/scanner/http/axis_login.rb modules/auxiliary/scanner/http/http_login.rb modules/auxiliary/scanner/http/tomcat_mgr_login.rb modules/auxiliary/scanner/mssql/mssql_login.rb modules/auxiliary/scanner/mysql/mysql_login.rb modules/auxiliary/scanner/pop3/pop3_login.rb modules/auxiliary/scanner/postgres/postgres_login.rb modules/auxiliary/scanner/snmp/snmp_login.rb modules/auxiliary/scanner/ssh/ssh_login.rb modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb modules/auxiliary/scanner/telnet/telnet_login.rb modules/auxiliary/scanner/vnc/vnc_login.rb modules/auxiliary/scanner/winrm/winrm_login.rb spec/lib/metasploit/framework/credential_spec.rb spec/lib/msf/core/framework_spec.rb