haiti-hash 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a76bf35790ea28f13c07002017de77173607742efb4e07ac36b6593c2523ef
-  data.tar.gz: e24e527024e10fb6d963a3d4c219350f5e0e6672d2d0402b9116969600257685
+  metadata.gz: d8e36caeb4bd5e738611980ef03e8135725ee39b681d7991baf414fe09a13f8f
+  data.tar.gz: a9ffb272677e954d7c6be45284c12b26f021c4de451399f9e4e9c23318c8f3af
 SHA512:
-  metadata.gz: a32fbcb484a2ebed6158255ad0d23741918ef6f3c5572165da3ec5c04b20d931b204cf74c5029b42cc2a9bd3e350b5b028e75242b8569646b8e35373cf3fc78f
-  data.tar.gz: 2d7620a42d9144b80a19d046e6da09690ac5d23cd527c5bfb0fdc1cb101681c4abb2b6a6f810db4c649f4e2b4030b28e4ff5f85388938d8e90401b7b6797e6af
+  metadata.gz: 849696e7815d26b26ad605e4f4175d536c8a00543f1d76f2bd7aa8fc88ec1d2deea5304275b5ef5ab025fa74288e6692946b0564df1040c48726ab3b9a6dfca8
+  data.tar.gz: 4d1cfe5d51af9fb4d40f9860acfbcd9cca3e79e986d91804b7d9f83ccca82409235b3ab8c401562d7bc7d0070563742e2246aa3851e34e94e98854d5e61a8485

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

@@ -99,13 +99,18 @@
         ]
     },
     {
-        "regex": "^(\\$crc32\\$[a-f0-9]{8}.)?[a-f0-9]{8}$",
+        "regex": "^(\\$crc32\\$)?([a-f0-9]{8}.)?[a-f0-9]{8}$",
         "modes": [
             {
                 "john": "crc32",
-                "hashcat": null,
+                "hashcat": 11500,
                 "extended": false,
-                "name": "CRC-32"
+                "name": "CRC-32",
+                "samples": [
+                    "c762de4a:00000000",
+                    "$crc32$00000000.fa455f6b",
+                    "$crc32$4ff4f23f.ce6eb863"
+                ]
             }
         ]
     },
@@ -152,12 +157,6 @@
                 "extended": false,
                 "name": "MySQL323"
             },
-            {
-                "john": null,
-                "hashcat": 3100,
-                "extended": false,
-                "name": "DES(Oracle)"
-            },
             {
                 "john": null,
                 "hashcat": 5100,
@@ -166,21 +165,38 @@
             },
             {
                 "john": null,
-                "hashcat": 3100,
+                "hashcat": null,
                 "extended": false,
-                "name": "Oracle 7-10g"
+                "name": "FNV-164"
             },
             {
                 "john": null,
                 "hashcat": null,
                 "extended": false,
-                "name": "FNV-164"
+                "name": "CRC-64"
+            }
+        ]
+    },
+    {
+        "regex": "^[a-f0-9]{16}:[a-f0-9]{0,30}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 3100,
+                "extended": false,
+                "name": "DES(Oracle)",
+                "samples": [
+                    "792FCB0AE31D8489:7284616727"
+                ]
             },
             {
                 "john": null,
-                "hashcat": null,
+                "hashcat": 3100,
                 "extended": false,
-                "name": "CRC-64"
+                "name": "Oracle 7-10g",
+                "samples": [
+                    "792FCB0AE31D8489:7284616727"
+                ]
             }
         ]
     },
@@ -192,6 +208,12 @@
                 "hashcat": 2400,
                 "extended": false,
                 "name": "Cisco-PIX(MD5)"
+            },
+            {
+                "john": "dynamic_19",
+                "hashcat": 2400,
+                "extended": true,
+                "name": "md5($pass)"
             }
         ]
     },
@@ -211,9 +233,14 @@
         "modes": [
             {
                 "john": "bsdicrypt",
-                "hashcat": null,
+                "hashcat": 12400,
                 "extended": false,
-                "name": "BSDi Crypt"
+                "name": "BSDi Crypt",
+                "samples": [
+                    "_GW..8841inaTltazRsQ",
+                    "_J9..XXXXsqM/YSSP..Y",
+                    "_J9..SDSD5YGyRCr4W4c"
+                ]
             }
         ]
     },
@@ -224,7 +251,25 @@
                 "john": null,
                 "hashcat": null,
                 "extended": false,
-                "name": "CRC-96(ZIP)"
+                "name": "CRC-96 (ZIP)"
+            },
+            {
+                "john": null,
+                "hashcat": 20500,
+                "extended": false,
+                "name": "PKZIP Master Key",
+                "samples": [
+                    "f1eff5c0368d10311dcfc419"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 20510,
+                "extended": false,
+                "name": "PKZIP Master Key (6 byte optimization)",
+                "samples": [
+                    "f1eff5c0368d10311dcfc419"
+                ]
             }
         ]
     },
@@ -257,7 +302,11 @@
                 "john": "raw-md5",
                 "hashcat": 0,
                 "extended": false,
-                "name": "MD5"
+                "name": "MD5",
+                "samples": [
+                    "8743b52063cd84097a65d1633f5c74f5",
+                    "098F6BCD4621D373CADE4E832627B4F6"
+                ]
             },
             {
                 "john": "raw-md4",
@@ -278,16 +327,22 @@
                 "name": "LM"
             },
             {
-                "john": "ripemd-128",
+                "john": "haval-128-4",
                 "hashcat": null,
                 "extended": false,
-                "name": "RIPEMD-128"
+                "name": "Haval-128 (4 rounds)"
             },
             {
-                "john": "haval-128-4",
+                "john": "dynamic_160",
+                "hashcat": null,
+                "extended": false,
+                "name": "Haval-128 (3 rounds)"
+            },
+            {
+                "john": "dynamic_180",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-128"
+                "name": "Haval-128 (5 rounds)"
             },
             {
                 "john": null,
@@ -326,37 +381,40 @@
                 "name": "ZipMonster"
             },
             {
-                "john": null,
-                "hashcat": 11000,
+                "john": "dynamic_3",
+                "hashcat": 3500,
                 "extended": true,
-                "name": "PrestaShop"
+                "name": "md5(md5(md5($pass)))",
+                "samples": [
+                    "9882d0778518b095917eb589f6998441"
+                ]
             },
             {
-                "john": null,
-                "hashcat": 3500,
+                "john": "dynamic_2",
+                "hashcat": null,
                 "extended": true,
-                "name": "md5(md5(md5($pass)))"
+                "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 +444,16 @@
                 "name": "HMAC-MD5 (key = $salt)"
             },
             {
-                "john": null,
+                "john": "dynamic_8",
                 "hashcat": 3610,
                 "extended": true,
-                "name": "md5(md5($salt).$pass)"
+                "name": "md5(md5($salt).$pass)",
+                "samples": [
+                    "7b57255a15958ef898543ea6cc3313bc:1234"
+                ]
             },
             {
-                "john": null,
+                "john": "dynamic_9",
                 "hashcat": 3710,
                 "extended": true,
                 "name": "md5($salt.md5($pass))"
@@ -401,28 +462,49 @@
                 "john": null,
                 "hashcat": 3720,
                 "extended": true,
-                "name": "md5($pass.md5($salt))"
+                "name": "md5($pass.md5($salt))",
+                "samples": [
+                    "10ce488714fdbde9453670e0e4cbe99c:1234"
+                ]
             },
             {
-                "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))"
@@ -431,7 +513,109 @@
                 "john": null,
                 "hashcat": 4210,
                 "extended": true,
-                "name": "md5($username.0.$pass)"
+                "name": "md5($username.0.$pass)",
+                "samples": [
+                    "09ea048c345ad336ebe38ae5b6c4de24:1234"
+                ]
+            },
+            {
+                "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": "md5($salt.pad16($pass))"
+            }
+        ]
+    },
+    {
+        "regex": "^[a-f0-9]{32}:.{56}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 11000,
+                "extended": false,
+                "name": "PrestaShop",
+                "samples": [
+                    "f22cade043e7214200206dbffca49fd9:27167508161455764247627144160038845437138252877014827848",
+                    "810e3d12f0f10777a679d9ca1ad7a8d9:M2uZ122bSHJ4Mi54tXGY0lqcv1r28mUluSkyw37ou5oia4i239ujqw0l"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^(\\$netmd5\\$)?([a-f0-9]{88,96}\\$)?[a-f0-9]{32}$",
+        "modes": [
+            {
+                "john": "net-md5",
+                "hashcat": null,
+                "extended": false,
+                "name": "Keyed MD5: RIPv2, OSPF, BGP, SNMPv2",
+                "samples": [
+                    "02020000ffff0003002c01145267d48d000000000000000000020000ac100100ffffff000000000000000001ffff0001$1e372a8a233c6556253a0909bc3dcce6",
+                    "$netmd5$0201002cac1001010000000000000002000001105267ff8fffffff00000a0201000000280000000000000000$445ecbb27272bd791a757a6c85856150"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^(\\$ripemd\\$)?[a-f0-9]{32}(:.+)?$",
+        "modes": [
+            {
+                "john": "ripemd-128",
+                "hashcat": null,
+                "extended": false,
+                "name": "RIPEMD-128",
+                "samples": [
+                    "cdf26213a150dc3ecb610f18f6b38b46",
+                    "$ripemd$cdf26213a150dc3ecb610f18f6b38b46"
+                ]
             }
         ]
     },
@@ -611,7 +795,7 @@
             {
                 "john": null,
                 "hashcat": 1600,
-                "extended": true,
+                "extended": false,
                 "name": "md5apr1"
             }
         ]
@@ -628,13 +812,16 @@
         ]
     },
     {
-        "regex": "^[a-f0-9]{32}:[a-f0-9]{32}$",
+        "regex": "^[a-f0-9]{32}:.+$",
         "modes": [
             {
                 "john": null,
                 "hashcat": 3721,
                 "extended": false,
-                "name": "WebEdition CMS"
+                "name": "WebEdition CMS",
+                "samples": [
+                    "fa01af9f0de5f377ae8befb03865178e:5678"
+                ]
             }
         ]
     },
@@ -687,16 +874,22 @@
                 "name": "Double SHA-1"
             },
             {
-                "john": "ripemd-160",
-                "hashcat": 6000,
+                "john": "dynamic_190",
+                "hashcat": null,
                 "extended": false,
-                "name": "RIPEMD-160"
+                "name": "Haval-160 (3 rounds)"
             },
             {
-                "john": null,
+                "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,
@@ -714,7 +907,10 @@
                 "john": "raw-sha1-linkedin",
                 "hashcat": 190,
                 "extended": false,
-                "name": "LinkedIn"
+                "name": "LinkedIn",
+                "samples": [
+                    "b89eaac7e61417341b710b727768294d0e6a277b"
+                ]
             },
             {
                 "john": null,
@@ -729,31 +925,52 @@
                 "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,
                 "extended": true,
-                "name": "sha1(sha1(sha1($pass)))"
+                "name": "sha1(sha1(sha1($pass)))",
+                "samples": [
+                    "dc57f246485e62d99a5110afc9264b4ccbfcf3cc"
+                ]
             },
             {
-                "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,23 +1004,84 @@
                 "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))"
+            }
+        ]
+    },
+    {
+        "regex": "^(\\$ripemd\\$)?[a-f0-9]{40}(:.+)?$",
+        "modes": [
+            {
+                "john": "ripemd-160",
+                "hashcat": 6000,
+                "extended": false,
+                "name": "RIPEMD-160",
+                "samples": [
+                    "9c1185a5c5e9fc54612808977ee8f548b2258d31",
+                    "$ripemd$9c1185a5c5e9fc54612808977ee8f548b2258d31",
+                    "012cb9b334ec1aeb71a9c8ce85586082467f7eb6"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\*[a-f0-9]{40}$",
+        "regex": "^(\\*)?[a-f0-9]{40}$",
         "modes": [
             {
                 "john": "mysql-sha1",
                 "hashcat": 300,
                 "extended": false,
-                "name": "MySQL5.x"
+                "name": "MySQL5.x",
+                "samples": [
+                    "*2c905879f74f28f8570989947d06a8429fb943e6",
+                    "*A8A397146B1A5F8C8CF26404668EFD762A1B7B82"
+                ]
             },
             {
                 "john": "mysql-sha1",
                 "hashcat": 300,
                 "extended": false,
-                "name": "MySQL4.1"
+                "name": "MySQL4.1",
+                "samples": [
+                    "*5AD8F88516BD021DD43F171E2C785C69F8E54ADB",
+                    "*be1bdec0aa74b4dcb079943e70528096cca985f8",
+                    "fcf7c1b8749cf99d88e5f34271d636178fb5d130"
+                ]
             }
         ]
     },
@@ -856,10 +1134,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",
@@ -950,7 +1240,10 @@
                 "john": "sunmd5",
                 "hashcat": 3300,
                 "extended": false,
-                "name": "Sun MD5 Crypt"
+                "name": "Sun MD5 Crypt",
+                "samples": [
+                    "$md5$rounds=904$iPPKEBnEkp3JV8uX$0L6m7rOFTVFn.SGqo2M9W1"
+                ]
             }
         ]
     },
@@ -959,24 +1252,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 +1345,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,19 +1459,35 @@
                 "name": "SHA-256"
             },
             {
-                "john": null,
+                "john": "dynamic_140",
                 "hashcat": null,
                 "extended": false,
-                "name": "RIPEMD-256"
+                "name": "RIPEMD-256",
+                "samples": [
+                    "1419109aa0de60e6ba0b6d2b2f602c13b07e97b5ffc85b6be2297badc699262f",
+                    "f156e6c20042057840f3251ee041596d89fde06c2505f61764ad1c03c2fc1375"
+                ]
             },
             {
                 "john": "haval-256-3",
                 "hashcat": null,
                 "extended": false,
-                "name": "Haval-256"
+                "name": "Haval-256 (3 rounds)"
             },
             {
-                "john": "gost",
+                "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",
                 "hashcat": 6900,
                 "extended": false,
                 "name": "GOST R 34.11-94"
@@ -1118,7 +1499,7 @@
                 "name": "GOST CryptoPro S-Box"
             },
             {
-                "john": null,
+                "john": "dynamic_380",
                 "hashcat": 17400,
                 "extended": false,
                 "name": "SHA3-256"
@@ -1148,13 +1529,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 +1563,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,10 +1679,14 @@
         "regex": "^[a-f0-9]{80}$",
         "modes": [
             {
-                "john": null,
+                "john": "dynamic_150",
                 "hashcat": null,
                 "extended": false,
-                "name": "RIPEMD-320"
+                "name": "RIPEMD-320",
+                "samples": [
+                    "303aa1dcb731cd4e4bff2a60971eb7376c6c47cb59947c804776d115470183c8cc2e487337b45412",
+                    "3c616c27aa7539c4726388c9e047aa4ea089dd739b3cfc470e964ea12e479da3cce437b9daa90214"
+                ]
             }
         ]
     },
@@ -1289,13 +1722,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,6 +1744,66 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "Skein-1024(384)"
+            },
+            {
+                "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"
             }
         ]
     },
@@ -1349,7 +1842,12 @@
                 "john": "raw-sha512",
                 "hashcat": 1700,
                 "extended": false,
-                "name": "SHA-512"
+                "name": "SHA-512",
+                "samples": [
+                    "f342aae82952db35b8e02c30115e3deed3d80fdfdadacab336f0ba51ac54e297291fa1d6b201d69a2bd77e2535280f17a54fa1e527abc6e2eddba79ad3be11c0",
+                    "7aba4411846c61b08b0f2282a8a4600232ace4dd96593c755ba9c9a4e7b780b8bdc437b5c55574b3e8409c7b511032f98ef120e25467678f0458643578eb60ff",
+                    "12b03226a6d8be9c6e8cd5e55dc6c7920caaa39df14aab92d5e3ea9340d1c8a4d3d0b8e4314f1f6ef131ba4bf1ceb9186ab87c801af0d5c95b1befb8cedae2b9"
+                ]
             },
             {
                 "john": "whirlpool",
@@ -1375,6 +1873,12 @@
                 "extended": false,
                 "name": "SHA3-512"
             },
+            {
+                "john": "dynamic_400",
+                "hashcat": 17600,
+                "extended": false,
+                "name": "SHA3-512"
+            },
             {
                 "john": "raw-keccak",
                 "hashcat": 18000,
@@ -1383,9 +1887,9 @@
             },
             {
                 "john": "raw-blake2",
-                "hashcat": 600,
+                "hashcat": null,
                 "extended": false,
-                "name": "Blake2"
+                "name": "BLAKE2-512"
             },
             {
                 "john": "skein-512",
@@ -1400,13 +1904,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 +1938,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": [
@@ -1452,16 +1998,24 @@
         "regex": "^0x0200[a-f0-9]{136}$",
         "modes": [
             {
-                "john": "msql12",
+                "john": "mssql12",
                 "hashcat": 1731,
                 "extended": false,
-                "name": "MSSQL(2012)"
+                "name": "MSSQL(2012)",
+                "samples": [
+                    "0x0200F733058A07892C5CACE899768F89965F6BD1DED7955FE89E1C9A10E27849B0B213B5CE92CC9347ECCB34C3EFADAF2FD99BFFECD8D9150DD6AACB5D409A9D2652A4E0AF16",
+                    "0x0200AB3E1F9028A739EEF62ABF672427276A32D5EDD349E638E7F2CD81DAA247CFE20EE4E3B0A30B2D0AE3C3FA010E61752F1BF45E045041F1B988C083C7F118527E3E5F0562"
+                ]
             },
             {
-                "john": "msql12",
+                "john": "mssql12",
                 "hashcat": 1731,
                 "extended": false,
-                "name": "MSSQL(2014)"
+                "name": "MSSQL(2014)",
+                "samples": [
+                    "0x02003788006711b2e74e7d8cb4be96b1d187c962c5591a02d5a6ae81b3a4a094b26b7877958b26733e45016d929a756ed30d0a5ee65d3ce1970f9b7bf946e705c595f07625b1",
+                    "0x02006BF4AB05873FF0C8A4AFD1DC5912CBFDEF62E0520A3353B04E1184F05C873C9C76BBADDEAAC1E9948C7B6ABFFD62BFEFD7139F17F6AFE10BE0FEE7A178644623067C2423"
+                ]
             }
         ]
     },
@@ -1575,9 +2129,12 @@
         "modes": [
             {
                 "john": null,
-                "hashcat": null,
+                "hashcat": 20711,
                 "extended": false,
-                "name": "Minecraft(AuthMe Reloaded)"
+                "name": "Minecraft (AuthMe Reloaded sha256)",
+                "samples": [
+                    "$SHA$7218532375810603$bfede293ecf6539211a7305ea218b9f3f608953130405cda9eaba6fb6250f824"
+                ]
             }
         ]
     },
@@ -1665,7 +2222,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"
             }
         ]
     },
@@ -1685,9 +2330,12 @@
         "modes": [
             {
                 "john": null,
-                "hashcat": 7600,
+                "hashcat": 4521,
                 "extended": false,
-                "name": "Redmine Project Management Web App"
+                "name": "Redmine",
+                "samples": [
+                    "c18e826af2a78c7b9b7261452613233417e65817:28246535720688452723483475753333"
+                ]
             }
         ]
     },
@@ -1731,7 +2379,10 @@
                 "john": null,
                 "hashcat": 123,
                 "extended": false,
-                "name": "EPi"
+                "name": "EPi",
+                "samples": [
+                    "0x326C6D7B4E4F794B79474E36704F35723958397163735263516265456E31 0xAFC55E260B8F45C0C6512BCE776C1AD8312B56E6"
+                ]
             }
         ]
     },
@@ -1787,6 +2438,12 @@
                 "hashcat": 2410,
                 "extended": false,
                 "name": "Cisco-ASA(MD5)"
+            },
+            {
+                "john": "dynamic_20",
+                "hashcat": 2410,
+                "extended": true,
+                "name": "md5($pass.$salt)"
             }
         ]
     },
@@ -1839,9 +2496,13 @@
         "modes": [
             {
                 "john": "sha1crypt",
-                "hashcat": null,
+                "hashcat": 15100,
                 "extended": false,
-                "name": "SHA-1 Crypt"
+                "name": "SHA-1 Crypt (Juniper/NetBSD)",
+                "samples": [
+                    "$sha1$20000$75552156$HhYMDdaEHiK3eMIzTldOFPnw.s2Q",
+                    "$sha1$64000$wnUR8T1U$azjCegpOIk0FjE61qzGWhdkpuMRL"
+                ]
             }
         ]
     },
@@ -1879,24 +2540,37 @@
         ]
     },
     {
-        "regex": "^\\$pbkdf2(-sha1)?\\$[0-9]+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{27}$",
+        "regex": "^\\$pbkdf2(-hmac)?(-sha1)?\\$([0-9]{1,6}\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]+|[0-9]{1,6}\\.[a-f0-9]+\\.[a-f0-9]{40})$",
         "modes": [
             {
-                "john": null,
-                "hashcat": null,
+                "john": "pbkdf2-hmac-sha1",
+                "hashcat": 20400,
                 "extended": false,
-                "name": "PBKDF2-SHA1(Generic)"
+                "name": "PBKDF2-SHA1 (Generic)",
+                "samples": [
+                    "$pbkdf2$131000$r5WythYixPgfQ2jt3buXcg$8Kdr.QQEOaZIXNOrrru36I/.6Po",
+                    "$pbkdf2-hmac-sha1$1000.fd11cde0.27de197171e6d49fc5f55c9ef06c0d8751cd7250",
+                    "$pbkdf2-hmac-sha1$1000$6926d45e$231c561018a4cee662df7cd4a8206701c5806af9",
+                    "$pbkdf2-hmac-sha1$1000.6834476f733353333654315a5a31494f.1932a843a69dc1e38a29d2691a7abf27ecaa6d55",
+                    "$pbkdf2-hmac-sha1$1000.3031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738.8f7c89f74233f78f6c8ace00696cf6ed09ae43f4"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$pbkdf2-sha256\\$[0-9]+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{43}$",
+        "regex": "^\\$pbkdf2-sha256\\$[0-9]{1,6}\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]+$",
         "modes": [
             {
                 "john": "pbkdf2-hmac-sha256",
-                "hashcat": null,
+                "hashcat": 20300,
                 "extended": false,
-                "name": "PBKDF2-SHA256(Generic)"
+                "name": "PBKDF2-SHA256 (Generic)",
+                "samples": [
+                    "$pbkdf2-sha256$29000$x9h7j/Ge8x6DMEao1VqrdQ$kra3R1wEnY8mPdDWOpTqOTINaAmZvRMcYd8u5OBQP9A",
+                    "$pbkdf2-sha256$1000$b1dWS2dab3dKQWhPSUg3cg$UY9j5wlyxtsJqhDKTqua8Q3fMp0ojc2pOnErzr8ntLE",
+                    "$pbkdf2-sha256$12000$fK8VAoDQuvees5ayVkpp7Q$xfzKAoBR/Iaa68tjn.O8KfGxV.zdidcqEeDoTFvDz2A",
+                    "$pbkdf2-sha256$12000$MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg$94Z71JhWYUP2E0IrQrexc8AMhHzVB4bwkxh7n0FCnns"
+                ]
             }
         ]
     },
@@ -2028,7 +2702,7 @@
                 "john": "django",
                 "hashcat": 10000,
                 "extended": false,
-                "name": "Django(PBKDF2-HMAC-SHA256)"
+                "name": "Django (PBKDF2-HMAC-SHA256)"
             }
         ]
     },
@@ -2146,7 +2820,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 +2831,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 +2887,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"
@@ -2349,7 +3034,10 @@
                 "john": null,
                 "hashcat": 10900,
                 "extended": false,
-                "name": "PBKDF2-HMAC-SHA256(PHP)"
+                "name": "PBKDF2-HMAC-SHA256 (PHP)",
+                "samples": [
+                    "sha256:1000:NjI3MDM3:vVfavLQL9ZWjg8BUMq6/FB8FtpkIGWYk"
+                ]
             }
         ]
     },
@@ -2376,7 +3064,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 +3101,243 @@
                 "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-f0-9$]{250,360}$",
+        "modes": [
+            {
+                "john": "bitcoin",
+                "hashcat": 11300,
+                "extended": false,
+                "name": "Bitcoin/Litecoin Wallet",
+                "samples": [
+                    "$bitcoin$96$c265931309b4a59307921cf054b4ec6b6e4554369be79802e94e16477645777d948ae1d375191831efc78e5acd1f0443$16$8017214013543185$200460$96$480008005625057442352316337722323437108374245623701184230273883222762730232857701607167815448714$66$014754433300175043011633205413774877455616682000536368706315333388",
+                    "$bitcoin$96$c265931309b4a59307921cf054b4ec6b6e4554369be79802e94e16477645777d948ae1d375191831efc78e5acd1f0443$16$8017214013543185$200460$96$480008005625057442352316337722323437108374245623701184230273883222762730232857701607167815448714$66$014754433300175043011633205413774877455616682000536368706315333388",
+                    "$bitcoin$96$a8d2a30b9a5419934cbb7cb0727ddc16c4bebdbf30d7e099ca35f2b1b7ba04cc42eb5b865bff8f65fc6ba9e15428d84f$16$872581181d72f577$128205$96$0a8d43558ed2b55f4a53491df66e6a71003db4588d11dc0a88b976122c2849a74c2bfaace36424cf029795db6fd2c78f$130$04ff53a6f68eab1c52e5b561b4616edb5bed4d7510cdb4931c8da68732a86d86f3a3f7de266f17c8d03e02ebe8e2c86e2f5de0007217fd4aaf5742ca7373113060"
+                ]
+            }
+        ]
+    },
+    {
+        "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"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$argon2d\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "modes": [
+            {
+                "john": "argon2",
+                "hashcat": null,
+                "extended": false,
+                "name": "argon2d",
+                "samples": [
+                    "$argon2d$v=19$m=4096,t=3,p=1$ZGFtYWdlX2RvbmU$w9w3s5/zV8+PcAZlJhnTCOE+vBkZssmZf6jOq3dKv50",
+                    "$argon2d$v=19$m=4096,t=3,p=1$c2hvcnRfc2FsdA$zMrTcOAOUje6UqObRVh84Pe1K6gumcDqqGzRM0ILzYmj",
+                    "$argon2d$v=19$m=16384,t=3,p=1$c2hvcnRfc2FsdA$TLSTPihIo+5F67Y1vJdfWdB9",
+                    "$argon2d$v=19$m=16384,t=4,p=3$YW5vdGhlcl9zYWx0$yw93eMxC8REPAwbQ0e/q43jR9+RI9HI/DHP75uzm7tQfjU734oaI3dzcMWjYjHzVQD+J4+MG+7oyD8dN/PtnmPCZs+UZ67E+rkXJ/wTvY4WgXgAdGtJRrAGxhy4rD7d5G+dCpqhrog"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$argon2i\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "modes": [
+            {
+                "john": "argon2",
+                "hashcat": null,
+                "extended": false,
+                "name": "argon2i",
+                "samples": [
+                    "$argon2i$v=19$m=4096,t=3,p=1$ZGFtYWdlX2RvbmU$N59QwnpxDQZRj1/cO6bqm408dD6Z2Z9LKYpwFJSPVKA",
+                    "$argon2i$v=19$m=4096,t=3,p=1$c2hvcnRfc2FsdA$1l4kAwUdAApoCbFH7ghBEf7bsdrOQzE4axIJ3PV0Ncrd",
+                    "$argon2i$v=19$m=16384,t=3,p=1$c2hvcnRfc2FsdA$vvjDVog22A5x9eljmB+2yC8y",
+                    "$argon2i$v=19$m=16384,t=4,p=3$YW5vdGhlcl9zYWx0$K7unxwO5aeuZCpnIJ06FMCRKod3eRg8oIRzQrK3E6mGbyqlTvvl47jeDWq/5drF1COJkEF9Ty7FWXJZHa+vqlf2YZGp/4qSlAvKmdtJ/6JZU32iQItzMRwcfujHE+PBjbL5uz4966A"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$argon2id\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "argon2id"
+            }
+        ]
     }
 ]