Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes for android hashdump #12593

Merged
merged 1 commit into from Nov 19, 2019
Merged

fixes for android hashdump #12593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/auxiliary/analyze/crack_mobile.rb
View file
Open in desktop
Expand Up @@ -235,7 +235,7 @@ def hash_file(hashes_regex)
regex = Regexp.new hashes_regex
framework.db.creds(workspace: myworkspace, type: 'Metasploit::Credential::NonreplayableHash').each do |core|
next unless core.private.jtr_format =~ regex
# only add hashes which havne't been cracked
# only add hashes which haven't been cracked
next unless already_cracked_pass(core.private.data).nil?
if action.name == 'john'
hashlist.puts hash_to_jtr(core)
Expand Down
4 changes: 2 additions & 2 deletions modules/post/android/gather/hashdump.rb
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ def run
fail_with Failure::NoAccess, 'This module requires root permissions.'
end

manu = cmd_exec("getprop ro.build.manufacturer")
manu = cmd_exec("getprop ro.product.manufacturer")

print_status('Attempting to determine unsalted hash.')
key_file = '/data/system/password.key'
Expand Down Expand Up @@ -128,7 +128,7 @@ def run
print_good("SHA1: #{sha1}")
credential_data = {
# no way to tell them apart w/o knowing one is samsung or not.
jtr_format: manu =~ /samsung/i ? 'android-sha1' : 'android-samsung-sha1' ,
jtr_format: manu =~ /samsung/i ? 'android-samsung-sha1' : 'android-sha1',
origin_type: :session,
post_reference_name: self.refname,
private_type: :nonreplayable_hash,
Expand Down