|
|
|
@ -46,7 +46,7 @@ my $hashcat = "./hashcat";
|
|
|
|
|
|
|
|
|
|
my $MAX_LEN = 55;
|
|
|
|
|
|
|
|
|
|
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 900, 1000, 1100, 1300, 1400, 1410, 1411, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4520, 4521, 4522, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000, 7100, 7200, 7300, 7400, 7500, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100, 14400, 14700, 14800, 14900, 15000, 99999);
|
|
|
|
|
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 900, 1000, 1100, 1300, 1400, 1410, 1411, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4520, 4521, 4522, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000, 7100, 7200, 7300, 7400, 7500, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12001, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100, 14400, 14700, 14800, 14900, 15000, 99999);
|
|
|
|
|
|
|
|
|
|
my %is_unicode = map { $_ => 1 } qw(30 40 130 131 132 133 140 141 1000 1100 1430 1440 1441 1730 1740 1731 5500 5600 8000 9400 9500 9600 9700 9800 11600 13500 13800);
|
|
|
|
|
my %less_fifteen = map { $_ => 1 } qw(500 1600 1800 2400 2410 3200 6300 7400 10500 10700);
|
|
|
|
@ -2549,6 +2549,29 @@ sub verify
|
|
|
|
|
|
|
|
|
|
$salt = substr ($decoded, 32);
|
|
|
|
|
}
|
|
|
|
|
# Atlassian (PBKDF2-HMAC-SHA1)
|
|
|
|
|
elsif ($mode == 12001)
|
|
|
|
|
{
|
|
|
|
|
my $index = index ($line, ":");
|
|
|
|
|
|
|
|
|
|
next if $index < 1;
|
|
|
|
|
|
|
|
|
|
$hash_in = substr ($line, 0, $index);
|
|
|
|
|
$word = substr ($line, $index + 1);
|
|
|
|
|
|
|
|
|
|
next unless (substr ($hash_in, 0, 9) eq '{PKCS5S2}');
|
|
|
|
|
|
|
|
|
|
# base64 buf
|
|
|
|
|
|
|
|
|
|
my $base64_buf = substr ($hash_in, 9);
|
|
|
|
|
my $base64_buf_decoded = decode_base64 ($base64_buf);
|
|
|
|
|
|
|
|
|
|
next if (length ($base64_buf_decoded) != (16 + 32));
|
|
|
|
|
|
|
|
|
|
$salt = substr ($base64_buf_decoded, 0, 16);
|
|
|
|
|
|
|
|
|
|
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print "ERROR: hash mode is not supported\n";
|
|
|
|
@ -3061,7 +3084,7 @@ sub passthrough
|
|
|
|
|
{
|
|
|
|
|
$tmp_hash = gen_hash ($mode, $word_buf, substr ($salt_buf, 0, 10));
|
|
|
|
|
}
|
|
|
|
|
elsif ($mode == 3200 || $mode == 5800 || $mode == 6400 || $mode == 6500 || $mode == 6700 || $mode == 7400 || $mode == 3300 || $mode == 8000 || $mode == 9100 || $mode == 12200)
|
|
|
|
|
elsif ($mode == 3200 || $mode == 5800 || $mode == 6400 || $mode == 6500 || $mode == 6700 || $mode == 7400 || $mode == 3300 || $mode == 8000 || $mode == 9100 || $mode == 12001 || $mode == 12200)
|
|
|
|
|
{
|
|
|
|
|
$tmp_hash = gen_hash ($mode, $word_buf, substr ($salt_buf, 0, 16));
|
|
|
|
|
}
|
|
|
|
@ -3482,7 +3505,7 @@ sub single
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
elsif ($mode == 141 || $mode == 3300 || $mode == 1441 || $mode == 1800 || $mode == 3200 || $mode == 4800 || $mode == 6400 || $mode == 6500 || $mode == 6700 || $mode == 7400 || $mode == 8000 || $mode == 9100 || $mode == 12200)
|
|
|
|
|
elsif ($mode == 141 || $mode == 3300 || $mode == 1441 || $mode == 1800 || $mode == 3200 || $mode == 4800 || $mode == 6400 || $mode == 6500 || $mode == 6700 || $mode == 7400 || $mode == 8000 || $mode == 9100 || $mode == 12001 || $mode == 12200)
|
|
|
|
|
{
|
|
|
|
|
for (my $i = 1; $i < 32; $i++)
|
|
|
|
|
{
|
|
|
|
@ -7056,6 +7079,20 @@ END_CODE
|
|
|
|
|
|
|
|
|
|
$tmp_hash = sprintf ("sha1:%i:%s:%s", $iterations, $base64_salt_buf, $hash_buf);
|
|
|
|
|
}
|
|
|
|
|
elsif ($mode == 12001)
|
|
|
|
|
{
|
|
|
|
|
my $pbkdf2 = Crypt::PBKDF2->new
|
|
|
|
|
(
|
|
|
|
|
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA1'),
|
|
|
|
|
iterations => 10000,
|
|
|
|
|
output_len => 32
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
my $base64_buf = encode_base64 ($salt_buf . $pbkdf2->PBKDF2 ($salt_buf, $word_buf));
|
|
|
|
|
$base64_buf =~ s/[\r\n]//g;
|
|
|
|
|
|
|
|
|
|
$tmp_hash = sprintf ("{PKCS5S2}%s", $base64_buf);
|
|
|
|
|
}
|
|
|
|
|
elsif ($mode == 12100)
|
|
|
|
|
{
|
|
|
|
|
my $iterations = 1000;
|
|
|
|
|