Commit Graph

7 Commits

Author SHA1 Message Date
James Lee b756395eaa Merge branch 'staging/electro-release' into feature/MSP-9712/winrm-bruteforce
Conflicts:
	lib/metasploit/framework/credential_collection.rb
	spec/lib/metasploit/framework/credential_collection_spec.rb
2014-06-11 16:21:59 -05:00
James Lee 3a8f6236ad Add ability to prepend creds to a collection 2014-06-11 14:30:45 -05:00
James Lee 552899ef13 Add a couple more specs for CredentialCollection
Also fixes some typos in docs
2014-06-06 12:12:32 -05:00
James Lee 33a9f8c43f Add spec for userpass_file 2014-06-05 11:54:59 -05:00
James Lee 45c26343a1 Add spec for pass_file 2014-06-05 11:51:11 -05:00
James Lee b1136752be Add Credential#== to facilitate specs 2014-06-05 11:37:48 -05:00
James Lee 41644970bf Add a CredentialCollection
Also moves Metasploit::Framework::LoginScanner::Credential to
Metasploit::Framework::Credential
2014-06-04 13:01:09 -05:00