mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-16 19:58:25 +00:00
Merge pull request #401 from philsmd/master
test: fixed verify for -m 13100, -m 13200, -m 13300 and -m 13400
This commit is contained in:
Jens Steube
GitHub
commit
ede4cfdc3b
149
tools/test.pl
149
tools/test.pl
@ -2238,7 +2238,10 @@ sub verify
|
||||
next unless (length ($checksum) == 32);
|
||||
next unless (length ($edata2) >= 64);
|
||||
|
||||
$salt = $user . '$' . $realm . '$' . $spn . '$' . substr ($edata2, 0, 16);
|
||||
$salt = $user . '$' . $realm . '$' . $spn . '$';
|
||||
|
||||
$param = $checksum;
|
||||
$param2 = $edata2;
|
||||
|
||||
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
||||
}
|
||||
@ -2253,8 +2256,6 @@ sub verify
|
||||
|
||||
next unless scalar @data == 5;
|
||||
|
||||
shift @data;
|
||||
|
||||
my $signature = shift @data;
|
||||
my $version = shift @data;
|
||||
my $iteration = shift @data;
|
||||
@ -2266,6 +2267,7 @@ sub verify
|
||||
next unless (length ($digest) == 48);
|
||||
|
||||
$salt = $iteration . '*' . $mysalt;
|
||||
$param = $digest;
|
||||
|
||||
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
||||
}
|
||||
@ -2365,7 +2367,8 @@ sub verify
|
||||
next unless (length ($keyfile) == $keyfile_len);
|
||||
}
|
||||
|
||||
$salt = substr ($hash_in, length ("*keepass*") + 1, length ($hash_in));
|
||||
$salt = substr ($hash_in, length ("*keepass*") + 1);
|
||||
$param = 1; # distinguish between encrypting vs decrypting
|
||||
|
||||
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
||||
}
|
||||
@ -2674,7 +2677,7 @@ sub verify
|
||||
}
|
||||
elsif ($mode == 13100)
|
||||
{
|
||||
$hash_out = gen_hash ($mode, $word, $salt);
|
||||
$hash_out = gen_hash ($mode, $word, $salt, $iter, $param, $param2);
|
||||
|
||||
$len = length $hash_out;
|
||||
|
||||
@ -2682,7 +2685,7 @@ sub verify
|
||||
}
|
||||
elsif ($mode == 13200)
|
||||
{
|
||||
$hash_out = gen_hash ($mode, $word, $salt);
|
||||
$hash_out = gen_hash ($mode, $word, $salt, $iter, $param);
|
||||
|
||||
$len = length $hash_out;
|
||||
|
||||
@ -2690,7 +2693,7 @@ sub verify
|
||||
}
|
||||
elsif ($mode == 13400)
|
||||
{
|
||||
$hash_out = gen_hash ($mode, $word, $salt);
|
||||
$hash_out = gen_hash ($mode, $word, $salt, $iter, $param);
|
||||
|
||||
$len = length $hash_out;
|
||||
|
||||
@ -6956,7 +6959,9 @@ END_CODE
|
||||
|
||||
my $spn = $salt_arr[2];
|
||||
|
||||
my $nonce = $salt_arr[3];
|
||||
my $k = md4 (encode ("UTF-16LE", $word_buf));
|
||||
|
||||
my $k1 = hmac_md5 ("\x02\x00\x00\x00", $k);
|
||||
|
||||
my $cleartext_ticket = '6381b03081ada00703050050a00000a11b3019a003020117a1'.
|
||||
'12041058e0d77776e8b8e03991f2966939222aa2171b154d594b5242544553542e434f4e5'.
|
||||
@ -6965,19 +6970,52 @@ END_CODE
|
||||
'134343735305aa711180f32303136303231363030343735305aa811180f32303136303232'.
|
||||
'323134343735305a';
|
||||
|
||||
my $checksum = "";
|
||||
|
||||
if (defined $additional_param)
|
||||
{
|
||||
$checksum = pack ("H*", $additional_param);
|
||||
}
|
||||
else
|
||||
{
|
||||
my $nonce = $salt_arr[3];
|
||||
|
||||
$cleartext_ticket = $nonce . $cleartext_ticket;
|
||||
|
||||
my $k = md4 (encode ("UTF-16LE", $word_buf));
|
||||
|
||||
my $k1 = hmac_md5 ("\x02\x00\x00\x00", $k);
|
||||
|
||||
my $checksum = hmac_md5 (pack ("H*", $cleartext_ticket), $k1);
|
||||
$checksum = hmac_md5 (pack ("H*", $cleartext_ticket), $k1);
|
||||
}
|
||||
|
||||
my $k3 = hmac_md5 ($checksum, $k1);
|
||||
|
||||
my $edata2 = "";
|
||||
|
||||
if (defined $additional_param2)
|
||||
{
|
||||
$edata2 = $additional_param2;
|
||||
|
||||
my $cipher_decrypt = Crypt::RC4->new ($k3);
|
||||
|
||||
my $ticket_decrypt = unpack ("H*", $cipher_decrypt->RC4 (pack ("H*", $edata2)));
|
||||
|
||||
my $check_correct = ((substr ($ticket_decrypt, 16, 4) eq "6381" && substr ($ticket_decrypt, 22, 2) eq "30") ||
|
||||
(substr ($ticket_decrypt, 16, 4) eq "6382")) &&
|
||||
((substr ($ticket_decrypt, 32, 6) eq "030500") ||
|
||||
(substr ($ticket_decrypt, 32, 8) eq "050307A0"));
|
||||
|
||||
if ($check_correct == 1)
|
||||
{
|
||||
$cleartext_ticket = $ticket_decrypt;
|
||||
}
|
||||
else # validation failed
|
||||
{
|
||||
# fake/wrong ticket (otherwise if we just decrypt/encrypt we end up with false positives all the time)
|
||||
$cleartext_ticket = "0" x (length ($cleartext_ticket) + 16);
|
||||
}
|
||||
}
|
||||
|
||||
my $cipher = Crypt::RC4->new ($k3);
|
||||
|
||||
my $edata2 = $cipher->RC4 (pack ("H*", $cleartext_ticket));
|
||||
$edata2 = $cipher->RC4 (pack ("H*", $cleartext_ticket));
|
||||
|
||||
$tmp_hash = sprintf ('$krb5tgs$23$*%s$%s$%s*$%s$%s', $user, $realm, $spn, unpack ("H*", $checksum), unpack ("H*", $edata2));
|
||||
}
|
||||
@ -6991,8 +7029,6 @@ END_CODE
|
||||
|
||||
$mysalt = pack ("H*", $mysalt);
|
||||
|
||||
my $DEK = randbytes (16);
|
||||
|
||||
my $iv = "a6a6a6a6a6a6a6a6";
|
||||
|
||||
my $KEK = sha1 ($word_buf);
|
||||
@ -7001,11 +7037,59 @@ END_CODE
|
||||
|
||||
my $aes = Crypt::Mode::ECB->new ('AES');
|
||||
|
||||
my @R = ('', substr(pack ("H*",$DEK),0,8), substr(pack ("H*",$DEK),8,16));
|
||||
|
||||
my $B;
|
||||
|
||||
my $A = pack ("H*", $iv);
|
||||
my $A;
|
||||
|
||||
my @R = ();
|
||||
|
||||
if (defined $additional_param)
|
||||
{
|
||||
$additional_param = pack ("H*", $additional_param);
|
||||
|
||||
$A = substr ($additional_param, 0, 8);
|
||||
$B = 0x00 x 8;
|
||||
|
||||
$R[1] = substr ($additional_param, 8, 8);
|
||||
$R[2] = substr ($additional_param, 16, 8);
|
||||
|
||||
for (my $j = $iteration - 1; $j >= 0; $j--)
|
||||
{
|
||||
$A = substr ($A, 0, 8) ^ pack ("l", (2 * $j + 2));
|
||||
|
||||
$B = $R[2];
|
||||
|
||||
$A = $aes->decrypt ($A . $B . "\x00" x 16, $KEK);
|
||||
|
||||
$R[2] = substr ($A, 8, 16);
|
||||
|
||||
$A = substr ($A, 0, 8) ^ pack ("l", (2 * $j + 1));
|
||||
|
||||
$B = $R[1];
|
||||
|
||||
$A = $aes->decrypt ($A . $B . "\x00" x 16, $KEK);
|
||||
|
||||
$R[1] = substr ($A, 8, 16);
|
||||
}
|
||||
|
||||
# check if valid
|
||||
if (index ($A, "\xa6\xa6\xa6\xa6\xa6\xa6\xa6\xa6") != 0)
|
||||
{
|
||||
# fake wrong @R and $A values
|
||||
|
||||
@R = ('', "\x00" x 8, "\x00" x 8);
|
||||
|
||||
$A = "\x00" x 16;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
my $DEK = randbytes (16);
|
||||
|
||||
@R = ('', substr (pack ("H*", $DEK), 0, 8), substr (pack ("H*", $DEK), 8, 16));
|
||||
|
||||
$A = pack ("H*", $iv);
|
||||
}
|
||||
|
||||
for (my $j = 0; $j < $iteration; $j++)
|
||||
{
|
||||
@ -7077,13 +7161,17 @@ END_CODE
|
||||
if ($version == 1)
|
||||
{
|
||||
$contents_hash = $salt_arr[6];
|
||||
|
||||
$contents_hash = pack ("H*", $contents_hash);
|
||||
|
||||
$inline_flag = $salt_arr[7];
|
||||
|
||||
|
||||
$contents_len = $salt_arr[8];
|
||||
|
||||
|
||||
$contents = $salt_arr[9];
|
||||
|
||||
$contents = pack ("H*", $contents);
|
||||
|
||||
# keyfile handling
|
||||
@ -7101,6 +7189,7 @@ END_CODE
|
||||
. "*" . $keyfile_content;
|
||||
|
||||
$intermediate_hash = $intermediate_hash . pack ("H*", $keyfile_content);
|
||||
|
||||
$intermediate_hash = sha256 ($intermediate_hash);
|
||||
}
|
||||
}
|
||||
@ -7123,6 +7212,7 @@ END_CODE
|
||||
. "*" . $keyfile_content;
|
||||
|
||||
}
|
||||
|
||||
$intermediate_hash = sha256 ($intermediate_hash);
|
||||
}
|
||||
|
||||
@ -7161,8 +7251,29 @@ END_CODE
|
||||
|
||||
if ($version == 1)
|
||||
{
|
||||
if (defined $additional_param)
|
||||
{
|
||||
# if we try to verify the crack, we need to decrypt the contents instead of only encrypting it:
|
||||
|
||||
$contents = $cipher->decrypt ($contents);
|
||||
|
||||
# and check the output
|
||||
|
||||
my $contents_hash_old = $contents_hash;
|
||||
|
||||
$contents_hash = sha256 ($contents);
|
||||
|
||||
if ($contents_hash_old ne $contents_hash)
|
||||
{
|
||||
# fake content
|
||||
$contents = "\x00" x length ($contents);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$contents_hash = sha256 ($contents);
|
||||
}
|
||||
|
||||
$contents = $cipher->encrypt ($contents);
|
||||
|
||||
$tmp_hash = sprintf ('$keepass$*%d*%d*%d*%s*%s*%s*%s*%d*%d*%s%s',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user