arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update -m 299xx unit-tests to test for 56 bit instead of 32 bit

Browse Source
pull/3494/head
jsteube 2 years ago
parent f63ff289f7
commit fd46096b57
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File

12
tools/test_modules/m29910.pm
Unescape View File

@ -97,23 +97,25 @@ sub module_generate_hash
{
my $ct_bin = pack ("H*", $ct);
$pt_bin = xor_len (substr ($ctr, 4, 4), $ct_bin, 4);
$pt_bin = xor_len (substr ($ctr, 4, 8), $ct_bin, 8);
if ($pt_bin eq "\xd2\xc3\xb4\xa1")
# we compare only 56 bit, see https://github.com/hashcat/hashcat/issues/3467
if (substr ($pt_bin, 0, 7) eq "\xd2\xc3\xb4\xa1\x00\x00\x00")
{
# ok
}
else
{
$pt_bin = "\xff\xff\xff\xff";
$pt_bin = "\xff\xff\xff\xff\xff\xff\xff\xff";
}
}
else
{
$pt_bin = "\xd2\xc3\xb4\xa1";
$pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
}
my $ct_bin = xor_len (substr ($ctr, 4, 4), $pt_bin, 4);
my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
my $hash = sprintf ('$encdv-pbkdf2$1$%d$%s$%s$32$%s$%d', $algo, unpack ("H*", $iv_bin), unpack ("H*", $ct_bin), unpack ("H*", $salt_bin), $iter);

12
tools/test_modules/m29920.pm
Unescape View File

@ -141,23 +141,25 @@ sub module_generate_hash
{
my $ct_bin = pack ("H*", $ct);
$pt_bin = xor_len (substr ($ctr, 4, 4), $ct_bin, 4);
$pt_bin = xor_len (substr ($ctr, 4, 8), $ct_bin, 8);
if ($pt_bin eq "\xd2\xc3\xb4\xa1")
# we compare only 56 bit, see https://github.com/hashcat/hashcat/issues/3467
if (substr ($pt_bin, 0, 7) eq "\xd2\xc3\xb4\xa1\x00\x00\x00")
{
# ok
}
else
{
$pt_bin = "\xff\xff\xff\xff";
$pt_bin = "\xff\xff\xff\xff\xff\xff\xff\xff";
}
}
else
{
$pt_bin = "\xd2\xc3\xb4\xa1";
$pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
}
my $ct_bin = xor_len (substr ($ctr, 4, 4), $pt_bin, 4);
my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
my $hash = sprintf ('$encdv-pbkdf2$3$%d$%s$%s$32$%s$%d$%s', $algo, unpack ("H*", $iv_bin), unpack ("H*", $ct_bin), unpack ("H*", $salt_bin), $iter, unpack ("H*", $keychain_bin));

12
tools/test_modules/m29930.pm
Unescape View File

@ -117,23 +117,25 @@ sub module_generate_hash
{
my $ct_bin = pack ("H*", $ct);
$pt_bin = xor_len (substr ($ctr, 4, 4), $ct_bin, 4);
$pt_bin = xor_len (substr ($ctr, 4, 8), $ct_bin, 8);
if ($pt_bin eq "\xd2\xc3\xb4\xa1")
# we compare only 56 bit, see https://github.com/hashcat/hashcat/issues/3467
if (substr ($pt_bin, 0, 7) eq "\xd2\xc3\xb4\xa1\x00\x00\x00")
{
# ok
}
else
{
$pt_bin = "\xff\xff\xff\xff";
$pt_bin = "\xff\xff\xff\xff\xff\xff\xff\xff";
}
}
else
{
$pt_bin = "\xd2\xc3\xb4\xa1";
$pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
}
my $ct_bin = xor_len (substr ($ctr, 4, 4), $pt_bin, 4);
my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
my $hash = sprintf ('$encdv$1$%d$%s$%s', $algo, unpack ("H*", $iv_bin), unpack ("H*", $ct_bin));

12
tools/test_modules/m29940.pm
Unescape View File

@ -161,23 +161,25 @@ sub module_generate_hash
{
my $ct_bin = pack ("H*", $ct);
$pt_bin = xor_len (substr ($ctr, 4, 4), $ct_bin, 4);
$pt_bin = xor_len (substr ($ctr, 4, 8), $ct_bin, 8);
if ($pt_bin eq "\xd2\xc3\xb4\xa1")
# we compare only 56 bit, see https://github.com/hashcat/hashcat/issues/3467
if (substr ($pt_bin, 0, 7) eq "\xd2\xc3\xb4\xa1\x00\x00\x00")
{
# ok
}
else
{
$pt_bin = "\xff\xff\xff\xff";
$pt_bin = "\xff\xff\xff\xff\xff\xff\xff\xff";
}
}
else
{
$pt_bin = "\xd2\xc3\xb4\xa1";
$pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
}
my $ct_bin = xor_len (substr ($ctr, 4, 4), $pt_bin, 4);
my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
my $hash = sprintf ('$encdv$3$%d$%s$%s$%s', $algo, unpack ("H*", $iv_bin), unpack ("H*", $ct_bin), unpack ("H*", $keychain_bin));

Write Preview
Loading…
Cancel
Save