haiti-hash 0.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea489f10f5c1dbe663cde1ff954aa0883f4a8c75e317a5a88bba47a6bc806524
-  data.tar.gz: 79c1620f169053f58a53a45dc2727bb6cbf180aa75c9de0969909a7ac1946e98
+  metadata.gz: c97cfd3205f66d6279408925c133f2396fe689de4043658ab12dfd6a8fd34dc9
+  data.tar.gz: 24f3fc2682d3a6a43572db3754a5b2338f36584a9cd0c524a50ae4348787e49d
 SHA512:
-  metadata.gz: 6cc3b6b014785fe7fee794af3a90c812b42bcb3a5eb50a413736faac263f1f5e2c1093bc2d589f57a9cb009794082e692cff15a4d6cbb2d10619c80cfc99c1bf
-  data.tar.gz: f1d02e7486b9126b997a198fd3ffcb889686378c227da43fc8c03cc2d3e9cae1174a9af32afa5355afa6c4c6ad74f9a6bc8dc5258d0f3f422f489abe225d233f
+  metadata.gz: dd3ad9f60423a751dcfaa424dd82a15dac9c653f982fb393e05355e6a1acaacabf0cb68ca5a5608b053093a9d1bf2a28e53c7113374d397b86fc540669c407ec
+  data.tar.gz: ddcf5251e1c98a7ef95d5e09384cc84ef4a9d41840514be1002875f9a08eaaf937464c65c6176cbe8a1d97060d0cdc3f6b2a99e44f0d6fe1ce52a82e642cfa5d

data/LICENSE.txt

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Alexandre ZANNI
+Copyright (c) 2020-2020 Alexandre ZANNI
+Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/haiti

@@ -34,6 +34,7 @@ DOCOPT
 
 begin
   args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  Paint.mode = 0 if args['--no-color']
   pp args if args['--debug']
   # use case 1, using the tool
   if args['<hash>']
@@ -42,24 +43,13 @@ begin
       puts 'Unknown hash type'
       exit(0)
     end
-    if args['--no-color']
-      hi.type.each do |type|
-        next if type.extended && !args['--extended']
+    hi.type.each do |type|
+      next if type.extended && !args['--extended']
 
-        line = type.name
-        line += " [HC: #{type.hashcat}]" unless type.hashcat.nil? || args['--short'] || args['--john-only']
-        line += " [JtR: #{type.john}]" unless type.john.nil? || args['--short'] || args['--hashcat-only']
-        puts line
-      end
-    else
-      hi.type.each do |type|
-        next if type.extended && !args['--extended']
-
-        print Paint[type.name, :bold]
-        print Paint[" [HC: #{type.hashcat}]", :blue] unless type.hashcat.nil? || args['--short'] || args['--john-only']
-        print Paint[" [JtR: #{type.john}]", :green] unless type.john.nil? || args['--short'] || args['--hashcat-only']
-        puts
-      end
+      print Paint[type.name, :bold]
+      print Paint[" [HC: #{type.hashcat}]", :blue] unless type.hashcat.nil? || args['--short'] || args['--john-only']
+      print Paint[" [JtR: #{type.john}]", :green] unless type.john.nil? || args['--short'] || args['--hashcat-only']
+      puts
     end
   end
   # use case 2, help: already handled by docopt

data/data/commons.json

@@ -0,0 +1,29 @@
+[
+  "MD5",
+  "SHA-1",
+  "SHA-256",
+  "SHA-512",
+  "bcrypt",
+  "NTLM",
+  "NetNTLMv2",
+  "NetNTLMv1-VANILLA / NetNTLMv1+ESS",
+  "BLAKE2-512",
+  "SHA3-224",
+  "SHA3-256",
+  "SHA3-512",
+  "Keccak-256",
+  "Keccak-512",
+  "CRC-32B",
+  "CRC-32",
+  "CRC-16",
+  "CRC-64",
+  "GOST R 34.11-94",
+  "Apache MD5",
+  "MD5(APR)",
+  "md5apr1",
+  "Domain Cached Credentials",
+  "Domain Cached Credentials 2",
+  "LM",
+  "RIPEMD-160",
+  "scrypt"
+]

data/data/prototypes.json

@@ -192,6 +192,12 @@
                 "hashcat": 2400,
                 "extended": false,
                 "name": "Cisco-PIX(MD5)"
+            },
+            {
+                "john": "dynamic_19",
+                "hashcat": 2400,
+                "extended": true,
+                "name": "md5($pass)"
             }
         ]
     },
@@ -225,6 +231,18 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "CRC-96(ZIP)"
+            },
+            {
+                "john": null,
+                "hashcat": 20500,
+                "extended": false,
+                "name": "PKZIP Master Key"
+            },
+            {
+                "john": null,
+                "hashcat": 20510,
+                "extended": false,
+                "name": "PKZIP Master Key (6 byte optimization)"
             }
         ]
     },
@@ -287,7 +305,19 @@
                 "john": "haval-128-4",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-128"
+                "name": "Haval-128 (4 rounds)"
+            },
+            {
+                "john": "dynamic_160",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-128 (3 rounds)"
+            },
+            {
+                "john": "dynamic_180",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-128 (5 rounds)"
             },
             {
                 "john": null,
@@ -332,31 +362,37 @@
                 "name": "PrestaShop"
             },
             {
-                "john": null,
+                "john": "dynamic_3",
                 "hashcat": 3500,
                 "extended": true,
                 "name": "md5(md5(md5($pass)))"
             },
+            {
+                "john": "dynamic_2",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(md5($pass))"
+            },
             {
                 "john": null,
                 "hashcat": 4300,
                 "extended": true,
-                "name": "md5(strtoupper(md5($pass)))"
+                "name": "md5(uppercase(md5($pass)))"
             },
             {
-                "john": null,
+                "john": "dynamic_22",
                 "hashcat": 4400,
                 "extended": true,
                 "name": "md5(sha1($pass))"
             },
             {
-                "john": null,
+                "john": "dynamic_1",
                 "hashcat": 10,
                 "extended": true,
                 "name": "md5($pass.$salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_4",
                 "hashcat": 20,
                 "extended": true,
                 "name": "md5($salt.$pass)"
@@ -386,13 +422,13 @@
                 "name": "HMAC-MD5 (key = $salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_8",
                 "hashcat": 3610,
                 "extended": true,
                 "name": "md5(md5($salt).$pass)"
             },
             {
-                "john": null,
+                "john": "dynamic_9",
                 "hashcat": 3710,
                 "extended": true,
                 "name": "md5($salt.md5($pass))"
@@ -404,25 +440,43 @@
                 "name": "md5($pass.md5($salt))"
             },
             {
-                "john": null,
+                "john": "dynamic_5",
                 "hashcat": 3810,
                 "extended": true,
                 "name": "md5($salt.$pass.$salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_14",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5($salt.md5($pass).$salt)"
+            },
+            {
+                "john": "dynamic_13",
                 "hashcat": 3910,
                 "extended": true,
                 "name": "md5(md5($pass).md5($salt))"
             },
             {
-                "john": null,
+                "john": "dynamic_12",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(md5($salt).md5($pass))"
+            },
+            {
+                "john": "dynamic_6",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(md5($pass).$salt)"
+            },
+            {
+                "john": "dynamic_10",
                 "hashcat": 4010,
                 "extended": true,
                 "name": "md5($salt.md5($salt.$pass))"
             },
             {
-                "john": null,
+                "john": "dynamic_11",
                 "hashcat": 4110,
                 "extended": true,
                 "name": "md5($salt.md5($pass.$salt))"
@@ -432,6 +486,66 @@
                 "hashcat": 4210,
                 "extended": true,
                 "name": "md5($username.0.$pass)"
+            },
+            {
+                "john": "dynamic_15",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5($username.md5($pass).$salt)"
+            },
+            {
+                "john": "dynamic_16",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(md5(md5($pass).$salt).$salt2)"
+            },
+            {
+                "john": "dynamic_18",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5($salt.Y.$pass.0xF7.$salt)"
+            },
+            {
+                "john": "dynamic_29",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(utf16($pass))"
+            },
+            {
+                "john": "dynamic_31",
+                "hashcat": null,
+                "extended": true,
+                "name": "md4($salt.$pass)"
+            },
+            {
+                "john": "dynamic_32",
+                "hashcat": null,
+                "extended": true,
+                "name": "md4($pass.$salt)"
+            },
+            {
+                "john": "dynamic_33",
+                "hashcat": null,
+                "extended": true,
+                "name": "md4(utf16($pass))"
+            },
+            {
+                "john": "dynamic_34",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5(md4($pass))"
+            },
+            {
+                "john": "dynamic_39",
+                "hashcat": null,
+                "extended": true,
+                "name": "net-md5"
+            },
+            {
+                "john": "dynamic_39",
+                "hashcat": null,
+                "extended": true,
+                "name": "md5($salt.pad16($pass))"
             }
         ]
     },
@@ -611,7 +725,7 @@
             {
                 "john": null,
                 "hashcat": 1600,
-                "extended": true,
+                "extended": false,
                 "name": "md5apr1"
             }
         ]
@@ -693,10 +807,22 @@
                 "name": "RIPEMD-160"
             },
             {
-                "john": null,
+                "john": "dynamic_190",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-160 (3 rounds)"
+            },
+            {
+                "john": "dynamic_200",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-160 (4 rounds)"
+            },
+            {
+                "john": "dynamic_210",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-160"
+                "name": "Haval-160 (5 rounds)"
             },
             {
                 "john": null,
@@ -729,11 +855,29 @@
                 "name": "Skein-512(160)"
             },
             {
-                "john": null,
+                "john": "dynamic_35",
                 "hashcat": null,
                 "extended": true,
                 "name": "MangosWeb Enhanced CMS"
             },
+            {
+                "john": "dynamic_36",
+                "hashcat": null,
+                "extended": true,
+                "name": "MangosWeb Enhanced CMS v2"
+            },
+            {
+                "john": "dynamic_35",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha1(uppercase($username).:.$pass)"
+            },
+            {
+                "john": "dynamic_36",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha1($username.:.$pass)"
+            },
             {
                 "john": null,
                 "hashcat": 4600,
@@ -741,19 +885,19 @@
                 "name": "sha1(sha1(sha1($pass)))"
             },
             {
-                "john": null,
+                "john": "dynamic_23",
                 "hashcat": 4700,
                 "extended": true,
                 "name": "sha1(md5($pass))"
             },
             {
-                "john": null,
+                "john": "dynamic_24",
                 "hashcat": 110,
                 "extended": true,
                 "name": "sha1($pass.$salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_25",
                 "hashcat": 120,
                 "extended": true,
                 "name": "sha1($salt.$pass)"
@@ -787,6 +931,42 @@
                 "hashcat": 4710,
                 "extended": true,
                 "name": "sha1($salt.$pass.$salt)"
+            },
+            {
+                "john": "dynamic_37",
+                "hashcat": null,
+                "extended": true,
+                "name": "SMF"
+            },
+            {
+                "john": "dynamic_37",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha1(lowercase($username).$pass)"
+            },
+            {
+                "john": "dynamic_38",
+                "hashcat": null,
+                "extended": true,
+                "name": "Wolt3BB"
+            },
+            {
+                "john": "dynamic_38",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha1($salt.sha1($salt.sha1($pass)))"
+            },
+            {
+                "john": "dynamic_40",
+                "hashcat": null,
+                "extended": true,
+                "name": "net-sha1"
+            },
+            {
+                "john": "dynamic_40",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha1($salt.pad20($pass))"
             }
         ]
     },
@@ -856,10 +1036,22 @@
         "regex": "^[a-f0-9]{48}$",
         "modes": [
             {
-                "john": null,
+                "john": "dynamic_220",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-192 (3 rounds)"
+            },
+            {
+                "john": "dynamic_230",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-192 (4 rounds)"
+            },
+            {
+                "john": "dynamic_240",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-192"
+                "name": "Haval-192 (5 rounds)"
             },
             {
                 "john": "tiger",
@@ -959,24 +1151,84 @@
         "modes": [
             {
                 "john": "raw-sha224",
-                "hashcat": null,
+                "hashcat": 1300,
                 "extended": false,
                 "name": "SHA-224"
             },
             {
-                "john": null,
+                "john": "dynamic_51",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224($salt.$pass)"
+            },
+            {
+                "john": "dynamic_52",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224($pass.$salt)"
+            },
+            {
+                "john": "dynamic_53",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224(sha224($pass))"
+            },
+            {
+                "john": "dynamic_54",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224(sha224_raw($pass))"
+            },
+            {
+                "john": "dynamic_55",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224(sha224($pass).$salt)"
+            },
+            {
+                "john": "dynamic_56",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224($salt.sha224($pass))"
+            },
+            {
+                "john": "dynamic_57",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224(sha224($salt).sha224($pass))"
+            },
+            {
+                "john": "dynamic_58",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha224(sha224($pass).sha224($pass))"
+            },
+            {
+                "john": "dynamic_250",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-224"
+                "name": "Haval-224 (3 rounds)"
             },
             {
-                "john": null,
+                "john": "dynamic_260",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-224 (4 rounds)"
+            },
+            {
+                "john": "dynamic_270",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-224 (5 rounds)"
+            },
+            {
+                "john": "dynamic_370",
                 "hashcat": 17300,
                 "extended": false,
                 "name": "SHA3-224"
             },
             {
-                "john": null,
+                "john": "dynamic_430",
                 "hashcat": 17700,
                 "extended": false,
                 "name": "Keccak-224"
@@ -992,6 +1244,18 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "Skein-512(224)"
+            },
+            {
+                "john": "dynamic_330",
+                "hashcat": null,
+                "extended": false,
+                "name": "Skein-224"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-224"
             }
         ]
     },
@@ -1094,7 +1358,7 @@
                 "name": "SHA-256"
             },
             {
-                "john": null,
+                "john": "dynamic_140",
                 "hashcat": null,
                 "extended": false,
                 "name": "RIPEMD-256"
@@ -1103,7 +1367,19 @@
                 "john": "haval-256-3",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-256"
+                "name": "Haval-256 (3 rounds)"
+            },
+            {
+                "john": "dynamic_290",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-256 (4 rounds)"
+            },
+            {
+                "john": "dynamic_300",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-256 (5 rounds)"
             },
             {
                 "john": "gost",
@@ -1118,7 +1394,7 @@
                 "name": "GOST CryptoPro S-Box"
             },
             {
-                "john": null,
+                "john": "dynamic_380",
                 "hashcat": 17400,
                 "extended": false,
                 "name": "SHA3-256"
@@ -1148,13 +1424,13 @@
                 "name": "Ventrilo"
             },
             {
-                "john": null,
+                "john": "dynamic_62",
                 "hashcat": 1410,
                 "extended": true,
                 "name": "sha256($pass.$salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_61",
                 "hashcat": 1420,
                 "extended": true,
                 "name": "sha256($salt.$pass)"
@@ -1182,6 +1458,54 @@
                 "hashcat": 1460,
                 "extended": true,
                 "name": "HMAC-SHA256 (key = $salt)"
+            },
+            {
+                "john": "dynamic_63",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256(sha256($pass))"
+            },
+            {
+                "john": "dynamic_64",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256(sha256_raw($pass))"
+            },
+            {
+                "john": "dynamic_65",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256(sha256($pass).$salt)"
+            },
+            {
+                "john": "dynamic_66",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256($salt.sha256($pass))"
+            },
+            {
+                "john": "dynamic_67",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256(sha256($salt).sha256($pass))"
+            },
+            {
+                "john": "dynamic_68",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha256(sha256($pass).sha256($pass))"
+            },
+            {
+                "john": "dynamic_320",
+                "hashcat": null,
+                "extended": false,
+                "name": "PANAMA"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-256"
             }
         ]
     },
@@ -1250,7 +1574,7 @@
         "regex": "^[a-f0-9]{80}$",
         "modes": [
             {
-                "john": null,
+                "john": "dynamic_150",
                 "hashcat": null,
                 "extended": false,
                 "name": "RIPEMD-320"
@@ -1289,13 +1613,13 @@
                 "name": "SHA-384"
             },
             {
-                "john": null,
+                "john": "dynamic_390",
                 "hashcat": 17500,
                 "extended": false,
                 "name": "SHA3-384"
             },
             {
-                "john": null,
+                "john": "dynamic_440",
                 "hashcat": 17900,
                 "extended": false,
                 "name": "Keccak-384"
@@ -1311,15 +1635,75 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "Skein-1024(384)"
-            }
-        ]
-    },
-    {
-        "regex": "^{SSHA512}[a-z0-9\\/+]{96}$",
-        "modes": [
+            },
             {
-                "john": "ssha512",
-                "hashcat": 1711,
+                "john": "dynamic_71",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384($salt.$pass)"
+            },
+            {
+                "john": "dynamic_72",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384($pass.$salt)"
+            },
+            {
+                "john": "dynamic_73",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384(sha384($pass))"
+            },
+            {
+                "john": "dynamic_74",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384(sha384_raw($pass))"
+            },
+            {
+                "john": "dynamic_75",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384(sha384($pass).$salt)"
+            },
+            {
+                "john": "dynamic_76",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384($salt.sha384($pass))"
+            },
+            {
+                "john": "dynamic_77",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384(sha384($salt).sha384($pass))"
+            },
+            {
+                "john": "dynamic_78",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha384(sha384($pass).sha384($pass))"
+            },
+            {
+                "john": "dynamic_350",
+                "hashcat": null,
+                "extended": true,
+                "name": "Skein-384"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-384"
+            }
+        ]
+    },
+    {
+        "regex": "^{SSHA512}[a-z0-9\\/+]{96}$",
+        "modes": [
+            {
+                "john": "ssha512",
+                "hashcat": 1711,
                 "extended": false,
                 "name": "SSHA-512(Base64)"
             },
@@ -1375,6 +1759,12 @@
                 "extended": false,
                 "name": "SHA3-512"
             },
+            {
+                "john": "dynamic_400",
+                "hashcat": 17600,
+                "extended": false,
+                "name": "SHA3-512"
+            },
             {
                 "john": "raw-keccak",
                 "hashcat": 18000,
@@ -1383,9 +1773,9 @@
             },
             {
                 "john": "raw-blake2",
-                "hashcat": 600,
+                "hashcat": null,
                 "extended": false,
-                "name": "Blake2"
+                "name": "BLAKE2-512"
             },
             {
                 "john": "skein-512",
@@ -1400,13 +1790,13 @@
                 "name": "Skein-1024(512)"
             },
             {
-                "john": null,
+                "john": "dynamic_82",
                 "hashcat": 1710,
                 "extended": true,
                 "name": "sha512($pass.$salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_81",
                 "hashcat": 1720,
                 "extended": true,
                 "name": "sha512($salt.$pass)"
@@ -1434,9 +1824,51 @@
                 "hashcat": 1760,
                 "extended": true,
                 "name": "HMAC-SHA512 (key = $salt)"
+            },
+            {
+                "john": "dynamic_83",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha512(sha512($pass))"
+            },
+            {
+                "john": "dynamic_85",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha512(sha512($pass).$salt)"
+            },
+            {
+                "john": "dynamic_86",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha512($salt.sha512($pass))"
+            },
+            {
+                "john": "dynamic_87",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha512(sha512($salt).sha512($pass))"
+            },
+            {
+                "john": "dynamic_88",
+                "hashcat": null,
+                "extended": true,
+                "name": "sha512(sha512($pass).sha512($pass))"
             }
         ]
     },
+    {
+        "regex": "^\\$BLAKE2\\$[a-f0-9]{128}$",
+        "modes": [
+            {
+                "john": "raw-blake2",
+                "hashcat": 600,
+                "extended": false,
+                "name": "BLAKE2-512"
+            }
+        ]
+    },
+
     {
         "regex": "^[a-f0-9]{136}$",
         "modes": [
@@ -1665,7 +2097,95 @@
                 "john": "krb5pa-md5",
                 "hashcat": 7500,
                 "extended": false,
-                "name": "Kerberos 5 AS-REQ Pre-Auth"
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$23\\$\\*[^*]*\\*\\$[a-f0-9]{32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5tgs",
+                "hashcat": 13100,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$23\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": 18200,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$18\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 18"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$17\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 17"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$17\\$[^$]{1,512}\\$[^$]{1,512}\\$[^$]{1,4}?\\$?[a-f0-9]{1,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 19600,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$18\\$[^$]{1,512}\\$[^$]{1,512}\\$[^$]{1,4}?\\$?[a-f0-9]{1,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 19700,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5pa\\$17\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "modes": [
+            {
+                "john": "krb5pa-sha1",
+                "hashcat": 19800,
+                "extended": false,
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 17"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5pa\\$18\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "modes": [
+            {
+                "john": "krb5pa-sha1",
+                "hashcat": 19900,
+                "extended": false,
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 18"
             }
         ]
     },
@@ -1787,6 +2307,12 @@
                 "hashcat": 2410,
                 "extended": false,
                 "name": "Cisco-ASA(MD5)"
+            },
+            {
+                "john": "dynamic_20",
+                "hashcat": 2410,
+                "extended": true,
+                "name": "md5($pass.$salt)"
             }
         ]
     },
@@ -2146,7 +2672,7 @@
         "regex": "^\\$office\\$\\*2010\\*[0-9]{6}\\*[0-9]{3}\\*[0-9]{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{64}$",
         "modes": [
             {
-                "john": null,
+                "john": "office",
                 "hashcat": 9500,
                 "extended": false,
                 "name": "Microsoft Office 2010"
@@ -2157,10 +2683,21 @@
         "regex": "^\\$office\\$\\*2013\\*[0-9]{6}\\*[0-9]{3}\\*[0-9]{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{64}$",
         "modes": [
             {
-                "john": null,
+                "john": "office",
                 "hashcat": 9600,
                 "extended": false,
-                "name": "Microsoft Office 2013"
+                "name": "Microsoft Office 2013 - 2019"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$office\\$2016\\$[0-9]\\$[0-9]{6}\\$[^$]{24}\\$[^$]{88}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 25300,
+                "extended": false,
+                "name": "Microsoft Office 2016 - SheetProtection"
             }
         ]
     },
@@ -2202,19 +2739,19 @@
         "regex": "^\\$oldoffice\\$[34]\\*[a-f0-9]{32}\\*[a-f0-9]{32}\\*[a-f0-9]{40}$",
         "modes": [
             {
-                "john": null,
+                "john": "oldoffice",
                 "hashcat": 9800,
                 "extended": false,
                 "name": "Microsoft Office \u2264 2003 (SHA1+RC4)"
             },
             {
-                "john": null,
+                "john": "oldoffice",
                 "hashcat": 9810,
                 "extended": false,
                 "name": "Microsoft Office \u2264 2003 (SHA1+RC4) collider-mode #1"
             },
             {
-                "john": null,
+                "john": "oldoffice",
                 "hashcat": 9820,
                 "extended": false,
                 "name": "Microsoft Office \u2264 2003 (SHA1+RC4) collider-mode #2"
@@ -2376,7 +2913,35 @@
         ]
     },
     {
-        "regex": "^\\$pdf\\$[24]\\*[34]\\*128\\*[0-9\\-]{1,5}\\*1\\*(16|32)\\*[a-f0-9]{32,64}\\*32\\*[a-f0-9]{64}\\*(8|16|32)\\*[a-f0-9]{16,64}$",
+        "regex": "^\\$pdf\\$1\\*2\\*[0-9]{2}\\*[-0-9]{1,6}\\*[0-9]\\*[0-9]{2}\\*[a-f0-9]{32}\\*[0-9]{2}\\*[a-f0-9]{64}\\*[0-9]{2}\\*[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "pdf",
+                "hashcat": 10400,
+                "extended": false,
+                "name": "PDF 1.1 - 1.3 (Acrobat 2 - 4)"
+            },
+            {
+                "john": "pdf",
+                "hashcat": 10410,
+                "extended": false,
+                "name": "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$pdf\\$1\\*2\\*[0-9]{2}\\*[-0-9]{1,6}\\*[0-9]\\*[0-9]{2}\\*[a-f0-9]{32}\\*[0-9]{2}\\*[a-f0-9]{64}\\*[0-9]{2}\\*[a-f0-9]{64}:[a-f0-9]{10}$",
+        "modes": [
+            {
+                "john": "pdf",
+                "hashcat": 10420,
+                "extended": false,
+                "name": "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$pdf\\$[24]\\*[34]\\*128\\*[0-9\\-]{1,6}\\*1\\*(16|32)\\*[a-f0-9]{32,64}\\*32\\*[a-f0-9]{64}\\*(8|16|32)\\*[a-f0-9]{16,64}$",
         "modes": [
             {
                 "john": "pdf",
@@ -2385,5 +2950,193 @@
                 "name": "PDF 1.4 - 1.6 (Acrobat 5 - 8)"
             }
         ]
+    },
+    {
+        "regex": "^\\$pdf\\$5\\*[5|6]\\*[0-9]{3}\\*[-0-9]{1,6}\\*[0-9]\\*[0-9]{1,4}\\*[a-f0-9]{0,1024}\\*[0-9]{1,4}\\*[a-f0-9]{0,1024}\\*[0-9]{1,4}\\*[a-f0-9]{0,1024}\\*[0-9]{1,4}\\*[a-f0-9]{0,1024}\\*[0-9]{1,4}\\*[a-f0-9]{0,1024}$",
+        "modes": [
+            {
+                "john": "pdf",
+                "hashcat": 10600,
+                "extended": false,
+                "name": "PDF 1.7 Level 3 (Acrobat 9)"
+            },
+            {
+                "john": "pdf",
+                "hashcat": 10700,
+                "extended": false,
+                "name": "PDF 1.7 Level 8 (Acrobat 10 - 11)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$bitcoin\\$[0-9]{2,4}\\$[a-fA-F0-9$]{250,350}$",
+        "modes": [
+            {
+                "john": "bitcoin",
+                "hashcat": 11300,
+                "extended": false,
+                "name": "Bitcoin/Litecoin Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ethereum\\$[a-z0-9*]{150,1400}$",
+        "modes": [
+            {
+                "john": "ethereum-presale-opencl",
+                "hashcat": 16300,
+                "extended": false,
+                "name": "Ethereum Presale Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ethereum\\$[a-z0-9*]{150,250}$",
+        "modes": [
+            {
+                "john": "Ethereum Wallet",
+                "hashcat": 15600,
+                "extended": false,
+                "name": "ethereum-opencl"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$monero\\$(0)\\*[a-f0-9]{32,4096}$",
+        "modes": [
+            {
+                "john": "monero",
+                "hashcat": null,
+                "extended": false,
+                "name": "monero Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ab\\$[0-9]{1}\\*[0-9]{1}\\*[0-9]{1,6}\\*[a-f0-9]{128}\\*[a-f0-9]{128}\\*[a-f0-9]{32}\\*[a-f0-9]{192}$",
+        "modes": [
+            {
+                "john": "AndroidBackup",
+                "hashcat": 18900,
+                "extended": false,
+                "name": "Android Backup"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$zip2\\$\\*[0-9]{1}\\*[0-9]{1}\\*[0-9]{1}\\*[a-f0-9]{16,32}\\*[a-f0-9]{1,6}\\*[a-f0-9]{1,6}\\*[a-f0-9]{0,16384}\\*[a-f0-9]{20}\\*\\$\/zip2\\$$",
+        "modes": [
+            {
+                "john": "ZIP",
+                "hashcat": 13600,
+                "extended": false,
+                "name": "WinZip"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$itunes_backup\\$\\*[0-9]{1,2}\\*[a-f0-9]{80}\\*[0-9]{1,6}\\*[a-f0-9]{40}\\*[0-9]{0,10}\\*[a-f0-9]{0,40}$",
+        "modes": [
+            {
+                "john": "itunes-backup",
+                "hashcat": 14700,
+                "extended": false,
+                "name": "iTunes backup < 10.0"
+            },
+            {
+                "john": "itunes-backup",
+                "hashcat": 14800,
+                "extended": false,
+                "name": "iTunes backup >= 10.0"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$telegram\\$0\\*[a-f0-9]{64}\\*[0-9]{32}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 22301,
+                "extended": false,
+                "name": "Telegram Mobile App Passcode (SHA256)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$telegram\\$1\\*4000\\*[a-f0-9]{64}\\*[a-f0-9]{576}$",
+        "modes": [
+            {
+                "john": "telegram",
+                "hashcat": null,
+                "extended": false,
+                "name": "Telegram Desktop 1.3.9"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$telegram\\$2\\*100000\\*[a-f0-9]{64}\\*[a-f0-9]{576}$",
+        "modes": [
+            {
+                "john": "telegram",
+                "hashcat": null,
+                "extended": false,
+                "name": "Telegram Desktop \u2265 2.1.14-beta / 2.2.0"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$7z\\$[0-9]{1,3}\\$[0-9]{1,2}\\$[0-9]{1}\\$[^$]{0,64}\\$[0-9]{1,2}\\$[a-f0-9]{32}\\$[0-9]{1,10}\\$[0-9]{1,6}\\$[0-9]{1,6}\\$[a-f0-9]{2,}$",
+        "modes": [
+            {
+                "john": "7z",
+                "hashcat": 11600,
+                "extended": false,
+                "name": "7-zip"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$zip3\\$\\*[0-9]\\*[0-9]\\*128\\*[0-9]\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*[0-9]\\*[0-9]\\*[0-9]\\*[^\\s]{0,64}$",
+        "modes": [
+            {
+                "john": "securezip",
+                "hashcat": 23001,
+                "extended": false,
+                "name": "SecureZIP AES-128"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$zip3\\$\\*[0-9]\\*[0-9]\\*192\\*[0-9]\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*[0-9]\\*[0-9]\\*[0-9]\\*[^\\s]{0,64}$",
+        "modes": [
+            {
+                "john": "securezip",
+                "hashcat": 23002,
+                "extended": false,
+                "name": "SecureZIP AES-192"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$zip3\\$\\*[0-9]\\*[0-9]\\*256\\*[0-9]\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*[0-9]\\*[0-9]\\*[0-9]\\*[^\\s]{0,64}$",
+        "modes": [
+            {
+                "john": "securezip",
+                "hashcat": 23003,
+                "extended": false,
+                "name": "SecureZIP AES-256"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$pkzip2?\\$[a-f0-9\\*]+\\$\/pkzip2?\\$$",
+        "modes": [
+            {
+                "john": "pkzip",
+                "hashcat": null,
+                "extended": false,
+                "name": "PKZIP"
+            }
+        ]
     }
 ]