mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-10 15:51:10 +00:00
Add support for length 20 in unit test for -m 7400
This commit is contained in:
Jens Steube
parent
d76965348d
commit
3b1bdc6fa8
@ -7,8 +7,9 @@
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use Digest::SHA qw (sha256);
|
||||
|
||||
sub module_constraints { [[0, 256], [0, 16], [0, 15], [0, 16], [-1, -1]] }
|
||||
sub module_constraints { [[0, 256], [0, 20], [0, 15], [0, 20], [-1, -1]] }
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
@ -20,11 +21,11 @@ sub module_generate_hash
|
||||
|
||||
if (defined $iter)
|
||||
{
|
||||
$hash_buf = crypt ($word, "\$5\$rounds=$iter\$$salt\$");
|
||||
$hash_buf = sha256crypt ($word, $salt, $iter, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
$hash_buf = crypt ($word, "\$5\$$salt\$");
|
||||
$hash_buf = sha256crypt ($word, $salt, 5000, 0);
|
||||
}
|
||||
|
||||
my $hash = sprintf ("%s", $hash_buf);
|
||||
@ -93,5 +94,191 @@ sub module_verify_hash
|
||||
return ($new_hash, $word);
|
||||
}
|
||||
|
||||
1;
|
||||
#
|
||||
# This is modified pass_gen.pl from https://github.com/magnumripper/JohnTheRipper/blob/bleeding-jumbo/run/pass_gen.pl
|
||||
|
||||
# Copyright: https://github.com/magnumripper/JohnTheRipper/blob/bleeding-jumbo/doc/pass_gen.Manifest
|
||||
# public domain
|
||||
# written by Jim Fougeron
|
||||
|
||||
#
|
||||
# updated for new MySQL hashes by philsmd
|
||||
# modified date: February 2020
|
||||
# license: public domain
|
||||
#
|
||||
|
||||
my @i64 = ('.', '/', '0'..'9', 'A'..'Z', 'a'..'z');
|
||||
|
||||
sub to64
|
||||
{
|
||||
my $v = shift;
|
||||
my $n = shift;
|
||||
|
||||
my $str;
|
||||
|
||||
while (--$n >= 0)
|
||||
{
|
||||
$str .= $i64[$v & 0x3F];
|
||||
|
||||
$v >>= 6;
|
||||
}
|
||||
|
||||
return $str;
|
||||
}
|
||||
|
||||
sub sha_crypts
|
||||
{
|
||||
my ($func, $bits, $key, $salt, $loops) = @_;
|
||||
|
||||
my $bytes = $bits / 8;
|
||||
|
||||
my $b = $func->($key . $salt . $key);
|
||||
|
||||
# Add for any character in the key one byte of the alternate sum.
|
||||
|
||||
my $tmp = $key . $salt;
|
||||
|
||||
for (my $i = length ($key); $i > 0; $i -= $bytes)
|
||||
{
|
||||
if ($i > $bytes)
|
||||
{
|
||||
$tmp .= $b;
|
||||
}
|
||||
else
|
||||
{
|
||||
$tmp .= substr ($b, 0, $i);
|
||||
}
|
||||
}
|
||||
|
||||
# Take the binary representation of the length of the key and for every 1 add the alternate sum, for every 0 the key.
|
||||
|
||||
for (my $i = length ($key); $i > 0; $i >>= 1)
|
||||
{
|
||||
if (($i & 1) != 0)
|
||||
{
|
||||
$tmp .= $b;
|
||||
}
|
||||
else
|
||||
{
|
||||
$tmp .= $key;
|
||||
}
|
||||
}
|
||||
|
||||
my $a = $func->($tmp);
|
||||
|
||||
# NOTE, this will be the 'initial' $c value in the inner loop.
|
||||
|
||||
# For every character in the password add the entire password. produces DP
|
||||
|
||||
$tmp = "";
|
||||
|
||||
for (my $i = 0; $i < length ($key); $i++)
|
||||
{
|
||||
$tmp .= $key;
|
||||
}
|
||||
|
||||
my $dp = $func->($tmp);
|
||||
|
||||
# Create byte sequence P
|
||||
|
||||
my $p = "";
|
||||
|
||||
for (my $i = length ($key); $i > 0; $i -= $bytes)
|
||||
{
|
||||
if ($i > $bytes)
|
||||
{
|
||||
$p .= $dp;
|
||||
}
|
||||
else
|
||||
{
|
||||
$p .= substr ($dp, 0, $i);
|
||||
}
|
||||
}
|
||||
|
||||
# produce ds
|
||||
|
||||
$tmp = "";
|
||||
|
||||
my $til = 16 + ord (substr ($a, 0, 1));
|
||||
|
||||
for (my $i = 0; $i < $til; $i++)
|
||||
{
|
||||
$tmp .= $salt;
|
||||
}
|
||||
|
||||
my $ds = $func->($tmp);
|
||||
|
||||
# Create byte sequence S
|
||||
|
||||
my $s = "";
|
||||
|
||||
for (my $i = length ($salt); $i > 0; $i -= $bytes)
|
||||
{
|
||||
if ($i > $bytes)
|
||||
{
|
||||
$s .= $ds;
|
||||
}
|
||||
else
|
||||
{
|
||||
$s .= substr ($ds, 0, $i);
|
||||
}
|
||||
}
|
||||
|
||||
my $c = $a; # Ok, we saved this, which will 'seed' our crypt value here in the loop.
|
||||
|
||||
# now we do 5000 iterations of SHA2 (256 or 512)
|
||||
|
||||
for (my $i = 0; $i < $loops; $i++)
|
||||
{
|
||||
if ($i & 1) { $tmp = $p; }
|
||||
else { $tmp = $c; }
|
||||
|
||||
if ($i % 3) { $tmp .= $s; }
|
||||
if ($i % 7) { $tmp .= $p; }
|
||||
|
||||
if ($i & 1) { $tmp .= $c; }
|
||||
else { $tmp .= $p; }
|
||||
|
||||
$c = $func->($tmp);
|
||||
}
|
||||
|
||||
my $inc1; my $inc2; my $mod; my $end;
|
||||
|
||||
if ($bits == 256) { $inc1 = 10; $inc2 = 21; $mod = 30; $end = 0; }
|
||||
else { $inc1 = 21; $inc2 = 22; $mod = 63; $end = 21; }
|
||||
|
||||
my $i = 0;
|
||||
$tmp = "";
|
||||
|
||||
do
|
||||
{
|
||||
$tmp .= to64 ((ord (substr ($c, $i, 1)) << 16) | (ord (substr ($c, ($i + $inc1) % $mod, 1)) << 8) | ord (substr ($c, ($i + $inc1 * 2) % $mod, 1)), 4);
|
||||
$i = ($i + $inc2) % $mod;
|
||||
} while ($i != $end);
|
||||
|
||||
if ($bits == 256) { $tmp .= to64 ((ord (substr ($c, 31, 1)) << 8) | ord (substr ($c, 30, 1)), 3); }
|
||||
else { $tmp .= to64 (ord (substr ($c, 63, 1)), 2); }
|
||||
|
||||
return $tmp;
|
||||
}
|
||||
|
||||
sub sha256crypt
|
||||
{
|
||||
my $pass = shift;
|
||||
my $salt = shift;
|
||||
my $iter = shift;
|
||||
my $rounds = shift;
|
||||
|
||||
my $bin = sha_crypts (\&sha256, 256, $pass, $salt, $iter);
|
||||
|
||||
if ($rounds == 1)
|
||||
{
|
||||
return "\$5\$rounds=$iter\$" . $salt . "\$$bin";
|
||||
}
|
||||
else
|
||||
{
|
||||
return "\$5\$" . $salt . "\$$bin";
|
||||
}
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user