haiti-hash 1.2.3 → 1.4.0

data/data/prototypes.json

@@ -339,7 +339,7 @@
         ]
     },
     {
-        "regex": "^[a-f0-9]{32}(:.+)?$",
+        "regex": "^[a-f0-9]{32}(?::.+)?$",
         "modes": [
             {
                 "john": "raw-md5",
@@ -360,7 +360,7 @@
             {
                 "john": null,
                 "hashcat": 2600,
-                "extended": false,
+                "extended": true,
                 "name": "Double MD5"
             },
             {
@@ -378,31 +378,31 @@
             {
                 "john": "dynamic_160",
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Haval-128 (3 rounds)"
             },
             {
                 "john": "dynamic_180",
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Haval-128 (5 rounds)"
             },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Tiger-128"
             },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-256(128)"
             },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-512(128)"
             },
             {
@@ -615,14 +615,46 @@
                 "extended": true,
                 "name": "md5($salt.pad16($pass))"
             },
+            {
+                "john": null,
+                "hashcat": 4410,
+                "extended": true,
+                "name": "md5(sha1($pass).$salt)",
+                "samples": [
+                    "bc8319c0220bff8a0d7f5d703114a725:34659348756345251"
+                ]
+            },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "MD6-128",
                 "samples": [
                     "8cd9a30bfde990878c06be4a6111f726"
                 ]
+            },
+            {
+                "john": null,
+                "hashcat": 2810,
+                "extended": false,
+                "name": "IPB 2.x (Invision Power Board)",
+                "samples": [
+                    "022f7e02b3314f7d0968f73c00ba759f:67588"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^[a-f0-9]{32}(?::.{1,32})?$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 12,
+                "extended": true,
+                "name": "PostgreSQL",
+                "samples": [
+                    "93a8cf6a7d43e3b5bcd2dc6abb3e02c6:27032153220030464358344758762807"
+                ]
             }
         ]
     },
@@ -930,40 +962,7 @@
         ]
     },
     {
-        "regex": "^[a-f0-9]{32}:.{5}$",
-        "modes": [
-            {
-                "john": null,
-                "hashcat": 2811,
-                "extended": false,
-                "name": "IP.Board \u2265 v2+"
-            }
-        ]
-    },
-    {
-        "regex": "^[a-f0-9]{32}:.{8}$",
-        "modes": [
-            {
-                "john": null,
-                "hashcat": 2811,
-                "extended": false,
-                "name": "MyBB \u2265 v1.2+"
-            }
-        ]
-    },
-    {
-        "regex": "^[a-z0-9]{34}$",
-        "modes": [
-            {
-                "john": null,
-                "hashcat": null,
-                "extended": false,
-                "name": "CryptoCurrency(Adress)"
-            }
-        ]
-    },
-    {
-        "regex": "^[a-f0-9]{40}(:.+)?$",
+        "regex": "^[a-f0-9]{40}(:[^:]+)?$",
         "modes": [
             {
                 "john": "raw-sha1",
@@ -998,7 +997,7 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Tiger-160"
             },
             {
@@ -1166,7 +1165,7 @@
         ]
     },
     {
-        "regex": "^(\\$ripemd\\$)?[a-f0-9]{40}(:.+)?$",
+        "regex": "^(\\$ripemd\\$)?[a-f0-9]{40}(:[^:]+)?$",
         "modes": [
             {
                 "john": "ripemd-160",
@@ -1181,6 +1180,20 @@
             }
         ]
     },
+    {
+        "regex": "^[a-f0-9]{40}:[a-f0-9]+:[a-f0-9]+$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 29000,
+                "extended": true,
+                "name": "sha1($salt.sha1(utf16le($username).':'.utf16le($pass)))",
+                "samples": [
+                    "339b5eaa53f28516008e9ca710857d3a4785b6fc:8ca064ff42fcab5a8f0692544b8dd3d3054bd73fe9afaa08c6b6b310538cc9a7:757365726e616d65"
+                ]
+            }
+        ]
+    },
     {
         "regex": "^(\\*)?[a-f0-9]{40}$",
         "modes": [
@@ -1328,7 +1341,7 @@
         ]
     },
     {
-        "regex": "^{ssha1}[0-9]{2}\\$[a-z0-9$\\/.]{44}$",
+        "regex": "^{ssha1}\\d{2}\\$[a-z0-9$\\/.]{44}$",
         "modes": [
             {
                 "john": "aix-ssha1",
@@ -1356,7 +1369,7 @@
         ]
     },
     {
-        "regex": "^(\\$md5,rounds=[0-9]+\\$|\\$md5\\$rounds=[0-9]+\\$|\\$md5\\$)[a-z0-9\\/.]{0,16}(\\$|\\$\\$)[a-z0-9\\/.]{22}$",
+        "regex": "^(\\$md5,rounds=\\d+\\$|\\$md5\\$rounds=\\d+\\$|\\$md5\\$)[a-z0-9\\/.]{0,16}(\\$|\\$\\$)[a-z0-9\\/.]{22}$",
         "modes": [
             {
                 "john": "sunmd5",
@@ -1459,19 +1472,19 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-256(224)"
             },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-512(224)"
             },
             {
                 "john": "dynamic_330",
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-224"
             },
             {
@@ -1483,7 +1496,7 @@
         ]
     },
     {
-        "regex": "^(\\$2[axy]|\\$2)\\$[0-9]{2}\\$[a-z0-9\\/.]{53}$",
+        "regex": "^(\\$2[abxy]|\\$2)\\$\\d{2}\\$[a-z0-9\\/.]{53}$",
         "modes": [
             {
                 "john": "bcrypt",
@@ -1520,6 +1533,15 @@
                 "samples": [
                     "$2a$05$Uo385Fa0g86uUXHwZxB90.qMMdRFExaXePGka4WGFv.86I45AEjmO"
                 ]
+            },
+            {
+                "john": null,
+                "hashcat": 28400,
+                "extended": true,
+                "name": "bcrypt(sha512($pass)) / bcryptsha512",
+                "samples": [
+                    "$2a$12$KhivLhCuLhSyMBOxLxCyLu78x4z2X/EJdZNfS3Gy36fvRt56P2jbS"
+                ]
             }
         ]
     },
@@ -1546,7 +1568,7 @@
         ]
     },
     {
-        "regex": "^\\$bcrypt-sha256\\$(2[axy]|2)\\,[0-9]+\\$[a-z0-9\\/.]{22}\\$[a-z0-9\\/.]{31}$",
+        "regex": "^\\$bcrypt-sha256\\$(2[axy]|2)\\,\\d+\\$[a-z0-9\\/.]{22}\\$[a-z0-9\\/.]{31}$",
         "modes": [
             {
                 "john": null,
@@ -1659,7 +1681,7 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-512(256)"
             },
             {
@@ -1712,21 +1734,39 @@
             },
             {
                 "john": "dynamic_64",
-                "hashcat": null,
+                "hashcat": 21400,
                 "extended": true,
-                "name": "sha256(sha256_raw($pass))"
+                "name": "sha256(sha256_raw($pass))",
+                "samples": [
+                    "0cc1b58a543f372327aa0281e97ab56e345267ee46feabf7709515debb7ec43c"
+                ]
             },
             {
                 "john": "dynamic_65",
-                "hashcat": null,
+                "hashcat": 20710,
                 "extended": true,
-                "name": "sha256(sha256($pass).$salt)"
+                "name": "sha256(sha256($pass).$salt)",
+                "samples": [
+                    "bfede293ecf6539211a7305ea218b9f3f608953130405cda9eaba6fb6250f824:7218532375810603"
+                ]
             },
             {
                 "john": "dynamic_66",
-                "hashcat": null,
+                "hashcat": 20720,
                 "extended": true,
-                "name": "sha256($salt.sha256($pass))"
+                "name": "sha256($salt.sha256($pass))",
+                "samples": [
+                    "bae9edada8358fcebcd811f7d362f46277fb9d488379869fba65d79701d48b8b:869dc2ed80187919"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 21420,
+                "extended": true,
+                "name": "sha256($salt.sha256_raw($pass))",
+                "samples": [
+                    "5934ea4d670c13a71155faba42056b2525f71bdc9215d31108990c11bf3d98e3:9269771356270099311432765354522635185291064175409115041569"
+                ]
             },
             {
                 "john": "dynamic_67",
@@ -1780,13 +1820,13 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "SAM(LM_Hash:NT_Hash)"
             }
         ]
     },
     {
-        "regex": "^(\\$chap\\$0\\*)?[a-f0-9]{32}[\\*:][a-f0-9]{32}(:[0-9]{2})?$",
+        "regex": "^(\\$chap\\$0\\*)?[a-f0-9]{32}[\\*:][a-f0-9]{32}(:\\d{2})?$",
         "modes": [
             {
                 "john": "chap",
@@ -1814,7 +1854,7 @@
         ]
     },
     {
-        "regex": "^{ssha256}[0-9]{2}\\$[a-z0-9$\\/.]{60}$",
+        "regex": "^{ssha256}\\d{2}\\$[a-z0-9$\\/.]{60}$",
         "modes": [
             {
                 "john": "aix-ssha256",
@@ -1885,13 +1925,13 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-512(384)"
             },
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-1024(384)"
             },
             {
@@ -1974,7 +2014,7 @@
         ]
     },
     {
-        "regex": "^{ssha512}[0-9]{2}\\$[a-z0-9\\/.]{16,48}\\$[a-z0-9\\/.]{86}$",
+        "regex": "^{ssha512}\\d{2}\\$[a-z0-9\\/.]{16,48}\\$[a-z0-9\\/.]{86}$",
         "modes": [
             {
                 "john": "aix-ssha512",
@@ -2038,7 +2078,10 @@
                 "john": "raw-blake2",
                 "hashcat": null,
                 "extended": false,
-                "name": "BLAKE2-512"
+                "name": "BLAKE2-512",
+                "samples": [
+                    "4245af08b46fbb290222ab8a68613621d92ce78577152d712467742417ebc1153668f1c9e1ec1e152a32a9c242dc686d175e087906377f0c483c5be2cb68953e"
+                ]
             },
             {
                 "john": "skein-512",
@@ -2049,7 +2092,7 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-1024(512)"
             },
             {
@@ -2136,11 +2179,38 @@
                 "john": "raw-blake2",
                 "hashcat": 600,
                 "extended": false,
-                "name": "BLAKE2-512"
+                "name": "BLAKE2-512",
+                "samples": [
+                    "$BLAKE2$021ced8799296ceca557832ab941a50b4a11f83478cf141f51f933f653ab9fbcc05a037cddbed06e309bf334942c4e58cdf1a46e237911ccd7fcf9787cbc7fd0",
+                    "$BLAKE2$1f7d9b7c9a90f7bfc66e52b69f3b6c3befbd6aee11aac860e99347a495526f30c9e51f6b0db01c24825092a09dd1a15740f0ade8def87e60c15da487571bcef7",
+                    "$BLAKE2$296c269e70ac5f0095e6fb47693480f0f7b97ccd0307f5c3bfa4df8f5ca5c9308a0e7108e80a0a9c0ebb715e8b7109b072046c6cd5e155b4cfd2f27216283b1e"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$BLAKE2\\$[a-f0-9]{128}(?::.+)$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 610,
+                "extended": true,
+                "name": "BLAKE2-512($pass.$salt)",
+                "samples": [
+                    "$BLAKE2$41fcd44c789c735c08b43a871b81c8f617ca43918d38aee6cf8291c58a0b00a03115857425e5ff6f044be7a5bec8536b52d6c9992e21cd43cdca8a55bbf1f5c1:1033"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 620,
+                "extended": true,
+                "name": "BLAKE2-512($salt.$pass)",
+                "samples": [
+                    "$BLAKE2$f0325fdfc3f82a014935442f7adbc069d4636d67276a85b09f8de368f122cf5195a0b780d7fee709fbf1dcd02ddcb581df84508cf1fb0f3393af1be0565491c6:3301"
+                ]
             }
         ]
     },
-
     {
         "regex": "^[a-f0-9]{136}$",
         "modes": [
@@ -2178,7 +2248,7 @@
         ]
     },
     {
-        "regex": "^\\$ml\\$[0-9]+\\$[a-f0-9]{64}\\$[a-f0-9]{128}$",
+        "regex": "^\\$ml\\$\\d+\\$[a-f0-9]{64}\\$[a-f0-9]{128}$",
         "modes": [
             {
                 "john": "pbkdf2-hmac-sha512",
@@ -2200,13 +2270,13 @@
             {
                 "john": null,
                 "hashcat": null,
-                "extended": false,
+                "extended": true,
                 "name": "Skein-1024"
             }
         ]
     },
     {
-        "regex": "^grub\\.pbkdf2\\.sha512\\.[0-9]+\\.([a-f0-9]{128,2048}\\.|[0-9]+\\.)?[a-f0-9]{128}$",
+        "regex": "^grub\\.pbkdf2\\.sha512\\.\\d+\\.([a-f0-9]{128,2048}\\.|\\d+\\.)?[a-f0-9]{128}$",
         "modes": [
             {
                 "john": null,
@@ -2250,7 +2320,7 @@
         ]
     },
     {
-        "regex": "^\\$5\\$(rounds=[0-9]+\\$)?[a-z0-9\\/.]{0,16}\\$[a-z0-9\\/.]{43}$",
+        "regex": "^\\$5\\$(rounds=\\d+\\$)?[a-z0-9\\/.]{0,16}\\$[a-z0-9\\/.]{43}$",
         "modes": [
             {
                 "john": "sha256crypt",
@@ -2272,7 +2342,7 @@
         ]
     },
     {
-        "regex": "^\\$6\\$(rounds=[0-9]+\\$)?[a-z0-9\\/.]{0,16}\\$[a-z0-9\\/.]{86}$",
+        "regex": "^\\$6\\$(rounds=\\d+\\$)?[a-z0-9\\/.]{0,16}\\$[a-z0-9\\/.]{86}$",
         "modes": [
             {
                 "john": "sha512crypt",
@@ -2409,57 +2479,111 @@
         ]
     },
     {
-        "regex": "^\\$(krb5pa|mskrb5)\\$([0-9]{2})?\\$.+\\$[a-f0-9]{1,}$",
+        "regex": "^\\$(?:af|k4)\\$[^$]+\\$[a-f0-9]{32}$",
+        "modes": [
+            {
+                "john": "krb4",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 4 TGT",
+                "samples": [
+                    "$af$UMICH.EDU$bb46613c503ad92e649d99d038efddb2",
+                    "$af$UMICH.EDU$bebcedf43f7f2aa78cf9c0639e494c92"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5\\$[^$]+\\$[^$]+\\$[a-f0-9]{456}$",
+        "modes": [
+            {
+                "john": "krb5",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 TGT",
+                "samples": [
+                    "$krb5$oskov$ACM.UIUC.EDU$4730d7249765615d6f3652321c4fb76d09fb9cd06faeb0c31b8737f9fdfcde4bd4259c31cb1dff25df39173b09abdff08373302d99ac09802a290915243d9f0ea0313fdedc7f8d1fae0d9df8f0ee6233818d317f03a72c2e77b480b2bc50d1ca14fba85133ea00e472c50dbc825291e2853bd60a969ddb69dae35b604b34ea2c2265a4ffc72e9fb811da17c7f2887ccb17e2f87cd1f6c28a9afc0c083a9356a9ee2a28d2e4a01fc7ea90cc8836b8e25650c3a1409b811d0bad42a59aa418143291d42d7b1e6cb5b1876a4cc758d721323a762e943f774630385c9faa68df6f3a94422f97",
+                    "$krb5$oskov$ACM.UIUC.EDU$6cba0316d38e31ba028f87394792baade516afdfd8c5a964b6a7677adbad7815d778b297beb238394aa97a4d495adb7c9b7298ba7c2a2062fb6c9a4297f12f83755060f4f58a1ea4c7026df585cdfa02372ad619ab1a4ec617ad23e76d6e37e36268d9aa0abcf83f11fa8092b4328c5e6c577f7ec6f1c1684d9c99a309eee1f5bd764c4158a2cf311cded8794b2de83131c3dc51303d5300e563a2b7a230eac67e85b4593e561bf6b88c77b82c729e7ba7f3d2f99b8dc85b07873e40335aff4647833a87681ee557fbd1ffa1a458a5673d1bd3c1587eceeabaebf4e44c24d9a8ac8c1d89"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$(?:krb5pa\\$\\d{2}|mskrb5)\\$.+\\$[a-f0-9]+$",
         "modes": [
             {
                 "john": "krb5pa-md5",
                 "hashcat": 7500,
                 "extended": false,
-                "name": "Kerberos 5 AS-REQ Pre-Auth etype 23"
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 23",
+                "samples": [
+                    "$krb5pa$23$user$realm$salt$5cbb0c882a2b26956e81644edbdb746326f4f5f0e947144fb3095dffe4b4b03e854fc1d631323632303636373330383333353630",
+                    "$krb5pa$23$user$realm$salt$afcbe07c32c3450b37d0f2516354570fe7d3e78f829e77cdc1718adf612156507181f7daeb03b6fbcfe91f8346f3c0ae7e8abfe5",
+                    "$mskrb5$john$JOHN.DOE.MS.COM$02E837D06B2AC76891F388D9CC36C67A$2A9785BF5036C45D3843490BF9C228E8C18653E10CE58D7F8EF119D2EF4F92B1803B1451",
+                    "$krb5pa$23$$$$afcbe07c32c3450b37d0f2516354570fe7d3e78f829e77cdc1718adf612156507181f7daeb03b6fbcfe91f8346f3c0ae7e8abfe5"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5tgs\\$23\\$\\*[^*]*\\*\\$[a-f0-9]{32}\\$[a-f0-9]{64,40960}$",
+        "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"
+                "name": "Kerberos 5 TGS-REP etype 23",
+                "samples": [
+                    "$krb5tgs$23$*user$realm$test/spn*$b548e10f5694ae018d7ad63c257af7dc$35e8e45658860bc31a859b41a08989265f4ef8afd75652ab4d7a30ef151bf6350d879ae189a8cb769e01fa573c6315232b37e4bcad9105520640a781e5fd85c09615e78267e494f433f067cc6958200a82f70627ce0eebc2ac445729c2a8a0255dc3ede2c4973d2d93ac8c1a56b26444df300cb93045d05ff2326affaa3ae97f5cd866c14b78a459f0933a550e0b6507bf8af27c2391ef69fbdd649dd059a4b9ae2440edd96c82479645ccdb06bae0eead3b7f639178a90cf24d9a",
+                    "$krb5tgs$23$74809c4c83c3c8279c6058d2f206ec2f$78b4bbd4d229487d5afc9a6050d4144ce10e9245cdfc0df542879814ce740cebb970ee820677041596d7e55836a18cc95c04169e7c74a4a22ae94e66f3d37150e26cc9cb99e189ef54feb7a40a8db2cb2c41db80d8927c74da7b33b52c58742d2109036b8ab27184609e7adff27b8f17b2f2a7b7d85e4ad532d8a70d48685a4390a9fc7a0ab47fd17334534d795abf83462f0db3de931c6a2d5988ab5bf3253facfff1381afb192ce385511c9052f2915ffdb7ea28a1bbad0573d9071e79dc15068527d50100de8813793a15c292f145fa3797ba86f373a4f0a05e5f2ec7dbfd8c8b5139cc7fbb098ea1dd91a7440134ffe2aff7174d0df13dcad82c81c680a70127a3ec8792bdecd74a878f97ff2b21277dc8c9a2f7bbcd9f72560dd933d85585259067d45a46a6f505d03f188b62c37edf03f117503a26743ebd674d5b07324c15fc8418881613b365402e0176da97d43cf85e8239b69aee07791233a959bcaf83a7f492fa718dd0a1747eaf5ce626eb11bda89e8235a056e2721f45c3b61442d893ef32a8c192ea0dadb853f3c6f3c75e92f23c744605c6f55578f696b0f33a9586b8aae3e12e38a097692cd9a31d780d973eaaf62ef23b2fc9ae59a38bfd8ea14d3289b46910f61a90aa733e66382bc27f40ba634e55ef1bec0ca7f71546b79566d85664b92f9fae495fcef5cde4c4399a6798569a7e81b9cc4bdde7104f3fe181401f82bba944e3b0a406c7093c00ff9d5984a82517b1a64a8aa561bc1f0cbafbdbbc5654d375c91d4e485e17bb06838109fbc1504147481c91652f545086a84daa423a6286ea6bb13460c5ff3d865a7b37b9ce4e7b07fbe2f6897c12c1e4df2e875c1ec9cfbf84097a7f48b270baf3481263b21849ab93c231490d06a23461a5e00c23df76bca8e5a19256d859304e1f5752bf055ac7f4843e1ad174f1cbbf5c142958f9310025ce439d5979982fb0b8c2ea95e1a22ee8dc63423d9d364cb0b95bcdf89ec4ed485b9005326d728757d77aa3e020a4a61d7deb782bc5264dca350173609772cd6d003ee8104dd24d310c9a18a44f78e27d65095f5bb54f6118c8f0d79ad5a850cec8d40a19bd0134144e904c9eb7fdcff3293696071fc1118f6b2f934281a25bcd5ca7d567714b1e43bd6d09bfcc8744c0ca273a75938394ac2fb31957287093346078577c94a71dfa6ad4a63211f54f00ef7a9064d070aaff84116ee891728915c938a8a32e87aaa00ec18e2b4e9ae88f7e53f08d855052a995f92351be32d8df934eab487103b0f089828e5fb5f73af3a8a05b9fffd25c43a392994743de3de1a2a9b8bba27e02ae2341f09d63aafab291759c41b9635521ca02f08e21e7e5c3ce75c8c3515eaa99aeb9bf8e204663e8b6b8507ecf87230a131687b4770e250ba0ef29fa3ca3b47b34971e17c6a3ef785acdd7c90da9d2",
+                    "$krb5tgs$23$8bef2ad33c7d5d23c8693ccd868d9f84$f72688ca744f9634625c2dbd94ef6193644e08c4627839ce5fcf8bbfbd15ad7093fb3ecc24512ac161188a7ad2de127166f4f244f37527e15468d844efe6396756b8cf8341cbfe70e454e1f2b324f5ddee64f4f4947e1bb6776041e28e6261b57b1791677b35e1b4171ec5a05062b7bd7eb5558d6e4165ad916e790954f163a7f7e8390462295d74eff33fcbb442d4281f7cf68ddbb6ce27030015b2cf4f68e04793a9674e634663a68622e13a5a6d8c27bf8b90ee18033e754c95776d1dbd8d73ab292d27c445eb33b9b814945617f527678667b2d81adc57c7c62713d7826bc9ea918b330245a4d7fbcc33889901a63131be87a0d4e8f49d1259141677bfa27c284d8cfb1c94f4d4a602f30b774e58378710d0ad2a73c978c8c6470402c0cdbdf5d505fe07dc4250510836d5ec969b56790128aa75b292d71d4e6c77ffee261230fc7b11969e4701abc63f120420cc0f74f99e42d6613713fc0530842f77b7a45daadb296c744e0725cd2867492b5bc1cb6a4e3315e1f6b7e5b0299a9283235769d95ef63c885352b08176547f86a03ec323a2e5c84f66f3ab699fc7c5e8b2120659c963d5c98df9529939b250e0f1703f5a9859f8b00a5317aa92dc37093dc87984c0eb841cd2ce77b80510c79e8b5eb56c15f07eba936d257a4d78f82a6179ba7ed07fbeba68d43112e44f850a5034b9239c689828f7039b8c8efcbecbc34ab92d5fb869482456a92ce9201e6586458e1d7bd38b2251b1fb573dc1c6ce40a428448cfaf18e5251436aece6baa2356a06a50a6d4c011977233e7b38007cad4a869941fea1139ff4d2ce216166abf5dfa89dc85719b14eaa0d492b1d442b67cb10c81bb35e1a96ae4f62e8c4fbf604c916e2ac4a121620a2beb40cf7d43bbe7ddbb38435dacd7aba846915eb01b57d33d5dcc25082e79452416d86143e33608a8e279d396cca4a8cc5d02ad820868c4381f9f7f5bab23ba8440fd9ab5ae713cb1c20a82e0a0e93a83248b2a2a8a30aceed71a8e78526943b45f122f16ea004ffdea16005bb52e184b7498c8aefb26da2e8b43e98343e9bb364578deceee623656985fdb58dda60a112d9dc1f0e36230d43ab8d1f48ba2013fd641001f675b8918fb69826decefd742a3f3c02b49988b2b439db763db2d95744a2f2456f5b32ea64e8836873ecce085875b4e054e55700198642961560529bba800a683f149c63dd5f983477f415399f229f6f292327ebac73a6707da022e472f1081421c8549d21696db7fe7bdd2ad744a5afbada9a719c26e3962cd86f8e"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5asrep\\$23\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "regex": "^\\$krb5asrep\\$23\\$(?:[^:$]+:)?[a-f0-9]{32}\\$[a-f0-9]{64,40960}$",
         "modes": [
             {
                 "john": "krb5asrep",
                 "hashcat": 18200,
                 "extended": false,
-                "name": "Kerberos 5 AS-REP etype 23"
+                "name": "Kerberos 5 AS-REP etype 23",
+                "samples": [
+                    "$krb5asrep$23$8cf8eb5287e28a4006c064892150c4fb$3e05ecc13548bec8e1eeb900dea5429cc6931bae9b8524490eb3a8801560871fe44355ed556202afbb39872e1bbb5c3c4f1b37dcd68fda89a23ebad917d4bbb0933edd94331598939e5d0c0c98c7e219a2e9dd6b877280d1bd7c51131413be577a167208bcc21e9fe7ae8f393278d740e72ca5c44c42d5cb0bf6bab0a36f1b88b7ddc4abbc6f152e652f6ba35c2955fb4132e11b7e566f3b422c3740f79847b77783d245a4e570b8a621b4ff6ff4815566446af70313ee78133707a76a4e4424783bd7c04920aa822a1a36b29f7e25cef186e6439fc46e42e23d6bd918969ef49b8388aef158e443b3a57dbde7ada631fbef7326f9046a9b",
+                    "$krb5asrep$23$c447eddaebf22ebf006a8fc6f986488c$eb3a17eb56287b474cecad5d4e0490d949977ba3f5015220bcd3080444d5601d67b76c5453b678e8527624e40c273bea4cfe4a7303e136b9bc3b9e63b6fb492ee4b4d2f830c5fa5a55466b57a678f708438f6712354a2deb851792b09270f4941966b82a2fd5ad8fa1fbd95a60b0f9bcd57774b3e55467a02ffcb3f1379104c24e468342f83df20b571e6f34f9a9842b43735d58d94514dcefa76719c0f5c7c3a3bfa770380924625aa0a3472d7c02d10dbb278fd946f7efcfe59a4d4cb7bdb9c5dbddc027611fe333d3ac940ec5b4ed43b55ab54b03cd2df0a9a2a7b5d235c226b259bd5ff8e0e49680351d4f0c4d13e258bc8d383cad6fc2711be0",
+                    "$krb5asrep$23$771adbc2397abddef676742924414f2b$2df6eb2d9c71820dc3fa2c098e071d920f0e412f5f12411632c5ee70e004da1be6f003b78661f8e4507e173552a52da751c45887c19bc1661ed334e0ccb4ef33975d4bd68b3d24746f281b4ca4fdf98fca0e50a8e845ad7d834e020c05b1495bc473b0295c6e9b94963cb912d3ff0f2f48c9075b0f52d9a31e5f4cc67c7af1d816b6ccfda0da5ccf35820a4d7d79073fa404726407ac840910357ef210fcf19ed81660106dfc3f4d9166a89d59d274f31619ddd9a1e2712c879a4e9c471965098842b44fae7ca6dd389d5d98b7fd7aca566ca399d072025e81cf0ef5075447687f80100307145fade7a8",
+                    "$krb5asrep$23$user@domain.com:3e156ada591263b8aab0965f5aebd837$007497cb51b6c8116d6407a782ea0e1c5402b17db7afa6b05a6d30ed164a9933c754d720e279c6c573679bd27128fe77e5fea1f72334c1193c8ff0b370fadc6368bf2d49bbfdba4c5dccab95e8c8ebfdc75f438a0797dbfb2f8a1a5f4c423f9bfc1fea483342a11bd56a216f4d5158ccc4b224b52894fadfba3957dfe4b6b8f5f9f9fe422811a314768673e0c924340b8ccb84775ce9defaa3baa0910b676ad0036d13032b0dd94e3b13903cc738a7b6d00b0b3c210d1f972a6c7cae9bd3c959acf7565be528fc179118f28c679f6deeee1456f0781eb8154e18e49cb27b64bf74cd7112a0ebae2102ac"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5asrep\\$18\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "regex": "^\\$krb5asrep\\$18\\$[^$]+\\$[a-f0-9]{542}\\$[a-f0-9]{24}$",
         "modes": [
             {
                 "john": "krb5asrep",
                 "hashcat": null,
                 "extended": false,
-                "name": "Kerberos 5 AS-REP etype 18"
+                "name": "Kerberos 5 AS-REP etype 18",
+                "samples": [
+                    "$krb5asrep$18$EXAMPLE.COMlulu$b49aa3de9314e2d8daafe323f2e84b9a4ddc361d99bf3bf3a99102f8bff5368bdefc9d7ae090532fdad2a508ac1271bfbd17363b3a1da23bf9db324a24c238634e3ab28d7f4eca009b4c3953c882f5a4206458a0b4238f3e538308d7339382f38412bbfe7b71e269274526edf7b802ea1ecdf7b8c17f9502b7a6750313329a68b8f8a2d039c8dfe74b9ead98684cfc86e5d0f77c18ba05718b01c33831db17191a0e77f9cef998bbb66a794915b03c94725aceabe9e2b5e25b665a37b5dd3a59a5552bd779dd5f0ae7295d232194eec1ca1ba0324bdc836ba623117e59fcfedab45a86d76d2c768341d327c035a1f5c756cfc06d76b6f7ea31c7a8e782eb48de0aab2fb373ffc2352c4192838323f8$a5245c7f39480a840da0e4c6",
+                    "$krb5asrep$18$EXAMPLE.COMluser$42e34732112be6cec1532177a6c93af5ec3b2fc7da106c004d6d89ddcb4131092aecbead3e9f30d07b593f4c7adc6478ab50b80fee07db3531471f5f1986c8882c45fef784258f9d43195108b83a74f6dcae1beed179c356c0da4e2d69f122efc579fd207d2b2b241a6c275997f2ec6fec95573a7518cb8b8528d932cc14186e4c5d46cef1eed4f2924ea316d80a62b0bcd98592a11eb69c04ef43b63aeae35e9f8bd8f842d0c9c33d768cd33c55914c2a1fb2f7c640b7270cf2274993c0ce4f413aac8e9d7a231c70dd0c6f8b9c16b47a90fae8d68982a66aa58e2eb8dde93d3504e87b5d4e33827c2aa501ed63544c0578032f395205c63b030cccc699aafb9132692c79a154d645fe83927b0eda$420973360c2e907b9053f1db"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5asrep\\$17\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "regex": "^\\$krb5asrep\\$17\\$[^$]+\\$[a-f0-9]{542}\\$[a-f0-9]{24}$",
         "modes": [
             {
                 "john": "krb5asrep",
                 "hashcat": null,
                 "extended": false,
-                "name": "Kerberos 5 AS-REP etype 17"
+                "name": "Kerberos 5 AS-REP etype 17",
+                "samples": [
+                    "$krb5asrep$17$EXAMPLE.COMhero$4e7c79214fd330b2e505a4c75e257e4686029136d54f92ce91bb69d5ffc064e64e925b3ae8bc1df431c74ccaf2075cb4a1a32151b0848964e147bf6f8e4a50caa7931faad50433991e016e312c70ad9007e38166f8df39eda3edd2445cce757e062d0919e663a67eb9fdb472b2a840cf521f18bd794947bcc0c0c6394cc5a60b860c963640867e623732206e7bf904d3b066a17b6f4ea3fd6d74f110ee80052e5297f7a19aaec22e22d582d183d43d6ca1792da187a3a182d1f479c5b4692841ccd701a63735d64584c4f8d199d67876dae5181f4eadfe75e454d0587d0953d7e16cb1b63265da6188b10c1746a2e83c41707bd03fcb2d460d1c6802826a0347b5ee7cdbe5384acad139b4395928bd$7ed0277ba9b853008cc62abe"
+                ]
             }
         ]
     },
@@ -2470,7 +2594,10 @@
                 "john": null,
                 "hashcat": 19600,
                 "extended": false,
-                "name": "Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)"
+                "name": "Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)",
+                "samples": [
+                    "$krb5tgs$17$srv_http$synacktiv.local$849e31b3db1c1f203fa20b85$948690f5875125348286ad3346d27b43eaabc71896b620c16de7ddcdbd561628c650c508856a3f574261948b6db4b48332d30536e978046a423ad4368f9a69b4dc4642dab4e0d475d8299be718fd6f98ac85a771b457b2453e78c9411dfce572b19660fe7a5a8246d9b2a91ea2f14d1986ea0a77ecf9b8330bc8fd9ab540bcf46b74c5aa7005cfccd89ec05f66aeab30c6b2bf8595cf6c9a1b68ad885258850c4b1dd9265f270fb2af52fd76c16246df51ea67efc58a65c345686c84e43642febe908a"
+                ]
             }
         ]
     },
@@ -2481,34 +2608,121 @@
                 "john": null,
                 "hashcat": 19700,
                 "extended": false,
-                "name": "Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)"
+                "name": "Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)",
+                "samples": [
+                    "$krb5tgs$18$srv_http$synacktiv.local$16ce51f6eba20c8ee534ff8a$57d07b23643a516834795f0c010da8f549b7e65063e5a367ca9240f9b800adad1734df7e7d5dd8307e785de4f40aacf901df41aa6ce695f8619ec579c1fa57ee93661cf402aeef4e3a42e7e3477645d52c09dc72feade03512dffe0df517344f673c63532b790c242cc1d50f4b4b34976cb6e08ab325b3aefb2684262a5ee9faacb14d059754f50553be5bfa5c4c51e833ff2b6ac02c6e5d4c4eb193e27d7dde301bd1ddf480e5e282b8c27ef37b136c8f140b56de105b73adeb1de16232fa1ab5c9f6"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5pa\\$17\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "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"
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 17",
+                "samples": [
+                    "$krb5pa$17$hashcat$HASHCATDOMAIN.COM$a17776abe5383236c58582f515843e029ecbff43706d177651b7b6cdb2713b17597ddb35b1c9c470c281589fd1d51cca125414d19e40e333",
+                    "$krb5pa$17$user1$EXAMPLE.COM$$c5461873dc13665771b98ba80be53939e906d90ae1ba79cf2e21f0395e50ee56379fbef4d0298cfccfd6cf8f907329120048fd05e8ae5df4"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$krb5pa\\$18\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "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"
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 18",
+                "samples": [
+                    "$krb5pa$18$hashcat$HASHCATDOMAIN.COM$96c289009b05181bfd32062962740b1b1ce5f74eb12e0266cde74e81094661addab08c0c1a178882c91a0ed89ae4e0e68d2820b9cce69770",
+                    "$krb5pa$18$user1$EXAMPLE.COM$$2a0e68168d1eac344da458599c3a2b33ff326a061449fcbc242b212504e484d45903c6a16e2d593912f56c93883bf697b325193d62a8be9c",
+                    "$krb5pa$18$aduser$AD.EXAMPLE.COM$$64dfeee04be2b2e0423814e0df4d0f960885aca4efffe6cb5694c4d34690406071c4968abd2c153ee42d258c5e09a41269bbcd7799f478d3",
+                    "$krb5pa$18$aduser$AD.EXAMPLE.COM$AD.EXAMPLE.COMaduser$f94f755a8b4493d925094a4eb1cec630ac40411a14c9733a853516fe426637d9daefdedc0567e2bb5a83d4f89a0ad1a4b178662b6106c0ff"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5db\\$17\\$[^$]{1,512}\\$[^$]{1,512}(?:\\$[^$]*)?\\$[a-f0-9]{32}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28800,
+                "extended": false,
+                "name": "Kerberos 5 DB etype 17",
+                "samples": [
+                    "$krb5db$17$test$TEST.LOCAL$1c41586d6c060071e08186ee214e725e"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb17\\$[^$]{1,512}\\$[a-f0-9]{32}$",
+        "modes": [
+            {
+                "john": "krb5-17",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 DB etype 17",
+                "samples": [
+                    "$krb17$TEST.LOCALtest$6fb8b78e20ad3df6591cabb9cacf4594",
+                    "$krb17$TEST.LOCALtest$b7dc1cf2b403cf5f27ea9b2ea526dc5a"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5db\\$18\\$[^$]{1,512}\\$[^$]{1,512}(?:\\$[^$]{1,512})?\\$[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28900,
+                "extended": false,
+                "name": "Kerberos 5 DB etype 18",
+                "samples": [
+                    "$krb5db$18$test$TEST.LOCAL$266b5a53a6d663c3f69174f3309acada8e467c097c7973699f86286a6cf1a6c7"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb18\\$[^$]{1,512}\\$[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "krb5-18",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 DB etype 18",
+                "samples": [
+                    "$krb18$OLYMPE.OLtest$214bb89cf5b8330112d52189ab05d9d05b03b5a961fe6d06203335ad5f339b26"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb3\\$[^$]{1,512}\\$[a-f0-9]{16}$",
+        "modes": [
+            {
+                "john": "krb5-3",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 DB etype 3",
+                "samples": [
+                    "$krb3$INTERNAL.CORP1user3$eafdc79b7620584a",
+                    "$krb3$EXAMPLE.COMlulu$25bfb33132c11346",
+                    "$krb3$EXAMPLE.COMluluaaaa$97076894ae025738",
+                    "$krb3$EXAMPLE.COMluluaaaa$79850e6e9e5e92d0"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$scram\\$[0-9]+\\$[a-z0-9\\/.]{16}\\$sha-1=[a-z0-9\\/.]{27},sha-256=[a-z0-9\\/.]{43},sha-512=[a-z0-9\\/.]{86}$",
+        "regex": "^\\$scram\\$\\d+\\$[a-z0-9\\/.]{16}\\$sha-1=[a-z0-9\\/.]{27},sha-256=[a-z0-9\\/.]{43},sha-512=[a-z0-9\\/.]{86}$",
         "modes": [
             {
                 "john": null,
@@ -2613,7 +2827,7 @@
         ]
     },
     {
-        "regex": "^[a-f0-9]{32}:[0-9]+:[a-z0-9_.+\\-]+@[a-z0-9\\-]+\\.[a-z0-9\\-.]+$",
+        "regex": "^[a-f0-9]{32}:\\d+:[a-z0-9_.+\\-]+@[a-z0-9\\-]+\\.[a-z0-9\\-.]+$",
         "modes": [
             {
                 "john": null,
@@ -2624,7 +2838,7 @@
         ]
     },
     {
-        "regex": "^[a-z0-9\\/.]{16}([:$].{1,})?$",
+        "regex": "^[a-z0-9\\/.]{16}([:$].+)?$",
         "modes": [
             {
                 "john": "asa-md5",
@@ -2652,7 +2866,7 @@
         ]
     },
     {
-        "regex": "^[a-z0-9]{32}(:([a-z0-9\\-]+\\.)?[a-z0-9\\-.]+\\.[a-z]{2,7}:.+:[0-9]+)?$",
+        "regex": "^[a-z0-9]{32}(:([a-z0-9\\-]+\\.)?[a-z0-9\\-.]+\\.[a-z]{2,7}:.+:\\d+)?$",
         "modes": [
             {
                 "john": null,
@@ -2685,7 +2899,7 @@
         ]
     },
     {
-        "regex": "^\\$sha1\\$[0-9]+\\$[a-z0-9\\/.]{0,64}\\$[a-z0-9\\/.]{28}$",
+        "regex": "^\\$sha1\\$\\d+\\$[a-z0-9\\/.]{0,64}\\$[a-z0-9\\/.]{28}$",
         "modes": [
             {
                 "john": "sha1crypt",
@@ -2733,7 +2947,7 @@
         ]
     },
     {
-        "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})$",
+        "regex": "^\\$pbkdf2(-hmac)?(-sha1)?\\$(\\d{1,6}\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]+|\\d{1,6}\\.[a-f0-9]+\\.[a-f0-9]{40})$",
         "modes": [
             {
                 "john": "pbkdf2-hmac-sha1",
@@ -2751,7 +2965,7 @@
         ]
     },
     {
-        "regex": "^\\$pbkdf2-sha256\\$[0-9]{1,6}\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]+$",
+        "regex": "^\\$pbkdf2-sha256\\$\\d{1,6}\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]+$",
         "modes": [
             {
                 "john": "pbkdf2-hmac-sha256",
@@ -2768,7 +2982,7 @@
         ]
     },
     {
-        "regex": "^\\$pbkdf2-sha512\\$[0-9]+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{86}$",
+        "regex": "^\\$pbkdf2-sha512\\$\\d+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{86}$",
         "modes": [
             {
                 "john": null,
@@ -2779,7 +2993,7 @@
         ]
     },
     {
-        "regex": "^\\$p5k2\\$[0-9]+\\$[a-z0-9\\/+=\\-]+\\$[a-z0-9\\/+\\-]{27}=$",
+        "regex": "^\\$p5k2\\$\\d+\\$[a-z0-9\\/+=\\-]+\\$[a-z0-9\\/+\\-]{27}=$",
         "modes": [
             {
                 "john": null,
@@ -2790,7 +3004,7 @@
         ]
     },
     {
-        "regex": "^\\$p5k2\\$[0-9]+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{32}$",
+        "regex": "^\\$p5k2\\$\\d+\\$[a-z0-9\\/.]+\\$[a-z0-9\\/.]{32}$",
         "modes": [
             {
                 "john": null,
@@ -2801,7 +3015,7 @@
         ]
     },
     {
-        "regex": "^{FSHP[0123]\\|[0-9]+\\|[0-9]+}[a-z0-9\\/+=]+$",
+        "regex": "^{FSHP[0123]\\|\\d+\\|\\d+}[a-z0-9\\/+=]+$",
         "modes": [
             {
                 "john": null,
@@ -2823,7 +3037,7 @@
         ]
     },
     {
-        "regex": "^[0-9]{4}:[a-f0-9]{16}:[a-f0-9]{2080}$",
+        "regex": "^\\d{4}:[a-f0-9]{16}:[a-f0-9]{2080}$",
         "modes": [
             {
                 "john": null,
@@ -2834,7 +3048,7 @@
         ]
     },
     {
-        "regex": "^[a-f0-9]{64}:[a-f0-9]{32}:[0-9]{5}:[a-f0-9]{608}$",
+        "regex": "^[a-f0-9]{64}:[a-f0-9]{32}:\\d{5}:[a-f0-9]{608}$",
         "modes": [
             {
                 "john": null,
@@ -2889,7 +3103,7 @@
         ]
     },
     {
-        "regex": "^(\\$django\\$\\*1\\*)?pbkdf2_sha256\\$[0-9]+\\$[a-z0-9]+\\$[a-z0-9\\/+=]{44}$",
+        "regex": "^(\\$django\\$\\*1\\*)?pbkdf2_sha256\\$\\d+\\$[a-z0-9]+\\$[a-z0-9\\/+=]{44}$",
         "modes": [
             {
                 "john": "django",
@@ -2900,7 +3114,7 @@
         ]
     },
     {
-        "regex": "^pbkdf2_sha1\\$[0-9]+\\$[a-z0-9]+\\$[a-z0-9\\/+=]{28}$",
+        "regex": "^pbkdf2_sha1\\$\\d+\\$[a-z0-9]+\\$[a-z0-9\\/+=]{28}$",
         "modes": [
             {
                 "john": null,
@@ -2911,7 +3125,7 @@
         ]
     },
     {
-        "regex": "^bcrypt(\\$2[axy]|\\$2)\\$[0-9]{2}\\$[a-z0-9\\/.]{53}$",
+        "regex": "^bcrypt(\\$2[axy]|\\$2)\\$\\d{2}\\$[a-z0-9\\/.]{53}$",
         "modes": [
             {
                 "john": null,
@@ -2943,17 +3157,6 @@
             }
         ]
     },
-    {
-        "regex": "^md5[a-f0-9]{32}$",
-        "modes": [
-            {
-                "john": null,
-                "hashcat": null,
-                "extended": false,
-                "name": "PostgreSQL MD5"
-            }
-        ]
-    },
     {
         "regex": "^\\([a-z0-9\\/+]{49}\\)$",
         "modes": [
@@ -2966,7 +3169,7 @@
         ]
     },
     {
-        "regex": "^SCRYPT:[0-9]{1,}:[0-9]{1}:[0-9]{1}:[a-z0-9:\\/+=]{1,}$",
+        "regex": "^SCRYPT:\\d+:\\d{1}:\\d{1}:[a-z0-9:\\/+=]+$",
         "modes": [
             {
                 "john": null,
@@ -2999,7 +3202,7 @@
         ]
     },
     {
-        "regex": "^\\$office\\$\\*2007\\*[0-9]{2}\\*[0-9]{3}\\*[0-9]{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{40}$",
+        "regex": "^\\$office\\$\\*2007\\*\\d{2}\\*\\d{3}\\*\\d{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{40}$",
         "modes": [
             {
                 "john": "office",
@@ -3010,7 +3213,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}$",
+        "regex": "^\\$office\\$\\*2010\\*\\d{6}\\*\\d{3}\\*\\d{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{64}$",
         "modes": [
             {
                 "john": "office",
@@ -3021,7 +3224,7 @@
         ]
     },
     {
-        "regex": "^\\$office\\$\\*2013\\*[0-9]{6}\\*[0-9]{3}\\*[0-9]{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{64}$",
+        "regex": "^\\$office\\$\\*2013\\*\\d{6}\\*\\d{3}\\*\\d{2}\\*[a-z0-9]{32}\\*[a-z0-9]{32}\\*[a-z0-9]{64}$",
         "modes": [
             {
                 "john": "office",
@@ -3032,7 +3235,7 @@
         ]
     },
     {
-        "regex": "^\\$office\\$2016\\$[0-9]\\$[0-9]{6}\\$[^$]{24}\\$[^$]{88}$",
+        "regex": "^\\$office\\$2016\\$\\d\\$\\d{6}\\$[^$]{24}\\$[^$]{88}$",
         "modes": [
             {
                 "john": null,
@@ -3046,7 +3249,7 @@
         ]
     },
     {
-        "regex": "^\\$fde\\$[0-9]{2}\\$[a-f0-9]{32}\\$[0-9]{2}\\$[a-f0-9]{32}\\$[a-f0-9]{3072}$",
+        "regex": "^\\$fde\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{2}\\$[a-f0-9]{32}\\$[a-f0-9]{3072}$",
         "modes": [
             {
                 "john": "fde",
@@ -3114,7 +3317,7 @@
         ]
     },
     {
-        "regex": "^{x-issha,\\s[0-9]{4}}[a-z0-9\\/+=]+$",
+        "regex": "^{x-issha,\\s\\d{4}}[a-z0-9\\/+=]+$",
         "modes": [
             {
                 "john": "saph",
@@ -3180,7 +3383,7 @@
         ]
     },
     {
-        "regex": "^bcrypt_sha256\\$\\$(2[axy]|2)\\$[0-9]+\\$[a-z0-9\\/.]{53}$",
+        "regex": "^bcrypt_sha256\\$\\$(2[axy]|2)\\$\\d+\\$[a-z0-9\\/.]{53}$",
         "modes": [
             {
                 "john": null,
@@ -3191,18 +3394,24 @@
         ]
     },
     {
-        "regex": "^\\$postgres\\$.[^\\*]+[*:][a-f0-9]{1,32}[*:][a-f0-9]{32}$",
+        "regex": "^\\$postgres?\\$(?:[^*]{0,32})?\\*[a-f0-9]{8}\\*[a-f0-9]{32}$",
         "modes": [
             {
                 "john": "postgres",
                 "hashcat": 11100,
                 "extended": false,
-                "name": "PostgreSQL Challenge-Response Authentication (MD5)"
+                "name": "PostgreSQL CRAM (MD5)",
+                "samples": [
+                    "$postgres$postgres*74402844*4e7fabaaf34d780c4a5822d28ee1c83e",
+                    "$postgres$postgres*f063f05d*1d586cc8d137e5f1733f234d224393e8",
+                    "$postgre$postgres*684697c8*bf2a64f35feba7bf1b633d60393c1356",
+                    "$postgres$Twelve_chars*55393156*c01df9affa7573ef32ec143759f3e005"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$siemens-s7\\$[0-9]{1}\\$[a-f0-9]{40}\\$[a-f0-9]{40}$",
+        "regex": "^\\$siemens-s7\\$\\d{1}\\$[a-f0-9]{40}\\$[a-f0-9]{40}$",
         "modes": [
             {
                 "john": "siemens-s7",
@@ -3224,7 +3433,7 @@
         ]
     },
     {
-        "regex": "^sha256[:$][0-9]+[:$][a-z0-9\\/+]+[:$][a-z0-9\\/+]{32,128}$",
+        "regex": "^sha256[:$]\\d+[:$][a-z0-9\\/+]+[:$][a-z0-9\\/+]{32,128}$",
         "modes": [
             {
                 "john": null,
@@ -3287,7 +3496,7 @@
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$pdf\\$1\\*2\\*\\d{2}\\*[-0-9]{1,6}\\*\\d\\*\\d{2}\\*[a-f0-9]{32}\\*\\d{2}\\*[a-f0-9]{64}\\*\\d{2}\\*[a-f0-9]{64}$",
         "modes": [
             {
                 "john": "pdf",
@@ -3304,7 +3513,7 @@
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$pdf\\$1\\*2\\*\\d{2}\\*[-0-9]{1,6}\\*\\d\\*\\d{2}\\*[a-f0-9]{32}\\*\\d{2}\\*[a-f0-9]{64}\\*\\d{2}\\*[a-f0-9]{64}:[a-f0-9]{10}$",
         "modes": [
             {
                 "john": "pdf",
@@ -3338,7 +3547,7 @@
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$pdf\\$5\\*[5|6]\\*\\d{3}\\*[-0-9]{1,6}\\*\\d\\*\\d{1,4}\\*[a-f0-9]{0,1024}\\*\\d{1,4}\\*[a-f0-9]{0,1024}\\*\\d{1,4}\\*[a-f0-9]{0,1024}\\*\\d{1,4}\\*[a-f0-9]{0,1024}\\*\\d{1,4}\\*[a-f0-9]{0,1024}$",
         "modes": [
             {
                 "john": "pdf",
@@ -3355,7 +3564,7 @@
         ]
     },
     {
-        "regex": "^\\$bitcoin\\$[0-9]{2,4}\\$[a-f0-9$]{250,360}$",
+        "regex": "^\\$bitcoin\\$\\d{2,4}\\$[a-f0-9$]{250,360}$",
         "modes": [
             {
                 "john": "bitcoin",
@@ -3404,7 +3613,7 @@
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$ab\\$\\d{1}\\*\\d{1}\\*\\d{1,6}\\*[a-f0-9]{128}\\*[a-f0-9]{128}\\*[a-f0-9]{32}\\*[a-f0-9]{192}$",
         "modes": [
             {
                 "john": "AndroidBackup",
@@ -3415,18 +3624,24 @@
         ]
     },
     {
-        "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\\$$",
+        "regex": "^\\$zip2\\$\\*\\d{1}\\*\\d{1}\\*\\d{1}\\*[a-f0-9]{16,32}\\*[a-f0-9]{1,6}\\*[a-f0-9]{1,6}\\*[a-f0-9]*\\*[a-f0-9]{20}\\*\\$\/zip2\\$$",
         "modes": [
             {
                 "john": "zip",
                 "hashcat": 13600,
                 "extended": false,
-                "name": "WinZip"
+                "name": "WinZip",
+                "samples": [
+                    "$zip2$*0*1*0*0675369741458183*5dc5*0**36b85538918416712640*$/zip2$",
+                    "$zip2$*0*1*0*9ffba76344938a7d*cc41*210*fb28d3fd983302058c5296c07442502ae05bb59adb9eb2378cb0841efa227cd58f7076ec00bb5faaee24c3433763d715461d4e714cdd9d933f621d2cf6ae73d824414ca2126cfc608d8fc7641d2869afa90f28be7113c71c6b6a3ad6d6633173cde9d7c1bb449cc0a1f8cbab8639255684cd25cb363234f865d9224f4065c0c62e5e60c2500bc78fa903630ccbb5816be2ef5230d411051d7bc54ecdf9dcbe500e742da2a699de0ec1f20b256dbcd506f926e91a1066a74b690f9dd50bd186d799deca428e6230957e2c6fcdcec73927d77bb49699a80e9c1540a13899ecb0b635fb728e1ade737895d3ff9babd4927bbbc296ec92bab87fd7930db6d55e74d610aef2b6ad19b7db519c0e7a257f9f78538bb0e9081c8700f7e8cd887f15a212ecb3d5a221cb8fe82a22a3258703f3c7af77ef5ecf25b4e6fb4118b00547c271d9b778b825247a4cd151bff81436997818f9d3c95155910ff152ad28b0857dcfc943e32729379c634d29a50655dc05fb63fa5f20c9c8cbdc630833a97f4f02792fcd6b1b73bfb4d333485bb0eb257b9db0481d11abfa06c2e0b82817d432341f9bdf2385ede8ca5d94917fa0bab9c2ed9d26ce58f83a93d418aa27a88697a177187e63f89904c0b9053151e30a7855252dab709aee47a2a8c098447160c8f96c56102067d9c8ffc4a74cd9011a2522998da342448b78452c6670eb7eb80ae37a96ca15f13018e16c93d515d75e792f49*bd2e946811c4c5b09694*$/zip2$",
+                    "$zip2$*0*2*0*c702895e204a15d8016cd436*7688*32*f1e0c797182c9231ebbdfb23111203131d9c949b45396f6ea233ac41c056f938a68869400bc25123bd61f8d7bd4930a6440c*3f229b45b30739ab4867*$/zip2$",
+                    "$zip2$*0*3*0*855f69693734c7be8c1093ea5bae6114*f035*210*c02aa1d42cc7623c0746979c6c2ce78e8492e9ab1d0954b76d328c52c4d555fbdc2af52822c7b6f4548fc5cca615cd0510f699d4b6007551c38b4183cafba7b073a5ba86745f0c3842896b87425d5247d3b09e0f9f701b50866e1636ef62ee20343ea6982222434fdaf2e52fe1c90f0c30cf2b4528b79abd2824e14869846c26614d9cbc156964d63041bfab66260821bedc151663adcb2c9ac8399d921ddac06c9a4cd8b442472409356cfe0655c9dbbec36b142611ad5604b68108be3321b2324d5783938e52e5c15ec4d8beb2b5010fad66d8cf6a490370ec86878ad2b393c5aa4523b95ae21f8dd5f0ae9f24581e94793a01246a4cc5a0f772e041b3a604ae334e43fe41d32058f857c227cee567254e9c760d472af416abedf8a87e67b309d30bc94d77ef6617b0867976a4b3824c0c1c4aa2b2668f9eb70c493d20d7fab69436c59e47db40f343d98a3b7503e07969d26afa92552d15009542bf2af9b47f2cfa0c2283883e99d0966e5165850663a2deed557fb8554a16f3a9cb04b9010c4b70576b18695dfea973aa4bc607069a1d90e890973825415b717c7bdf183937fa8a3aa985be1eadc8303f756ebd07f864082b775d7788ee8901bb212e69f01836d45db320ff1ea741fa8a3c13fa49ebc34418442e6bd8b1845c56d5c798767c92a503228148a6db44a08fc4a1c1d55eea73dbb2bd4f2ab09f00b043ee0df740681f5c5579ecbb1dbb7f7f3f67ffe2*c6b781ef18c5ccd83869*$/zip2$"
+                ]
             }
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$itunes_backup\\$\\*\\d{1,2}\\*[a-f0-9]{80}\\*\\d{1,6}\\*[a-f0-9]{40}\\*\\d{0,10}\\*[a-f0-9]{0,40}$",
         "modes": [
             {
                 "john": "itunes-backup",
@@ -3443,7 +3658,7 @@
         ]
     },
     {
-        "regex": "^\\$telegram\\$0\\*[a-f0-9]{64}\\*[0-9]{32}$",
+        "regex": "^\\$telegram\\$0\\*[a-f0-9]{64}\\*\\d{32}$",
         "modes": [
             {
                 "john": null,
@@ -3480,46 +3695,73 @@
         ]
     },
     {
-        "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,}$",
+        "regex": "^\\$7z\\$\\d{1,3}\\$\\d{1,2}\\$\\d{1}\\$[^$]{0,64}\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,10}\\$\\d+\\$\\d+\\$[a-f0-9]{2,}(?:\\$\\d+\\$[a-f0-9]{0,10}(?:\\$[a-f0-9]{0,10})?)?$",
         "modes": [
             {
                 "john": "7z",
                 "hashcat": 11600,
                 "extended": false,
-                "name": "7-zip"
+                "name": "7-zip",
+                "samples": [
+                    "$7z$0$14$0$$11$33363437353138333138300000000000$2365089182$16$12$d00321533b483f54a523f624a5f63269",
+                    "$7z$128$19$0$1122$8$a264c94f2cd72bec0000000000000000$725883103$112$108$64749c0963e20c74602379ca740165b9511204619859d1914819bc427b7e5f0f8fc67f53a0b53c114f6fcf4542a28e4a9d3914b4bc76baaa616d6a7ec9efc3f051cb330b682691193e6fa48159208329460c3025fb273232b82450645f2c12a9ea38b53a2331a1d0858813c8bf25a831",
+                    "$7z$1$19$0$1122$8$732b59fd26896e410000000000000000$2955316379$192$183$7544a3a7ec3eb99a33d80e57907e28fb8d0e140ec85123cf90740900429136dcc8ba0692b7e356a4d4e30062da546a66b92ec04c64c0e85b22e3c9a823abef0b57e8d7b8564760611442ecceb2ca723033766d9f7c848e5d234ca6c7863a2683f38d4605322320765938049305655f7fb0ad44d8781fec1bf7a2cb3843f269c6aca757e509577b5592b60b8977577c20aef4f990d2cb665de948004f16da9bf5507bf27b60805f16a9fcc4983208297d3affc4455ca44f9947221216f58c337f$232$5d00000100",
+                    "$7z$0$19$0$1122$8$d1f50227759415890000000000000000$1412385885$112$112$5e5b8b734adf52a64c541a5a5369023d7cccb78bd910c0092535dfb013a5df84ac692c5311d2e7bbdc580f5b867f7b5dd43830f7b4f37e41c7277e228fb92a6dd854a31646ad117654182253706dae0c069d3f4ce46121d52b6f20741a0bb39fc61113ce14d22f9184adafd6b5333fb1",
+                    "$7z$0$19$0$1122$8$d1f50227759415890000000000000000$1412385885$112$112$5e5b8b734adf52a64c541a5a5369023d7cccb78bd910c0092535dfb013a5df84ac692c5311d2e7bbdc580f5b867f7b5dd43830f7b4f37e41c7277e228fb92a6dd854a31646ad117654182253706dae0c069d3f4ce46121d52b6f20741a0bb39fc61113ce14d22f9184adafd6b5333fb1",
+                    "$7z$7$19$0$$8$8a9fc71fabb004c40000000000000000$1263025034$32$29$f84a72524bf817740f312a33e71d32bfa27f3652706d3e9590a118f70aca7757$24$",
+                    "$7z$129$19$0$$16$e69f6cbb583ea5fe2bd2fa577bf35d7c$1528797878$64$51$aef4bf018d0340cf086526f856a95526e4d587799f3c9adaa57bee6f7086e1eebae13ec751deee6ec6e343ef0a6171ba6b608433461235ef2fcbb8ead742d9ca$658$5d00100000$05",
+                    "$7z$1$19$0$1122$8$5fdbec1569ff58060000000000000000$2465353234$112$112$58ba7606aafc7918e3db7f6e0920f410f61f01e9c1533c40850992fee4c5e5215bc6b4ea145313d0ac065b8ec5b47d9fb895bb7f97609be46107d71e219544cfd24b52c2ecd65477f72c466915dcd71b80782b1ac46678ab7f437fd9f7b8e9d9fad54281d252de2a7ae386a65fc69eda$176$5d00000100",
+                    "$7z$2$19$0$$8$055c46385a7995490000000000000000$1263025034$32$28$1abc552f80372f1c1fea1bab9583599b844b25f0b06afacfbf322ef3d396126a$24$00",
+                    "$7z$128$19$0$1122$8$94fb9024fdd3e6c40000000000000000$3965424295$112$99$1127828817ff126bc45ff3c5225d9d0c5d00a52094909674e6ed3dc431546d9a672738f2fa07556340d604d2efd2901b9d2ac2c0686c25af9c520c137b16c50c54df8703fd0b0606fa721ad70aafb9c4e3b288ef49864e6034021969b4ce11e3b8e269a92090ccf593c6a0da06262116",
+                    "$7z$128$19$0$1122$8$e24e93c7a9ebde080000000000000000$718561925$112$99$580bf36388526c932c22e3227b51774b6963a9c5b96fc8e2ac70a4302864fa88f50e7c00d9a79e0bca0f07a236e51200dc23435b7680e6fa99b19d790ac093af615a972f8b232686c21279234a2582f9714c5a1a2d326084158eba3e81b4f8ad40784d84baa8ddbed19f1c6603156d2c",
+                    "$7z$128$19$0$1122$8$6fbd519735b131710000000000000000$1248418560$112$99$cc9e3c97073d7fd37f04d4e6983b386e3ac00f6292dedb0f566dccf22cdbbb55fee8669edade383e96aa0a740e2b42aa7fddbe5831cac10828c624ee03a1a256c6e777c3d714c55296cb815c509a252b9426fe8d4566c944efe3fac5ea94910e55a390aef2c729a031e832c406049810"
+                ]
             }
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$zip3\\$\\*\\d\\*\\d\\*128\\*\\d\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*\\d\\*\\d\\*\\d\\*[^\\s]{0,64}$",
         "modes": [
             {
                 "john": "securezip",
                 "hashcat": 23001,
                 "extended": false,
-                "name": "SecureZIP AES-128"
+                "name": "SecureZIP AES-128",
+                "samples": [
+                    "$zip3$*0*1*128*0*b4630625c92b6e7848f6fd86*df2f62611b3d02d2c7e05a48dad57c7d93b0bac1362261ab533807afb69db856676aa6e350320130b5cbf27c55a48c0f75739654ac312f1cf5c37149557fc88a92c7e3dde8d23edd2b839036e88092a708b7e818bf1b6de92f0efb5cce184cceb11db6b3ca0527d0bdf1f1137ee6660d9890928cd80542ac1f439515519147c14d965b5ba107c6227f971e3e115170bf*0*0*0*file.txt"
+                ]
             }
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$zip3\\$\\*\\d\\*\\d\\*192\\*\\d\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*\\d\\*\\d\\*\\d\\*[^\\s]{0,64}$",
         "modes": [
             {
                 "john": "securezip",
                 "hashcat": 23002,
                 "extended": false,
-                "name": "SecureZIP AES-192"
+                "name": "SecureZIP AES-192",
+                "samples": [
+                    "$zip3$*0*1*192*0*53ff2de8c280778e1e0ab997*603eb37dbab9ea109e2c405e37d8cae1ec89e1e0d0b9ce5bf55d1b571c343b6a3df35fe381c30249cb0738a9b956ba8e52dfc5552894296300446a771032776c811ff8a71d9bb3c4d6c37016c027e41fea2d157d5b0ce17804b1d7c1606b7c1121d37851bd705e001f2cd755bbf305966d129a17c1d48ff8e87cfa41f479090cd456527db7d1d43f9020ad8e73f851a5*0*0*0*file.txt",
+                    "$zip3$*0*1*192*0*edb47a990800000000000000*ba4288c0572f6043b21eba768ca8854fbec62c644f29cdc9652f037b3600dcc761dd07645cbaa1ebec1140e21e19a1cf4b43a82cb47e71e6ac82d3387581996e3fb201328dd5ad8a5be841e2cc9bee7e940da5b55b8a385df87d2431e24baf9a050ea550bd8ea00d2271f9e9d06b32222b8e5815a9db7e75655937c8437332b5b5b08e4c1800976b528322df6ba9653e*0*0*0*secret.txt",
+                    "$zip3$*0*1*192*0*a5763deec28f57f7c3218289*7c789a396b6935a2595da1045728aec01572ed0834bc0baa1ab43a186265be83135359ddf2e2f1a2c42f88879617922687131720e8238b006ba10f1caead1d6fbcabbacf32bc3aeda76747d26671f3a94f2037b330a3a790eb72564b05e064747e042c3112d42e739907fdded43c5c4fbf1a5f831cf77bb47f838c75d30a95215b6457a0d4ffc6d408da6be86a04c0d2*0*0*0*1"
+                ]
             }
         ]
     },
     {
-        "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}$",
+        "regex": "^\\$zip3\\$\\*\\d\\*\\d\\*256\\*\\d\\*[a-f0-9]{0,32}\\*[a-f0-9]{288}\\*\\d\\*\\d\\*\\d\\*[^\\s]{0,64}$",
         "modes": [
             {
                 "john": "securezip",
                 "hashcat": 23003,
                 "extended": false,
-                "name": "SecureZIP AES-256"
+                "name": "SecureZIP AES-256",
+                "samples": [
+                    "$zip3$*0*1*256*0*39bff47df6152a0214d7a967*65ff418ffb3b1198cccdef0327c03750f328d6dd5287e00e4c467f33b92a6ef40a74bb11b5afad61a6c3c9b279d8bd7961e96af7b470c36fc186fd3cfe059107021c9dea0cf206692f727eeca71f18f5b0b6ee1f702b648bba01aa21c7b7f3f0f7d547838aad46868155a04214f22feef7b31d7a15e1abe6dba5e569c62ee640783bb4a54054c2c69e93ece9f1a2af9d*0*0*0*file.txt",
+                    "$zip3$*0*1*256*0*edb47a990800000000000000*32f884f9fbb54360920a50ec37cc0651fe7b0d9892de44eed17696186139a09c1530e0522abfd9777d18441739cdc7107fdfd252ecd0c8dbbba8181bd09436e9a6a918e385cbab26bee49cd0e3182e67df3fe8c3cdc9e58d6166a0f550969cc456b4a881524e6e66a14e30196b972e260c509fce918736465aea1d00bd5871876e263635be4700ef081117ed896e1504*0*0*0*secret.txt",
+                    "$zip3$*0*1*256*0*3f2f7f230e00000000000000*c75ed4a3ec89c22cda7aa3faa9a11cdcca9f5a2f45fe2844d963b2b76b8f98f43a907997557fc2b0eb8cb590b130c573ddfac3f5e70997d6a4539e10728317bdcd70eb74b82bafa2e4871488984db8522c4c4c8ff28fd2dd62c26be9d24246f80ddbdfa8d3b9e81b775dbdb84371446564df3effdbea48713dd223a2bb9afddffc9b8e60f41939f7577f9f30b0a28b78*0*0*0*code.txt"
+                ]
             }
         ]
     },
@@ -3528,14 +3770,56 @@
         "modes": [
             {
                 "john": "pkzip",
-                "hashcat": null,
+                "hashcat": 17200,
                 "extended": false,
-                "name": "PKZIP"
+                "name": "PKZIP (Compressed)",
+                "samples": [
+                    "$pkzip2$1*1*2*0*e3*1c5*eda7a8de*0*28*8*e3*eda7*5096*a9fc1f4e951c8fb3031a6f903e5f4e3211c8fdc4671547bf77f6f682afbfcc7475d83898985621a7af9bccd1349d1976500a68c48f630b7f22d7a0955524d768e34868880461335417ddd149c65a917c0eb0a4bf7224e24a1e04cf4ace5eef52205f4452e66ded937db9545f843a68b1e84a2e933cc05fb36d3db90e6c5faf1bee2249fdd06a7307849902a8bb24ec7e8a0886a4544ca47979a9dfeefe034bdfc5bd593904cfe9a5309dd199d337d3183f307c2cb39622549a5b9b8b485b7949a4803f63f67ca427a0640ad3793a519b2476c52198488e3e2e04cac202d624fb7d13c2*$/pkzip2$",
+                    "$pkzip$1*1*2*0*e4*1c5*eda7a8de*0*4c*8*e4*eda7*194883130e4c7419bd735c53dec36f0c4b6de6daefea0f507d67ff7256a49b5ea93ccfd9b12f2ee99053ee0b1c9e1c2b88aeaeb6bd4e60094a1ea118785d4ded6dae94cade41199330f4f11b37cba7cda5d69529bdfa43e2700ba517bd2f7ff4a0d4b3d7f2559690ec044deb818c44844d6dd50adbebf02cec663ae8ebb0dde05d2abc31eaf6de36a2fc19fda65dd6a7e449f669d1f8c75e9daa0a3f7be8feaa43bf84762d6dbcc9424285a93cedfa3a75dadc11e969065f94fe3991bc23c9b09eaa5318aa29fa02e83b6bee26cafec0a5e189242ac9e562c7a5ed673f599cefcd398617*$/pkzip$",
+                    "$pkzip$1*2*2*0*e4*1c5*eda7a8de*0*47*8*e4*4bb6*436c9ffa4328870f6272349b591095e1b1126420c3041744650282bc4f575d0d4a5fc5fb34724e6a1cde742192387b9ed749ab5c72cd6bb0206f102e9216538f095fb773661cfde82c2e2a619332998124648bf4cd0da56279f0c297567d9b5d684125ee92920dd513fd18c27afba2a9633614f75d8f8b9a14095e3fafe8165330871287222e6681dd9c0f830cf5d464457b257d0900eed29107fad8af3ac4f87cf5af5183ff0516ccd9aeac1186006c8d11b18742dfb526aadbf2906772fbfe8fb18798967fd397a724d59f6fcd4c32736550986d227a6b447ef70585c049a1a4d7bf25*$/pkzip$"
+                ]
+            },
+            {
+                "john": "pkzip",
+                "hashcat": 17210,
+                "extended": false,
+                "name": "PKZIP (Uncompressed)",
+                "samples": [
+                    "$pkzip2$1*1*2*0*1d1*1c5*eda7a8de*0*28*0*1d1*eda7*5096*1dea673da43d9fc7e2be1a1f4f664269fceb6cb88723a97408ae1fe07f774d31d1442ea8485081e63f919851ca0b7588d5e3442317fff19fe547a4ef97492ed75417c427eea3c4e146e16c100a2f8b6abd7e5988dc967e5a0e51f641401605d673630ea52ebb04da4b388489901656532c9aa474ca090dbac7cf8a21428d57b42a71da5f3d83fed927361e5d385ca8e480a6d42dea5b4bf497d3a24e79fc7be37c8d1721238cbe9e1ea3ae1eb91fc02aabdf33070d718d5105b70b3d7f3d2c28b3edd822e89a5abc0c8fee117c7fbfbfd4b4c8e130977b75cb0b1da080bfe1c0859e6483c42f459c8069d45a76220e046e6c2a2417392fd87e4aa4a2559eaab3baf78a77a1b94d8c8af16a977b4bb45e3da211838ad044f209428dba82666bf3d54d4eed82c64a9b3444a44746b9e398d0516a2596d84243b4a1d7e87d9843f38e45b6be67fd980107f3ad7b8453d87300e6c51ac9f5e3f6c3b702654440c543b1d808b62f7a313a83b31a6faaeedc2620de7057cd0df80f70346fe2d4dccc318f0b5ed128bcf0643e63d754bb05f53afb2b0fa90b34b538b2ad3648209dff587df4fa18698e4fa6d858ad44aa55d2bba3b08dfdedd3e28b8b7caf394d5d9d95e452c2ab1c836b9d74538c2f0d24b9b577*$/pkzip2$"
+                ]
+            },
+            {
+                "john": "pkzip",
+                "hashcat": 17220,
+                "extended": false,
+                "name": "PKZIP (Compressed Multi-File)",
+                "samples": [
+                    "$pkzip2$3*1*1*0*8*24*a425*8827*d1730095cd829e245df04ebba6c52c0573d49d3bbeab6cb385b7fa8a28dcccd3098bfdd7*1*0*8*24*2a74*882a*51281ac874a60baedc375ca645888d29780e20d4076edd1e7154a99bde982152a736311f*2*0*e3*1c5*eda7a8de*0*29*8*e3*eda7*5096*1455781b59707f5151139e018bdcfeebfc89bc37e372883a7ec0670a5eafc622feb338f9b021b6601a674094898a91beac70e41e675f77702834ca6156111a1bf7361bc9f3715d77dfcdd626634c68354c6f2e5e0a7b1e1ce84a44e632d0f6e36019feeab92fb7eac9dda8df436e287aafece95d042059a1b27d533c5eab62c1c559af220dc432f2eb1a38a70f29e8f3cb5a207704274d1e305d7402180fd47e026522792f5113c52a116d5bb25b67074ffd6f4926b221555234aabddc69775335d592d5c7d22462b75de1259e8342a9ba71cb06223d13c7f51f13be2ad76352c3b8ed*$/pkzip2$",
+                    "$pkzip$3*1*1*0*8*24*4001*8986ec4d693e86c1a42c1bd2e6a994cb0b98507a6ec937fe0a41681c02fe52c61e3cc046*1*0*8*24*4003*a087adcda58de2e14e73db0043a4ff0ed3acc6a9aee3985d7cb81d5ddb32b840ea2057d9*2*0*e4*1c5*eda7a8de*0*4c*8*e4*eda7*89a792af804bf38e31fdccc8919a75ab6eb75d1fd6e7ecefa3c5b9c78c3d50d656f42e582af95882a38168a8493b2de5031bb8b39797463cb4769a955a2ba72abe48ee75b103f93ef9984ae740559b9bd84cf848d693d86acabd84749853675fb1a79edd747867ef52f4ee82435af332d43f0d0bb056c49384d740523fa75b86a6d29a138da90a8de31dbfa89f2f6b0550c2b47c43d907395904453ddf42a665b5f7662de170986f89d46d944b519e1db9d13d4254a6b0a5ac02b3cfdd468d7a4965e4af05699a920e6f3ddcedb57d956a6b2754835b14e174070ba6aec4882d581c9f30*$/pkzip$"
+                ]
+            },
+            {
+                "john": "pkzip",
+                "hashcat": 17225,
+                "extended": false,
+                "name": "PKZIP (Mixed Multi-File)",
+                "samples": [
+                    "$pkzip2$3*1*1*0*0*24*3e2c*3ef8*0619e9d17ff3f994065b99b1fa8aef41c056edf9fa4540919c109742dcb32f797fc90ce0*1*0*8*24*431a*3f26*18e2461c0dbad89bd9cc763067a020c89b5e16195b1ac5fa7fb13bd246d000b6833a2988*2*0*23*17*1e3c1a16*2e4*2f*0*23*1e3c*3f2d*54ea4dbc711026561485bbd191bf300ae24fa0997f3779b688cdad323985f8d3bb8b0c*$/pkzip2$"
+                ]
+            },
+            {
+                "john": "pkzip",
+                "hashcat": 17230,
+                "extended": false,
+                "name": "PKZIP (Mixed Multi-File Checksum-Only)",
+                "samples": [
+                    "$pkzip2$8*1*1*0*8*24*a425*8827*3bd479d541019c2f32395046b8fbca7e1dca218b9b5414975be49942c3536298e9cc939e*1*0*8*24*2a74*882a*537af57c30fd9fd4b3eefa9ce55b6bff3bbfada237a7c1dace8ebf3bb0de107426211da3*1*0*8*24*2a74*882a*5f406b4858d3489fd4a6a6788798ac9b924b5d0ca8b8e5a6371739c9edcfd28c82f75316*1*0*8*24*2a74*882a*1843aca546b2ea68bd844d1e99d4f74d86417248eb48dd5e956270e42a331c18ea13f5ed*1*0*8*24*2a74*882a*aca3d16543bbfb2e5d2659f63802e0fa5b33e0a1f8ae47334019b4f0b6045d3d8eda3af1*1*0*8*24*2a74*882a*fbe0efc9e10ae1fc9b169bd060470bf3e39f09f8d83bebecd5216de02b81e35fe7e7b2f2*1*0*8*24*2a74*882a*537886dbabffbb7cac77deb01dc84760894524e6966183b4478a4ef56f0c657375a235a1*1*0*8*24*eda7*5096*40eb30ef1ddd9b77b894ed46abf199b480f1e5614fde510855f92ae7b8026a11f80e4d5f*$/pkzip2$"
+                ]
             }
         ]
     },
     {
-        "regex": "^\\$argon2d\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "regex": "^\\$argon2d\\$v=19\\$m=\\d{1,6},t=\\d{1,2},p=\\d{1,2}\\$[^$]+\\$[^\\s]{6,}$",
         "modes": [
             {
                 "john": "argon2",
@@ -3552,7 +3836,7 @@
         ]
     },
     {
-        "regex": "^\\$argon2i\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "regex": "^\\$argon2i\\$v=19\\$m=\\d{1,6},t=\\d{1,2},p=\\d{1,2}\\$[^$]+\\$[^\\s]{6,}$",
         "modes": [
             {
                 "john": "argon2",
@@ -3569,7 +3853,7 @@
         ]
     },
     {
-        "regex": "^\\$argon2id\\$v=19\\$m=[0-9]{1,6},t=[0-9]{1,2},p=[0-9]{1,2}\\$[^$]+\\$[^\\s]{6,}$",
+        "regex": "^\\$argon2id\\$v=19\\$m=\\d{1,6},t=\\d{1,2},p=\\d{1,2}\\$[^$]+\\$[^\\s]{6,}$",
         "modes": [
             {
                 "john": null,
@@ -3580,7 +3864,7 @@
         ]
     },
     {
-        "regex": "^\\$axcrypt\\$\\*2\\*[0-9]{1,7}\\*[a-f0-9]{128}\\*[a-f0-9]{288}\\*[0-9]{1,7}\\*[a-f0-9]{64}$",
+        "regex": "^\\$axcrypt\\$\\*2\\*\\d{1,7}\\*[a-f0-9]{128}\\*[a-f0-9]{288}\\*\\d{1,7}\\*[a-f0-9]{64}$",
         "modes": [
             {
                 "john": "axcrypt",
@@ -3596,7 +3880,7 @@
         ]
     },
     {
-        "regex": "^\\$axcrypt\\$\\*1\\*[0-9]{1,7}\\*[a-f0-9]{32}\\*[a-f0-9]{48}(?:\\*[a-z0-9]+)?$",
+        "regex": "^\\$axcrypt\\$\\*1\\*\\d{1,7}\\*[a-f0-9]{32}\\*[a-f0-9]{48}(?:\\*[a-z0-9]+)?$",
         "modes": [
             {
                 "john": "axcrypt",
@@ -3613,7 +3897,7 @@
         ]
     },
     {
-        "regex": "^\\$rar5\\$[0-9]{2}\\$[a-f0-9]{32}\\$[0-9]{2}\\$[a-f0-9]{32}\\$[0-9]{1}\\$[a-f0-9]{16}$",
+        "regex": "^\\$rar5\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1}\\$[a-f0-9]{16}$",
         "modes": [
             {
                 "john": "rar5",
@@ -3629,7 +3913,7 @@
         ]
     },
     {
-        "regex": "^\\$RAR3\\$\\*[0-9]{1}\\*[a-f0-9]{16}\\*[a-f0-9]{8}\\*[0-9]{1,7}\\*[0-9]{1,6}\\*[0-9]{1}\\*[a-f0-9]{2,}\\*[0-9]{2}$",
+        "regex": "^\\$RAR3\\$\\*\\d{1}\\*[a-f0-9]{16}\\*[a-f0-9]{8}\\*\\d{1,7}\\*\\d{1,6}\\*\\d{1}\\*[a-f0-9]{2,}\\*\\d{2}$",
         "modes": [
             {
                 "john": "rar",
@@ -3654,7 +3938,7 @@
         ]
     },
     {
-        "regex": "^\\$RAR3\\$\\*[0-9]{1}\\*[a-f0-9]{16}\\*[a-f0-9]{32}$",
+        "regex": "^\\$RAR3\\$\\*\\d{1}\\*[a-f0-9]{16}\\*[a-f0-9]{32}$",
         "modes": [
             {
                 "john": "rar",
@@ -3684,7 +3968,7 @@
         ]
     },
     {
-        "regex": "^\\$metamask\\$(?=.{44}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=.{24}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=.{64,})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
+        "regex": "^\\$metamask\\$(?=[^$]{44}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=[^$]{24}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=[^$]{64,})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
         "modes": [
             {
                 "john": null,
@@ -3757,7 +4041,7 @@
         ]
     },
     {
-        "regex": "^\\$mongodb-scram\\$\\*\\d\\*(?=.{0,76}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*\\d{1,7}\\*(?=.{24}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*(?=.{28})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
+        "regex": "^\\$mongodb-scram\\$\\*\\d\\*(?=[^*]{0,76}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*\\d{1,7}\\*(?=[^*]{24}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*(?=[^*]{28})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
         "modes": [
             {
                 "john": null,
@@ -3771,7 +4055,7 @@
         ]
     },
     {
-        "regex": "^\\$mongodb-scram\\$\\*\\d\\*(?=.{0,88}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*\\d{1,7}\\*(?=.{40}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*(?=.{44})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
+        "regex": "^\\$mongodb-scram\\$\\*\\d\\*(?=[^*]{0,88}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*\\d{1,7}\\*(?=[^*]{40}\\*)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\*(?=[^*]{44})(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
         "modes": [
             {
                 "john": null,
@@ -3861,7 +4145,7 @@
         ]
     },
     {
-        "regex": "^\\$stellar\\$(?=.{24}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=.{16}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=.{96}$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
+        "regex": "^\\$stellar\\$(?=[^$]{24}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=[^$]{16}\\$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))\\$(?=[^$]{96}$)(?:[a-z0-9+\\/]{4})*(?:|(?:[a-z0-9+\\/]{3}=)|(?:[a-z0-9+\\/]{2}==)|(?:[a-z0-9+\\/]{1}===))$",
         "modes": [
             {
                 "john": null,
@@ -4198,5 +4482,373 @@
                 ]
             }
         ]
+    },
+    {
+        "regex": "^v1;PPH1_MD4,[a-f0-9]{20},\\d{1,6},[a-f0-9]{64};?$",
+        "modes": [
+            {
+                "john": "azuread",
+                "hashcat": 12800,
+                "extended": false,
+                "name": "AzureAD (MS-AzureSync) PBKDF2-HMAC-SHA256",
+                "samples": [
+                    "v1;PPH1_MD4,54188415275183448824,100,55b530f052a9af79a7ba9c466dddcb8b116f8babf6c3873a51a3898fb008e123",
+                    "v1;PPH1_MD4,724b754c4b6d30526f36,100,367ff0ac2a1cb334bb26609c8bfc8ae5f619d1eaf07568df040f407504a20241;",
+                    "v1;PPH1_MD4,465564476f786e705069,100,612a80cb011bee1f929c7a9e2bd16d98a79f2deb9f44919100f7c0ec74508560;",
+                    "v1;PPH1_MD4,31414275383876386e32,100,102ce242cde4339e934d7c6b539d49ae340b02dd380815666b98bd036cd4dc4f;"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$response\\$[a-f0-9]{32}\\$.+\\$.+\\$.+\\$.+\\$.+(?:\\$\\d{8}\\$[a-f0-9]{4,16}\\$.+)?$",
+        "modes": [
+            {
+                "john": "hdaa",
+                "hashcat": null,
+                "extended": false,
+                "name": "HTTP Digest access authentication",
+                "samples": [
+                    "$response$679066476e67b5c7c4e88f04be567f8b$user$myrealm$GET$/$8c12bd8f728afe56d45a0ce846b70e5a$00000001$4b61913cec32e2c9$auth",
+                    "$response$faa6cb7d676e5b7c17fcbf966436aa0c$moi$myrealm$GET$/$af32592775d27b1cd06356b3a0db9ddf$00000001$8e1d49754a25aea7$auth",
+                    "$response$56940f87f1f53ade8b7d3c5a102c2bf3$usrx$teN__chars$GET$/4TLHS1TMN9cfsbqSUAdTG3CRq7qtXMptnYfn7mIIi3HRKOMhOks56e$2c0366dcbc$00000001$0153$auth",
+                    "$response$8663faf2337dbcb2c52882807592ec2c$user$myrealm$GET$/$8c12bd8f728afe56d45a0ce846b70e5a$",
+                    "$response$8663faf2337dbcb2c52882807592ec2c$user$myrealm$GET$/$8c12bd8f728afe56d45a0ce846b70e5a",
+                    "$response$b9b9cb1fcce017ec497b31cc33a572b0$lulu$hyperion$GET$/$IERozb5mBQA=de6a5916efca4c24959b5be7e4ed3fc0c7f1f765$00000006$1bd5678ca084bc0d$auth",
+                    "$response$abe32fa35969fd6d77bad0ce3dbfdd3a$lulu$hyperion$GET$/icons/poweredby.png$XkZ1Dr9mBQA=6258d402c7c95b352bab0ba774d6974506e3318b$00000003$bd29e3b874427c73$auth"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$IPB2\\$[a-f0-9]{2,}\\$[a-f0-9]{32}$",
+        "modes": [
+            {
+                "john": "ipb2",
+                "hashcat": null,
+                "extended": false,
+                "name": "IPB 2.x (Invision Power Board)",
+                "samples": [
+                    "$IPB2$2e75504633$d891f03a7327639bc632d62a7f302604",
+                    "$IPB2$735a213a4e$4f23de7bb115139660db5e953153f28a",
+                    "$IPB2$5d75343455$de98ba8ca7bb16f43af05e9e4fb8afee",
+                    "$IPB2$556c576c39$16d4f29c71b05bd75e61d0254800bfa3"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$AWS-Sig-v4\\$0\\$[^$]{16}\\$[^$]{1,16}\\$[^$]{1,16}\\$[a-f0-9]{64}\\$[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28700,
+                "extended": false,
+                "name": "Amazon AWS4-HMAC-SHA256",
+                "samples": [
+                    "$AWS-Sig-v4$0$20220221T000000Z$us-east-1$s3$421ab6e4af9f49fa30fa9c253fcfeb2ce91668e139e6b23303c5f75b04f8a3c4$3755ed2bc1b2346e003ccaa7d02ae8b73c72bcbe9f452ccf066c78504d786bbb"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^[a-z0-9]{26,34}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28501,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2PKH), compressed",
+                "samples": [
+                    "1Jv6EonXm9x4Dw4QjEPAhGfmzFxTL7b3Zj"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 28502,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2PKH), uncompressed",
+                "samples": [
+                    "1L9nr4GX4Zmd7gDL1UT75QPUqxSgNTvdHb"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^bc1[a-z0-9]{39}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28503,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2WPKH, Bech32), compressed",
+                "samples": [
+                    "bc1qxd76a5zamfyw0g2d2rxkdh0zt9m0uzmxmwjf0q"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 28504,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2WPKH, Bech32), uncompressed",
+                "samples": [
+                    "bc1qv8e65p73gmp4w3z6fqnyu8t6ct69vetsda3snd"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^[a-z0-9]{34}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28505,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2SH(P2WPKH)), compressed",
+                "samples": [
+                    "3H1YvmSdrjEfj9LvtiKJ8XiYq5htJRuejA"
+                ]
+            },
+            {
+                "john": null,
+                "hashcat": 28506,
+                "extended": false,
+                "name": "Bitcoin WIF private key (P2SH(P2WPKH)), uncompressed",
+                "samples": [
+                    "3LovFVx5zBRvusVcj7pf3JxV9V46kjKhKu"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$DPAPImk\\$1\\*[12]\\*[S\\-0-9]{10,60}\\*[^*]{4,6}\\*[^*]{4,6}\\*\\d{1,6}\\*[a-f0-9]{32}\\*\\d{1,6}\\*[a-f0-9]{0,1024}$",
+        "modes": [
+            {
+                "john": "DPAPImk",
+                "hashcat": 15300,
+                "extended": false,
+                "name": "DPAPI masterkey file v1 (context 1 and 2)",
+                "samples": [
+                    "$DPAPImk$1*1*S-15-21-466364039-425773974-453930460-1925*des3*sha1*24000*b038489dee5ad04e3e3cab4d957258b5*208*cb9b5b7d96a0d2a00305ca403d3fd9c47c561e35b4b2cf3aebfd1d3199a6481d56972be7ebd6c291b199e6f1c2ffaee91978706737e9b1209e6c7d3aa3d8c3c3e38ad1ccfa39400d62c2415961c17fd0bd6b0f7bbd49cc1de1a394e64b7237f56244238da8d37d78",
+                    "$DPAPImk$1*1*S-15-21-447321867-460417387-480872410-1240*des3*sha1*24000*9b49e2d3b25103d03e936fdf66b94d26*208*ec96025ed4b023ebfa52bdfd91dfeb64edf3f3970b347ee8bb8adfb2a686a0a34792d40074edd372f346da8fcd02cc5d4182c2fd09f4549ec106273926edd05c42e4b5fc8b8758a7c48f6ddae273f357bcb645c8ad16e3161e8a9dbb5002454f4db5ef0d5d7a93ac",
+                    "$DPAPImk$1*2*S-15-21-458698633-447735394-485599537-1788*des3*sha1*24000*96b957d9bf0f8846399e70a84431b595*208*0ee9fa2baf2cf0efda81514376aef853c6c93a5776fa6af66a869f44c50ac80148b7488f52b4c52c305e89a497a583e17cca4a9bab580668a8a5ce2eee083382c98049e481e47629b5815fb16247e3bbfa62c454585aaaf51ef15555a355fcf925cff16c0bb006f8",
+                    "$DPAPImk$1*1*S-1-5-21-1482476501-1659004503-725345543-1003*des3*sha1*4000*b3d62a0b06cecc236fe3200460426a13*208*d3841257348221cd92caf4427a59d785ed1474cab3d0101fc8d37137dbb598ff1fd2455826128b2594b846934c073528f8648d750d3c8e6621e6f706d79b18c22f172c0930d9a934de73ea2eb63b7b44810d332f7d03f14d1c153de16070a5cab9324da87405c1c0"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$DPAPImk\\$1\\*3\\*[S\\-0-9]{10,60}\\*[^*]{4,6}\\*[^*]{4,6}\\*\\d{1,6}\\*[a-f0-9]{32}\\*\\d{1,6}\\*[a-f0-9]{0,1024}$",
+        "modes": [
+            {
+                "john": "DPAPImk",
+                "hashcat": 15310,
+                "extended": false,
+                "name": "DPAPI masterkey file v1 (context 3)",
+                "samples": [
+                    "$DPAPImk$1*3*S-15-21-407415836-404165111-436049749-1915*des3*sha1*14825*3e86e7d8437c4d5582ff668a83632cb2*208*96ad763b59e67c9f5c3d925e42bbe28a1412b919d1dc4abf03b2bed4c5c244056c14931d94d441117529b7171dfd6ebbe6eecf5d958b65574c293778fbadb892351cc59d5c65d65d2fcda73f5b056548a4a5550106d03d0c39d3cca7e5cdc0d521f48ac9e51cecc5",
+                    "$DPAPImk$1*3*S-1-5-21-1857904334-2267218879-1458651445-1123*des3*sha1*18000*e4c529ba8975e4ed56f5fb8b1e85be43*208*af96b391f1d6e2d37a4de3b4c412ce78f032d446d77ea1fb6a0782f47c390c844349c2bcaeba9fd570b39def6f67a369aa2e266e8d017689d8a09667fdfb640feb3e19ca22067cc5704644c1dcc43d4cccac667391f4918d0de77f36569fd2e104ef0619a46edcfc"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$DPAPImk\\$2\\*[12]\\*[S\\-0-9]{10,60}\\*[^*]{4,6}\\*[^*]{4,6}\\*\\d{1,6}\\*[a-f0-9]{32}\\*\\d{1,6}\\*[a-f0-9]{0,1024}$",
+        "modes": [
+            {
+                "john": "DPAPImk",
+                "hashcat": 15900,
+                "extended": false,
+                "name": "DPAPI masterkey file v2 (context 1 and 2)",
+                "samples": [
+                    "$DPAPImk$2*1*S-15-21-439882973-489230393-482956683-1522*aes256*sha512*12900*79f7ca399f2626e21aad108c3922af7c*288*c47bc8a985ca6aa708b01c97b004bff20cc52379dc2635b4acf59ce17970a2cb47ace98c7e8de977f265243c5c03d0a97e4b954b494d9e38d9158d0c1e729d16a28ba69e2e7c6c3bc0e3afc9c9b6306b83372ccb35d89b98925728fd36315b8ee95b4d4eccdcb31564769f9a4b9ee10828184e16d4af336675d5e31d987dd87233d34fbbb98880c5e1f64cbb9b043ad8",
+                    "$DPAPImk$2*1*S-15-21-417226446-481759312-475941522-1494*aes256*sha512*8000*1e6b7a71a079bc12e71c75a6bcfd865c*288*5b5d651e538e5185f7d6939ba235ca2d8a2b9726a6e95b59844320ba1d1f22282527210bc784d22075e596d113927761a644ad4057cb4dbb497bd64ee6c630930a4ba388eadb59484ec2be7fb4cc79299a87f341d002d25b5b187c71fa19417ec9d1b65568a79c962cb3b5bcb1b8df5f968669af35eec5a24ed5dcee46deef42bfee5ad665dd4de56ccd9c6ba26b2acd",
+                    "$DPAPImk$2*2*S-15-21-402916398-457068774-444912990-1699*aes256*sha512*17000*4c51109a901e4be7f1e208f82a56e690*288*bb80d538ac4185eb0382080fda0d405bb74da3a6b98e96f222292b819fa9168cf1571e9bc9c698ad10daf850ab34de1a1765cfd5c0fb8a63a413a767d241dfe6355804af259d24f6be7282daac0a9e02d7fbe20675afb3733141995990a6d11012edfb7e81b49c0e1132dbc4503dd2206489e4f512e4fe9d573566c9d8973188b8d1a87610b8bef09e971270a376a52b"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$DPAPImk\\$2\\*3\\*[S\\-0-9]{10,60}\\*[^*]{4,6}\\*[^*]{4,6}\\*\\d{1,6}\\*[a-f0-9]{32}\\*\\d{1,6}\\*[a-f0-9]{0,1024}$",
+        "modes": [
+            {
+                "john": "DPAPImk",
+                "hashcat": 15910,
+                "extended": false,
+                "name": "DPAPI masterkey file v2 (context 3)",
+                "samples": [
+                    "$DPAPImk$2*3*S-15-21-464497560-472124119-475628788-1088*aes256*sha512*13450*685165fdb6d0627a15100215ec331ed8*288*7e1ea6f7ec3c2111f2a3903c73aefe66e524d8b241dc1482d0bd07cc1f3ccdadd8cebd4263b3b7c2496da48f40d2eb4890513e6624aeefbe6bbc6ea73f2f71fecf9cc5fef3891a2e697a4415ba7a069642069c142335d53cc750d42a4f4d2b0592956b4a0e57a5d5b1bfd27f0a8eac9d0d5fc5c5e5e23af18ce1a8eff442ed335e5db3bad6e89146f71aa9351e132fd9"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^EXODUS:\\d{1,6}:\\d{1,6}:\\d{1,6}:(?=[^:]{44})(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===)):(?=[^:]{16})(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===)):(?=[^:]{44})(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===)):(?=[^:]{24})(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28200,
+                "extended": false,
+                "name": "Exodus Desktop Wallet (scrypt)",
+                "samples": [
+                    "EXODUS:16384:8:1:IYkXZgFETRmFp4wQXyP8XMe3LtuOw8wMdLcBVQ+9YWE=:lq0W9ekN5sC0O7Xw:UD4a6mUUhkTbQtGWitXHZUg0pQ4RHI6W/KUyYE95m3k=:ZuNQckXOtr4r21x+DT1zpQ=="
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^[a-z0-9\\-_]+\\.[a-z0-9\\-_]{1,6}\\.[a-z0-9\\-_]{20,27}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 29100,
+                "extended": false,
+                "name": "Flask Session Cookie ($salt.$salt.$pass)",
+                "samples": [
+                    "eyJ1c2VybmFtZSI6ImFkbWluIn0.YjdgRQ.1OTlf1PD0H9wXsu_qS0aywAJVD8"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$keepass\\$\\*1\\*\\d{1,10}\\*\\d{1,3}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*\\d\\*\\d{1,8}\\*[a-f0-9]{2,}$",
+        "modes": [
+            {
+                "john": "keepass",
+                "hashcat": 13400,
+                "extended": false,
+                "name": "KeePass 1 AES / without keyfile",
+                "samples": [
+                    "$keepass$*1*50000*0*375756b9e6c72891a8e5645a3338b8c8*82afc053e8e1a6cfa39adae4f5fe5e59f545a54d6956593d1709b39cacd7f796*c698fbfc7d1b71431d10611e2216ab21*24a63140f4eb3bfd7d59b7694eea38d1d93a43bc3af989755d2b326286c4d510*1*192*1a65072f436e9da0c9e832eca225a04ab78821b55d9f550860ade2ef8126a2c4050cf4d033374abd3dac6d0c5907c6cbb033643b203825c12e6c9853b5ac17a4809559fe723e01b4a2ab87cc83c8ba7ee4a757b8a0cf1674106f21f6675cba12064443d65436650df10ea0923c4cadfd4bfe341a6f4fa23a1a67f7d12a489fc5410ef6db9f6607905de491d3b3b915852a1b6c231c96366cbdee5ea9bd7f73ffd2f7a579215528ae1bf0ea540947ebfe39ca84bc6cbeded4f8e8fb6ed8f32dd5",
+                    "$keepass$*1*50000*124*60eed105dac456cfc37d89d950ca846e*72ffef7c0bc3698b8eca65184774f6cd91a9356d338e5140e47e319a87f5e46a*8725bdfd3580cf054a1564dc724aaffe*8e58cc08af2462ddffe2ee39735ad14b15e8cb96dc05ef70d8e64d475eca7bf5*1*752*71d7e65fb3e20b288da8cd582b5c2bc3b63162eef6894e5e92eea73f711fe86e7a7285d5ac9d5ffd07798b83673b06f34180b7f5f3d05222ebf909c67e6580c646bcb64ad039fcdc6f33178fe475739a562dc78012f6be3104da9af69e0e12c2c9c5cd7134bb99d5278f2738a40155acbe941ff2f88db18daf772c7b5fc1855ff9e93ceb35a1db2c30cabe97a96c58b07c16912b2e095e530cc8c24041e7d4876b842f2e7c6df41d08da8c5c4f2402dd3241c3367b6e6e06cd0fa369934e78a6aab1479756a15264af09e3c8e1037f07a58f70f4bf634737ff58725414db10d7b2f61a7ed69878bc0de8bb99f3795bf9980d87992848cd9b9abe0fa6205a117ab1dd5165cf11ffa10b765e8723251ea0907bbc5f3eef8cf1f08bb89e193842b40c95922f38c44d0c3197033a5c7c926a33687aa71c482c48381baa4a34a46b8a4f78715f42eccbc8df80ee3b43335d92bdeb3bb0667cf6da83a018e4c0cd5803004bf6c300b9bee029246d16bd817ff235fcc22bb8c729929499afbf90bf787e98479db5ff571d3d727059d34c1f14454ff5f0a1d2d025437c2d8db4a7be7b901c067b929a0028fe8bb74fa96cb84831ccd89138329708d12c76bd4f5f371e43d0a2d234e5db2b3d6d5164e773594ab201dc9498078b48d4303dd8a89bf81c76d1424084ebf8d96107cb2623fb1cb67617257a5c7c6e56a8614271256b9dd80c76b6d668de4ebe17574ad617f5b1133f45a6d8621e127fcc99d8e788c535da9f557d91903b4e388108f02e9539a681d42e61f8e2f8b06654d4dec308690902a5c76f55b3d79b7c9a0ce994494bc60eff79ff41debc3f2684f40fc912f09035aae022148238ba6f5cfb92f54a5fb28cbb417ff01f39cc464e95929fba5e19be0251bef59879303063e6392c3a49032af3d03d5c9027868d5d6a187698dd75dfc295d2789a0e6cf391a380cc625b0a49f3084f45558ac273b0bbe62a8614db194983b2e207cef7deb1fa6a0bd39b0215d72bf646b599f187ee0009b7b458bb4930a1aea55222099446a0250a975447ff52"
+                ]
+            },
+            {
+                "john": "keepass",
+                "hashcat": null,
+                "extended": false,
+                "name": "KeePass 1 Twofish / without keyfile",
+                "samples": [
+                    "$keepass$*1*50000*1*1ff21bd79aa8e9c3f439281a4ce6a97b*cfbdb00057ee0c9e889ca9d93b069ab5ae19f78852bc21aae4f60d0d325e0034*c1a7e6138a49a2dcfb3a84afbc1d918b*a704f9d060f0de5a070155d1d5a8727da92f404242cb3aa2b9aa53a145f87474*1*608*c2d3d18e416af56788d1c3e4257da9ce6e5dcad4db012d7422d17b4527bbb2bb994d9db03907ae01cc1565f5fd0729b930c9ee352426c57de5dee7e941e1d6aedeaf2b0e6509819385de9b4dd6a09979b3edfa0959a7186c422031e426f18d295c55ac616aabeec99f89e696be1d585950ef16a94ae610f2449cc3964bb63ec6043ef36c89117bc78e99e5fbf083b48cb84f85a964e8a037018b3afc2cc55fbe7d74cbdb53d5a54bcd202a1d0a342dbf48a8f7a24264cde8d800a506bf134008b1d8d9b8dd80c19511d9f43b3c23b19eb4a7dcf584f80c49961f73dcba3d2d0390a39a683ddcc8771b49cc3c673ea0aa902d075e25bc814608e2e6d1d6218a6379fd677bc5daaa18b6f5a021d2f661338ca8cc3645dc6cddb860af222a5cdb59a5e2a2c1921203344ced4e2154446239f6c1af8c1bace8207e0f519ea9c08db2f5d0bde0416b09ef6c530213e648641ae56c9af9fbdcb0a286cc4de121655697b9eb00c0fd89ed7269c3859eca20e0c7b60be8d2a1323eb915139cf90c55f9cff01a5bdf757e09ee6d64c2de9aec8d3ea42feeb67caf51b9ba1a80b435e271fdb7f9144ca31e41671768b2c5e8adf70245fdf52005de418efbe2a156d19eeb2ed9e97a0ddb133d11bd8655356d9d3edbbdbf9d0db345b2eb2c1f550ce070f5b0f8f8e58a6ffd52ae8089627dc4a0dac4b4846349066bfa0d2f395d2cb3871e57e353d622e0904a9f54a3e4706797d95b34619f792c15ab8efb3ac523becc3023f01aaad169bc08db8d01e2dd22eff8f6b4f7b741d196bc3de466590011e6d5c9703a19c07d96d26fe1ad93d0931454730ee1f3146428a126d1ed02763f827ff4"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$keepass\\$\\*1\\*\\d{1,10}\\*\\d{1,3}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*\\d\\*\\d{1,8}\\*[a-f0-9]{2,}\\*\\d\\*\\d{2}\\*[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "keepass",
+                "hashcat": 13400,
+                "extended": false,
+                "name": "KeePass 1 Twofish / with keyfile",
+                "samples": [
+                    "$keepass$*1*6000*1*31c087828b0bb76362c10cae773aacdf*6d6c78b4f82ecbcd3b96670cf490914c25ea8c31bc3aeb3fc56e65fac16d721f*a735ec88c01816bc66200c8e17ee9110*08334be8523f4b69bd4e2328db854329bfc81e2ea5a46d8ccf3bccf7c03d879d*1*1360*f1e2c6c47f88c2abf4e79dbe73339b77778233a6c7d7f49f6b7d5db6a4885ff33585e221f5e94e8f7cc84ddcbe9c61a3d40c4f503a4ec7e91edca5745454588eebb4f0dc4d251c0d88eb5fae5d5b651d16e56ef830f412cb7fccf643de4963b66852d3a775489b5abb394b6fa325c3dbb4a55dd06d44c5fc911f1305e55accf0dc0eb172788f5400aab3c867cc6c5ddb7cd3e57bb78a739416985a276825171f5a19750dede055aa3e5fca9b11e3606beae97d68e593631a2efd88cdeb9f43b5ac1d1d9f0164f0fb022ea44a4a48061629c83d8f5bc594e3655ee684102fe706d1e96178bb805105fe1c5326c951401a6e7c9a0b8b572e7b74c3fb25e8700a2e0e70b4621ae3878805397ea1b873ea5218fdaa4fc5d11cdf7ea3579601eca3750fa347edc08569b1f51606d35920253f85f33e6a757a585adf079173161af919f7ea0d78ca6ca1513d01855057373c4f9fe22aba1fc4b18708d329500c127b865a528435e9e00d0a80554ae6eaf4d58bf85a959f37d0854b36c782991c36120b41ee2d9905b18d525b6bffef310e90dbfbe9be853614e6559737f1141f725902f59ee02789c6490c16adf0957e36dc4101c57ba35acb4ca9ec60f5585b60e74342921bbc7e56df5ad942b6deb7936532439b1dae39b9709cf282239c57b434d6f65ba277012ccddce32a217964f974c16f96d8b078ceaad43de9f3d5309279843f2f347ad8ae6eab3a998bb99a421b22b806e2f2302f9dcf3ba54e3d3f1ee64ef3b202194912eec202c2f44847ad5293b03b6b22df35f505670a79219efc399c6a4fa3fd4be7953e5df9baf94101c0a7036b82b6950ab2b722e38aec47bf1c7ffb4e82f43b9ca18d2a8b0b2a7b92015b01d07a429d2660902185cf143f871ff49dde73acf7c3bfd9c124733bd90ffe0fd1cc9090d56dd70bd62f9df1bfa4748ea3438f669d5691c61ec7fbc9d53ab4d8c2dda2cf203f7a5a7fac72eb2efe1d9a27b8c5b14e07a55c530dfd7b7c69dcf478590b7b364f5379f92a0762be0005c4cbc5285d7828248159286fe6d29c02c7de04e96e737a2d30ce75ff774982433f75ca16f09ad668e5b13f0a2e84886773d8fff67f71c1a9dab13f78e5b2da9b1eed9ab2208934a6da7eab32b3e8da1599d6cfa7e9c19ad8efc85dd9a2a4b95832c435381c2fe7e44c58045ce91e40d58c36924b38b19cbafd696bac8761229de9099ce31ee1c93a98aa0cb2a7c60b71b7f1998690e5eae623827727cfe7e8eed94ffc927a1e15aac32292daccda4f0d35383ce87f7e872fc3fe8f01f4a44de4f7b76257abc9c056ab8ae0d96d2dc3a154408c28a2e7befbd515cb5013cbfed31af456ac2b596b5d8095420c411b981d48741dc7ed1e8de4e428bd5e5a553348e2890b1ed12b7dc88261ab921a12da43e6344bbb4a0e0ce2b84c2d1d6c1f51b88202743433ac24340ae00cf27d43346240f4dc5e35ec29fcf1bf6de3bcc09ee8db3f49c3b6615bd8796bbe2cf4b914766779408e772123d9e51cc92ed5dedafa427fd767198cb97674eded4e4df84716aec75cbe7a54620c283fa60780be3cd66ea4167f46cdea1506be92a5102317c8ab8be097c993d82bd831818fe7cb1fbfecc3432d93e0f6d36da8a65ed15c78e623d59980be7ff54bdb1786de2ca9e7a11f0fe067db9ec42ade3bbaad10adae5ea77ba76fa2d0723a35891bde91da540a58e343c23afa9e22b38a66171eb9dbbd55f9e0f014e9de3943388fe0990cc801bbb978c02bf680b3c63a747e22a6317440c40e6844987e936c88c25f49e601ec3486ab080165b5e01dbee47a0a385dfba22ec5ed075f94052bdddabde761bbcc79852402c5b22ded89af4c602922099e37d71b7f87f4ffa614b4ca106fca6b062cba350be1fd12c6812db82f3e02a81e42*1*64*bbc3babf62557aa4dfba705e24274e1aebf43907fe12f52eaf5395066f7cbdba",
+                    "$keepass$*1*6000*0*1a1d38235ccbeae4ca2a9edfbd3b290c*8e1e81b37a6161b6033fbd6dd350aaeaa0712cf2649fe40e3fbbaa4b61684f54*d9517d352aea00c2b7f57f1154b9c0a0*0a8ae9b13347402c242d7cde4d58d01f1e129287eaf62df768856bbb9d0633a1*1*1360*6555a7e9eca9d5a2c9504a5c888846f0a8902fa31e3dc90f8fcc118856d5daabcaaf4316c4d589e11cce5b9a209e9a7ec1db5b848a706c78f7c7dfac4fd9ea86ac15af500518766dbf4525ee7c1b477a8fec4abdd6f4ad36894ec5aee0c9a5662c5091ceb61b3aa99ff3eacd687ed797b0a1e8ceecd5c51456cb1f70dadf0fda190752e4efe4fb101d5fc5d7745ff01d68cb4c0cc32c6003f85c310e43d7d659748bfc260cbb329c4076c2c9948386c74bb967362a98d6490dbe340f5d440b557b105edd5561836fbb6894f4a1d9a5cd0182536a28f60ca268d682065f8f5226e24a07d635a3c4f04760094cee033fb2f7c3a0cbdf7f174d31c827f6911a75ca95b21332bb47ea6359aa2d70ff4b16e8481cd536e0ec4ba90963edda754b6e0e694855e4f266899b3dd2b0f74c3e688caa376b22810945249ac4e1c38e8d1093ce272ed45d26037a1fd6e0cfcdbdf096c8b2795ba736641bafe9938b6eb2b40ea347f9c49952c118d86ec671c065e3c94f0de2409fec2fde318ad7e6dd0189baf4fa0044fc1d2974b9dafb1608f4bca525706e44ca6af09e305ad29f5e4ba0831145713d5d8b6d6d955c4b5ca031e34b4292aee5383179e1e0afe92ee6565e69825c90bb5e79612a4ad4a3babbd4a75b5481ea710c93595781b71532c17730409482e6b59bb9831be4efadadf36eda5bc5fcf0f3541aaba6662807e531a3e28078f5960e50f80e624c5434b545c1232fdd64359f53b90d6635107f4f005ac02110eebdbdda4f2c92addd686059e9d799a55902526f87f78b8844e2000f82e7b5c8ba3a19fe26117c43f69ba26eee75cc385737791ca4554ce935af26c50331963e500605e87ac3602a76669bf6318e797ef01fe1c25e567cc864de11bd00f555fdf188648bf4179658e325be39a4050b7b01553422e5cd1bbaf5e8f75ce34f0e92f1253c880d4e77f484f14817e288f01efbfe1a8f8b90e9d18b86898856bdf3ee6b5754853cb99a746fa0b753f1a49f529a89d9a0c2fbd5365477be829190dbf491bc886f66ae1bfe014a7e23a420f76a4a0d0d5ebcea51dc0021651a6cdbe5c89a7ae8bfdae2e30d404c31790c0aba8791793ce3072adf21e5a3c5b5e4f9cea82ebff5070e13f94300d5688523ba2a142ae8f82f6ef940e69beba1d665ab17a2ae471500fc48ded336b27450f08dfe07fa5e556963f035a01950f43b2f649bf7f552e9ee7154f5ffdec109fd5bdf0e879d044ef4b78e590ac769efcdd7dad74228872af966d2e8d976336de1ee4289e933288b5b0b43195df1c248176ac944f5e99918dbc067f93d15e95602c9cb8246f378377785b7ebfee44f81b385a3e1c9c5276e4b477c4841af871e6b0e3f4387c58cea01fe2aff04df0f51ac93757172d7537ee0df51ec931564ed2c8a11a45da8c03644d0bc93a14d9f79555250b9c8245690bc1c72ea7e9104a9f570680f704c1f8759a65e210e1b9a855b46ed6801354175b27fc288a7bc39a2003f4400c124ec41d7f54f67be99f778895d9c3e33623a346021215a369487457e78322dbd71a3d969b3e22dfea987ac93d5c4f8252142824f5a67e54a2b1b78ea928fbb63653e122555f6c76150f2541bdad6524f69964c91e9175406d0b824e175e63c7677d990341ee69c4ca9612a05e3bd2ed304c45cd97051aaf0b63c0d917af8d01723e215bb93f816b51d79e29e4e885b98f8ca8320443503c07e67b4d546f544ffced62ef7298a8ac6175f77c180900f638466cd15d6511d7b16992a8e0674563c02fe7776079ee92739bc142a1e601b3aaee284f6f828656e43e58b93bcfd5f69b6aa8c003788d1ae88f569f64402d64e18cb8ffc2268013fe4da9ba7da557da3e259623168b7fd57cf0e4c8327bae66e02bc12978725022ef4cc03b4021d3a*1*64*3a96fb77fbbbca7336ee699f17be31fde552191128553c6d89bfce4035dc0af0"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$keepass\\$\\*2\\*\\d{1,10}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "keepass",
+                "hashcat": 13400,
+                "extended": false,
+                "name": "KeePass 2 AES / without keyfile",
+                "samples": [
+                    "$keepass$*2*6000*222*a279e37c38b0124559a83fa452a0269d56dc4119a5866d18e76f1f3fd536d64d*7ec7a06bc975ea2ae7c8dcb99e826a308564849b6b25d858cbbc78475af3733f*d477c849bf2278b7a1f626c81e343553*38c8ec186141c2705f2bcb334a730933ed3b0ee11391e1100fbaf429f6c99078*1ada85fe78cf36ab0537562a787dd83e446f13cd3d9a60fd495003de3537b702",
+                    "$keepass$*2*6000*222*e54497d3d9be3e310a817a13515225a87773ba71557a88673c34db824550be7b*d405c4f7e3c7b2b142fda44c3d55d3afab1c91a6aca7c81c1ff7e61b3f03be85*7eb45af0af777ecb57f0159b9ffa528b*0af7d9facefb20378e8666389de7586ea72e9527dc78bf5dfe5f1b455060a3e6*9b0d1893678dea77f88bf66e6986adbc5a8095e4a09c7e9744bad42ac49133a7",
+                    "$keepass$*2*6000*222*a279e37c38b0124559a83fa452a0269d56dc4119a5866d18e76f1f3fd536d64d*7ec7a06bc975ea2ae7c8dcb99e826a308564849b6b25d858cbbc78475af3733f*d477c849bf2278b7a1f626c81e343553*e61db922e9b77a161e9b674ddadfb8c660d61b5f68d97a3b1596ae94cfa9d169*7c80c7db9de77f176e86ba11697152c4c8f182bdb8133ad1bca22e9ec5bc275b"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$keepass\\$\\*2\\*\\d{1,10}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*\\d\\*\\d{2}\\*[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "keepass",
+                "hashcat": 13400,
+                "extended": false,
+                "name": "Keepass 2 AES / with keyfile",
+                "samples": [
+                    "$keepass$*2*6000*222*15b6b685bae998f2f608c909dc554e514f2843fbac3c7c16ea3600cc0de30212*c417098b445cfc7a87d56ba17200836f30208d38f75a4169c0280bab3b10ca2a*0d15a81eadccc58b1d3942090cd0ba66*57c4aa5ac7295a97da10f8b2f2d2bfd7a98b0faf75396bc1b55164a1e1dc7e52*2b822bb7e7d060bb42324459cb24df4d3ecd66dc5fc627ac50bf2d7c4255e4f8*1*64*aaf72933951a03351e032b382232bcafbeeabc9bc8e6988b18407bc5b8f0e3cc",
+                    "$keepass$*2*24569*0*c40432355cce7348c48053ceea0a28e7d18859c4ea47e3a799c6300861f64b95*265dafcc42e1537ff42e97e1e283c70014133be0fe2d420b4d24c6d57c9d2207*a00e20a852694c15aabb074d61b902fa*48dd553fb96f7996635f2414bfe6a1a8429ef0ffb71a1752abbef31853172c35*a44ae659958ad7fae8c8952cb83f3cf03fec2371ce22a8bf7fac1e687af2f249*1*64*5a26ea376cc5afc955104c334571d30486acbac512a94b75ca82a9e31dd97bf7",
+                    "$keepass$*2*6000*222*aa511591cb50394d044f31abb2febdb2788c9ee41d78a53f3efe0f83fdd64e81*7ceab79302a794cef818d9426e53a78458f82e72575967c4fb3788d4bc685874*1c5c1c0c475ee2f22bd56e9c75cfd67c*e7bf79115c83a0236260c71c17a816f9bd9288a683eb4b5e0d48666c66e97774*53f26838a293b392bfde1ad21b444b834cf5c02155a1378ac496653b2f3779ec*1*64*98df4f35fe74c031992d81a639305c4520f303fd1ca4bb09b53e33032b44c46a"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$keepass\\$\\*2\\*\\d{1,10}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{24}\\*[a-f0-9]{64}\\*[a-f0-9]{64}$",
+        "modes": [
+            {
+                "john": "keepass",
+                "hashcat": null,
+                "extended": false,
+                "name": "KeePass 2 ChaCha20 (KDBX 3) / without keyfile",
+                "samples": [
+                    "$keepass$*2*6000*2*e852737a797fb642a2814e5965aba3473644a56ea67998526ce5e6f0e256a56a*fb300459b1e8c52fefa8e72676b57563565475b1c1306c266a48ccc2010e6a94*03027f86819941d1d0f3f2f5*af0f6c5e4319e6c10fdb95f44ded70f3115ae7dc28ec83fd3676c92076505ded*e0ab7f438903eb91dd8bc13c52c5a1c02e34b107ae16710bc57858c8c85fecd0"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^SCRAM-SHA-256\\$\\d{1,7}:(?=[^:$]{1,88}\\$)(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))\\$(?=[^:]{44}:)(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===)):(?=[^:]{44})(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28600,
+                "extended": false,
+                "name": "PostgreSQL SCRAM-SHA-256",
+                "samples": [
+                    "SCRAM-SHA-256$4096:IKfxzJ8Nq4PkLJCfgKcPmA==$iRw3qwTp18uaBnsTOEExbtgWdKeBMbSSnZvqD4sdqLQ=:hPciC1CcnBna3szR8Mf3MVc8t0W7QPbIHoMMrh4zRV0="
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$radmin3\\$[^*]{0,511}\\*[a-f0-9]{64}\\*[a-f0-9]{512}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 29200,
+                "extended": false,
+                "name": "Radmin3",
+                "samples": [
+                    "$radmin3$75007300650072006e0061006d006500*c63bf695069d564844c4849e7df6d41f1fbc5f3a7d8fe27c5f20545a238398fa*0062fb848c21d606baa0a91d7177daceb69ad2f6d090c2f1b3a654cfb417be66f739ae952f5c7c5170743459daf854a22684787b24f8725337b3c3bd1e0f2a6285768ceccca77f26c579d42a66372df7782b2eefccb028a0efb51a4257dd0804d05e0a83f611f2a0f10ffe920568cc7af1ec426f450ec99ade1f2a4905fd319f8c190c2db0b0e24627d635bc2b4a2c4c9ae956b1e02784c9ce958eb9883c60ba8ea2731dd0e515f492c44f39324e4027587c1330f14216e17f212eaec949273797ae74497782ee8b6f640dd2d124c59db8c37724c8a5a63bad005f8e491b459ff1b92f861ab6d99a2548cb8902b0840c7f20a108ede6bf9a60093053781216fe"
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^\\$teamspeak\\$3\\$(?=[^$]{28}\\$)(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))\\$(?=[^$]{152}$)(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 28300,
+                "extended": false,
+                "name": "Teamspeak 3 (channel hash)",
+                "samples": [
+                    "$teamspeak$3$E0aV0IQ29EDyxRfkFoQflUGJ6zo=$mRgDUkNpd0IwUEcTJQBmE0NHYwdDEhFzQ0VgMRcFJUIRYnaHBwNXRZJwk2ZUaURzdXkVYiUROERmI0hYYGFYCDiIJCeIU3N5EhRVcZFnSIRCJlkUFkY4YFMDcheYeTl4RYZEdpKGJYhxAIQJEYGYEA=="
+                ]
+            }
+        ]
+    },
+    {
+        "regex": "^[a-f0-9]{32}[a-f0-9]{32}(?=[^$]{108}$)(?:[a-z0-9+\/]{4})*(?:|(?:[a-z0-9+\/]{3}=)|(?:[a-z0-9+\/]{2}==)|(?:[a-z0-9+\/]{1}===))$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 29600,
+                "extended": false,
+                "name": "Terra Station Wallet (AES256-CBC(PBKDF2($pass)))",
+                "samples": [
+                    "67445496c838e96c1424a8dae4b146f0fc247c8c34ef33feffeb1e4412018512wZGtBMeN84XZE2LoOKwTGvA4Ee4m7PR1lDGIdWUV6OSUZKRiKFx9tlrnZLt8r8OfOzbwUS2a2Uo+nrrP6F85fh4eHstwPJw0KwzHWB8br58="
+                ]
+            }
+        ]
     }
 ]