arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 15:18:16 +00:00
Code Issues Releases Wiki Activity

Add -m 7200 unit test

Browse Source
This commit is contained in:
jsteube 2019-02-15 21:10:02 +01:00
parent 0a77d089b3
commit 6a387bf704
2 changed files with 92 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/test_modules/m07100.pm
View File

@ -10,15 +10,19 @@ use warnings;
use Crypt::PBKDF2; use Crypt::PBKDF2;
sub module_constraints { [[0, 255], [-1, -1], [0, 55], [-1, -1], [-1, -1]] } sub module_constraints { [[0, 255], [-1, -1], [0, 255], [-1, -1], [-1, -1]] }
sub module_generate_hash sub module_generate_hash
{ {
my $word = shift; my $word = shift;
my $unused = shift; my $salt = shift;
my $salt = shift // random_hex_string (64);
my $iter = shift // 1024; my $iter = shift // 1024;
if (length $salt == 0)
{
$salt = random_hex_string (64, 64);
}
my $pbkdf2 = Crypt::PBKDF2->new my $pbkdf2 = Crypt::PBKDF2->new
( (
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512), hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512),
@ -27,9 +31,9 @@ sub module_generate_hash
my $hash_buf = unpack ("H*", $pbkdf2->PBKDF2 (pack ("H*", $salt), $word)); my $hash_buf = unpack ("H*", $pbkdf2->PBKDF2 (pack ("H*", $salt), $word));
my $tmp_hash = sprintf ("\$ml\$%i\$%s\$%0128s", $iter, $salt, $hash_buf); my $hash = sprintf ("\$ml\$%i\$%s\$%0128s", $iter, $salt, $hash_buf);
return $tmp_hash; return $hash;
} }
sub module_verify_hash sub module_verify_hash
@ -40,24 +44,28 @@ sub module_verify_hash
return if $index1 < 1; return if $index1 < 1;
my $hash = substr ($line, 0, $index1); my $hash_in = substr ($line, 0, $index1);
my $word = substr ($line, $index1 + 1); my $word = substr ($line, $index1 + 1);
my $index2 = index ($hash, "\$", 5); my $index2 = index ($hash_in, "\$", 5);
return if $index2 < 1; return if $index2 < 1;
my $index3 = index ($hash, "\$", $index2 + 1); my $index3 = index ($hash_in, "\$", $index2 + 1);
my $salt = substr ($hash, $index2 + 1, $index3 - $index2 - 1); my $salt = substr ($hash_in, $index2 + 1, $index3 - $index2 - 1);
my $iter = substr ($hash, 4, $index2 - 4); my $iter = substr ($hash_in, 4, $index2 - 4);
return if (int ($iter) < 1); return if (int ($iter) < 1);
my $word_packed = pack_if_HEX_notation ($word); return unless defined $salt;
return unless defined $word;
my $new_hash = module_generate_hash ($word_packed, undef, $salt, $iter); $word = pack_if_HEX_notation ($word);
my $new_hash = module_generate_hash ($word, $salt, $iter);
return ($new_hash, $word); return ($new_hash, $word);
} }

70
tools/test_modules/m07200.pm Normal file
View File

@ -0,0 +1,70 @@
#!/usr/bin/env perl
##
## Author......: See docs/credits.txt
## License.....: MIT
##
use strict;
use warnings;
use Crypt::PBKDF2;
sub module_constraints { [[0, 255], [-1, -1], [0, 255], [-1, -1], [-1, -1]] }
sub module_generate_hash
{
my $word = shift;
my $salt = shift;
my $iter = shift // 1024;
if (length $salt == 0)
{
$salt = random_hex_string (128, 128);
}
my $pbkdf2 = Crypt::PBKDF2->new (
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512),
iterations => $iter
);
my $hash_buf = unpack ("H*", $pbkdf2->PBKDF2 (pack ("H*", $salt), $word));
my $hash = sprintf ("grub.pbkdf2.sha512.%i.%s.%0128s", $iter, $salt, $hash_buf);
return $hash;
}
sub module_verify_hash
{
my $line = shift;
my $index1 = index ($line, ":");
return if $index1 < 1;
my $hash_in = substr ($line, 0, $index1);
my $word = substr ($line, $index1 + 1);
my $index2 = index ($hash_in, ".", 19);
return if $index2 < 1;
my $index3 = index ($hash_in, ".", $index2 + 1);
my $salt = substr ($hash_in, $index2 + 1, $index3 - $index2 - 1);
my $iter = substr ($hash_in, 19, $index2 - 19);
return unless defined $salt;
return unless defined $word;
$word = pack_if_HEX_notation ($word);
my $new_hash = module_generate_hash ($word, $salt);
return ($new_hash, $word);
}
1;