New format -m 13200 AxCrypt

[hashcat.git] / tools / test.pl

diff --git a/tools/test.pl b/tools/test.pl
index 442ae8a..846f0bd 100755 (executable)
--- a/tools/test.pl
+++ b/tools/test.pl
@@ -44,7 +44,7 @@ my $hashcat = "./oclHashcat";
 
 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, 130, 131, 132, 140, 141, 150, 160, 190, 200, 300, 400, 500, 900, 1000, 1100, 1400, 1410, 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, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7100, 7200, 7300, 7400, 7500, 7600, 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);
+my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 130, 131, 132, 140, 141, 150, 160, 190, 200, 300, 400, 500, 900, 1000, 1100, 1400, 1410, 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, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7100, 7200, 7300, 7400, 7500, 7600, 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);
 
 my %is_unicode      = map { $_ => 1 } qw(30 40 130 131 132 140 141 1000 1100 1430 1440 1441 1730 1740 1731 5500 5600 8000 9400 9500 9600 9700 9800);
 my %less_fifteen    = map { $_ => 1 } qw(500 1600 1800 2400 2410 3200 6300 7400 10500 10700);
@@ -2240,6 +2240,33 @@ sub verify
 
       next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
     }
+    elsif ($mode == 13200)
+    {
+      ($hash_in, $word) = split '\*', $line;
+
+      next unless defined $hash_in;
+      next unless defined $word;
+
+      my @data = split ('\*', $hash_in);
+
+      next unless scalar @data == 5;
+
+      shift @data;
+
+      my $signature = shift @data;
+      my $version   = shift @data;
+      my $iteration = shift @data;
+      my $mysalt    = shift @data;
+      my $digest    = shift @data;
+
+      next unless ($signature eq '$axcrypt$');
+      next unless (length ($mysalt) == 32);
+      next unless (length ($digest) == 48);
+
+      $salt = $iteration . '*' . $mysalt;
+
+      next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
+    }
     else
     {
       print "ERROR: hash mode is not supported\n";
@@ -2530,6 +2557,14 @@ sub verify
 
       return unless (substr ($line, 0, $len) eq $hash_out);
     }
+    elsif ($mode == 13200)
+    {
+      $hash_out = gen_hash ($mode, $word, $salt);
+
+      $len = length $hash_out;
+
+      return unless (substr ($line, 0, $len) eq $hash_out);
+    }
     else
     {
       $hash_out = gen_hash ($mode, $word, $salt, $iter);
@@ -2956,6 +2991,12 @@ sub passthrough
 
       $tmp_hash = gen_hash ($mode, $word_buf, $salt_buf);
     }
+    elsif ($mode == 13200)
+    {
+      $salt_buf = get_random_axcrypt_salt ();
+
+      $tmp_hash = gen_hash ($mode, $word_buf, $salt_buf);
+    }
     else
     {
       print "ERROR: Unsupported hash type\n";
@@ -3697,6 +3738,20 @@ sub single
         }
       }
     }
+    elsif ($mode == 13200)
+    {
+      for (my $i = 1; $i < 32; $i++)
+      {
+        if ($len != 0)
+        {
+          rnd ($mode, $len, 32);
+        }
+        else
+        {
+          rnd ($mode, $i, 32);
+        }
+      }
+    }
   }
 }
 
@@ -6706,6 +6761,53 @@ END_CODE
 
     $tmp_hash = sprintf ('$krb5tgs$23$*%s$%s$%s*$%s$%s', $user, $realm, $spn, unpack ("H*", $checksum), unpack ("H*", $edata2));
   }
+  elsif ($mode == 13200)
+  {
+    my @salt_arr = split ('\*', $salt_buf);
+
+    my $iteration  = $salt_arr[0];
+
+    my $mysalt = $salt_arr[1];
+
+    $mysalt = pack ("H*", $mysalt);
+
+    my $DEK = randbytes (16);
+
+    my $iv = "a6a6a6a6a6a6a6a6";
+
+    my $KEK = sha1($word_buf);
+
+    $KEK = substr ($KEK ^ $mysalt, 0, 16);
+
+    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);
+
+    for (my $j = 0; $j < $iteration; $j++)
+    {
+      $B = $aes->encrypt ($A . $R[1], $KEK);
+
+      $A = substr ($B, 0, 8) ^ pack ("q", (2 * $j + 1));
+
+      $R[1] = substr ($B, 8, 16);
+
+      $B = $aes->encrypt ($A . $R[2], $KEK);
+
+      $A = substr ($B, 0, 8) ^ pack ("q", (2 * $j + 2));
+
+      $R[2] = substr ($B, 8, 16);
+    }
+
+    my $wrapped_key = unpack ("H*", $A . substr ($R[1], 0 ,8) . substr ($R[2], 0 ,8));
+
+    $mysalt = unpack ("H*", $mysalt);
+
+    $tmp_hash = sprintf ('$axcrypt$*1*%s*%s*%s', $iteration, $mysalt, $wrapped_key);
+  }
 
   return ($tmp_hash);
 }
@@ -6804,6 +6906,10 @@ sub rnd
   {
     $salt_buf = get_random_kerberos5_tgs_salt ();
   }
+  elsif ($mode == 13200)
+  {
+    $salt_buf = get_random_axcrypt_salt ();
+  }
   else
   {
     my @salt_arr;
@@ -8084,6 +8190,19 @@ sub get_random_kerberos5_tgs_salt
   return $salt_buf;
 }
 
+sub get_random_axcrypt_salt
+{
+  my $mysalt = randbytes (16);
+  
+  $mysalt = unpack ("H*", $mysalt);
+
+  my $iteration = get_random_num (6, 100000);
+
+  my $salt_buf = $iteration . '*' . $mysalt;
+
+  return $salt_buf;
+}
+
 sub get_random_md5chap_salt
 {
   my $salt_buf = shift;