1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00

Merge branch 'master' into tests_rm_16800_verify

This commit is contained in:
Jens Steube 2020-07-21 11:10:53 +02:00 committed by GitHub
commit 0bf5319523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 136 additions and 5 deletions

View File

@ -30,6 +30,7 @@
##
- Backend: Changed the maximum number of compute devices from 64 to 128
- Tests: Improved tests for hash-mode 11300 (Bitcoin/Litecoin wallet.dat)
- Tests: Improved tests for hash-mode 16800 (WPA-PMKID-PBKDF2)
* changes v5.1.0 -> v6.0.0

View File

@ -63,9 +63,13 @@ cpan install Authen::Passphrase::LANManager \
ERRORS=$((ERRORS+$?))
pip2 install pygost pycryptoplus
pip2 install pygost
# pip2 uninstall -y pycryptoplus pycrypto pycryptodome
pip2 install pycryptoplus
pip2 uninstall -y pycryptodome
pip2 install pycrypto
ERRORS=$((ERRORS+$?))

View File

@ -20,6 +20,7 @@ sub module_generate_hash
my $ckey = shift // random_hex_string (96);
my $public_key = shift // random_hex_string (66);
my $salt_iter = shift // random_number (150000, 250000);
my $cry_master = shift;
my $digest = sha512 ($word . pack ("H*", $salt));
@ -28,7 +29,43 @@ sub module_generate_hash
$digest = sha512 ($digest);
}
my $data = random_hex_string (32);
my $data = "";
if (! defined ($cry_master))
{
$data = random_hex_string (32);
}
else
{
my $aes = Crypt::CBC->new ({
key => substr ($digest, 0, 32),
cipher => "Crypt::Rijndael",
iv => substr ($digest, 32, 16),
literal_key => 1,
header => "none",
keysize => 32,
padding => "none",
});
$data = $aes->decrypt (pack ("H*", $cry_master));
if ($data =~ m/\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10$/)
{
# remove padding:
$data = substr ($data, 0, -16);
}
elsif ($data =~ m/\x08\x08\x08\x08\x08\x08\x08\x08$/)
{
# remove padding:
$data = substr ($data, 0, -8);
}
else
{
$data = "WRONG"; # fake
}
}
my $aes = Crypt::CBC->new ({
key => substr ($digest, 0, 32),
@ -40,7 +77,7 @@ sub module_generate_hash
padding => "standard",
});
my $cry_master = (unpack ("H*", $aes->encrypt ($data)));
$cry_master = unpack ("H*", $aes->encrypt ($data));
my $hash = sprintf ('$bitcoin$%d$%s$%d$%s$%d$%d$%s$%d$%s',
length ($cry_master),
@ -58,9 +95,98 @@ sub module_generate_hash
sub module_verify_hash
{
print "ERROR: verify currently not supported for Bitcoin/Litecoin wallet.dat because of unknown crypt data\n";
my $line = shift;
exit (1);
return unless (substr ($line, 0, 9) eq "\$bitcoin\$");
my $split_idx = index ($line, ":");
return if ($split_idx < 1);
my $hash = substr ($line, 0, $split_idx);
my $word = substr ($line, $split_idx + 1);
# cry_master length
my $idx1 = index ($hash, "\$", 9);
return if ($idx1 < 1);
my $cry_master_len = substr ($hash, 9, $idx1 - 9);
# cry_master
my $idx2 = index ($hash, "\$", $idx1 + 1);
return if ($idx2 < 1);
my $cry_master = substr ($hash, $idx1 + 1, $idx2 - $idx1 - 1);
return unless ($cry_master =~ m/^[0-9a-fA-F]+$/);
# salt length
$idx1 = index ($hash, "\$", $idx2 + 1);
return if ($idx1 < 1);
my $salt_len = substr ($hash, $idx2 + 1, $idx1 - $idx2 - 1);
# salt
$idx2 = index ($hash, "\$", $idx1 + 1);
return if ($idx2 < 1);
my $salt = substr ($hash, $idx1 + 1, $idx2 - $idx1 - 1);
return unless ($salt =~ m/^[0-9a-fA-F]+$/);
# salt iter
$idx1 = index ($hash, "\$", $idx2 + 1);
return if ($idx1 < 1);
my $salt_iter = substr ($hash, $idx2 + 1, $idx1 - $idx2 - 1);
# ckey length
$idx2 = index ($hash, "\$", $idx1 + 1);
return if ($idx2 < 1);
my $ckey_len = substr ($hash, $idx1 + 1, $idx2 - $idx1 - 1);
# ckey
$idx1 = index ($hash, "\$", $idx2 + 1);
return if ($idx1 < 1);
my $ckey = substr ($hash, $idx2 + 1, $idx1 - $idx2 - 1);
return unless ($ckey =~ m/^[0-9a-fA-F]+$/);
# public key length
$idx2 = index ($hash, "\$", $idx1 + 1);
return if ($idx2 < 1);
my $public_key_len = substr ($hash, $idx1 + 1, $idx2 - $idx1 - 1);
# public key
my $public_key = substr ($hash, $idx2 + 1);
return unless ($public_key =~ m/^[0-9a-fA-F]+$/);
my $word_packed = pack_if_HEX_notation ($word);
my $new_hash = module_generate_hash ($word_packed, $salt, $ckey, $public_key, $salt_iter, $cry_master);
return ($new_hash, $word);
}
1;