account for mssql12 format

mssql2012 and later uses a new format. some versions
of john support this and some do not yet
bug/bundler_fix
David Maloney 2014-06-19 16:11:14 -05:00
parent aca532b994
commit 93da4dc561
No known key found for this signature in database
GPG Key ID: DEDBA9DC3A913DB2
2 changed files with 4 additions and 2 deletions

View File

@ -83,7 +83,7 @@ class Metasploit3 < Msf::Auxiliary
def hash_file
hashlist = Rex::Quickfile.new("hashes_tmp")
Metasploit::Credential::NonreplayableHash.joins(:cores).where(metasploit_credential_cores: { workspace_id: myworkspace.id }, jtr_format: ['mssql', 'mssql05']).each do |hash|
Metasploit::Credential::NonreplayableHash.joins(:cores).where(metasploit_credential_cores: { workspace_id: myworkspace.id }, jtr_format: ['mssql', 'mssql05', 'mssql12']).each do |hash|
# Track the formats that we've seen so we do not attempt a format that isn't relevant
@formats << hash.jtr_format
hash.cores.each do |core|

View File

@ -97,8 +97,10 @@ class Metasploit3 < Msf::Auxiliary
when "2000"
hashtype = "mssql"
when "2005", "2008", "2012", "2014"
when "2005", "2008"
hashtype = "mssql05"
when "2012", "2014"
hashtype = "mssql12"
end
this_service = report_service(