haiti-hash 2.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fcea45a6ae417a25dbd280f27fcdc55e515a3378486bae9d0092ed24a9efbf4
-  data.tar.gz: e47efec0dfa8a7ab15bada00c5ba4875722923c31d2fedf17bd09edf60e7a646
+  metadata.gz: 16a62a5cb145dca24ef572956925ef3d65d7d78a6cdfffd8d13d871f0ff8d15a
+  data.tar.gz: e941fd2389862186740ae0078dce99a18780df00c172784f5454d1e005fbbf0a
 SHA512:
-  metadata.gz: d0f2588f566e48473014c19e90822afb0f4372c45d387bde6480dd1c99226fd35b9b546bfbf9861458763169f9a58e8d9841c9f8589cce96cd40bb6c0edc1c53
-  data.tar.gz: 1fae1ee5d9289ad83914809bdbc68f8531a7f7f99d71a28820edccb6a6c116fd3ee6b2b9ba527c5055efaaf2d4028f7c155daee2330eef96e551cdae490e2571
+  metadata.gz: fd12a3e2d14ee548c71382a808afc9b8ea5dcb53a149921c2edb10267d630edd5e94afb4e7db30e26bcbf210f3a6550c948069c4adfeea68b3ef885f7a274be8
+  data.tar.gz: c8cdb908bd4014ea1ff81df98eec4abfb8925b4ffa7ac9e937a55f6cbeebd2206f94064f43cf48118c3b02a35f91cea70ab064efd442f30d974a4f8fe179c16b

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2023 Alexandre ZANNI (independent)
+Copyright (c) 2020-2026 Alexandre ZANNI (independent)
 Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/data/prototypes.json

@@ -600,9 +600,12 @@
 			},
 			{
 				"john": "dynamic_14",
-				"hashcat": null,
+				"hashcat": 33100,
 				"extended": true,
-				"name": "md5($salt.md5($pass).$salt)"
+				"name": "md5($salt.md5($pass).$salt)",
+				"samples": [
+					"866244ca1d318292a6f40b60e03fd29c:72219426709"
+				]
 			},
 			{
 				"john": "dynamic_13",
@@ -651,9 +654,12 @@
 			},
 			{
 				"john": "dynamic_16",
-				"hashcat": null,
+				"hashcat": 31700,
 				"extended": true,
-				"name": "md5(md5(md5($pass).$salt).$salt2)"
+				"name": "md5(md5(md5($pass).$salt1).$salt2)",
+				"samples": [
+					"c7a971e405313d0ecc22e37e8b2424a1:2316355934:478467"
+				]
 			},
 			{
 				"john": "dynamic_18",
@@ -717,12 +723,102 @@
 			},
 			{
 				"john": null,
-				"hashcat": 2810,
+				"hashcat": 2811,
 				"extended": false,
 				"name": "IPB 2.x (Invision Power Board)",
 				"samples": [
 					"022f7e02b3314f7d0968f73c00ba759f:67588"
 				]
+			},
+			{
+				"john": null,
+				"hashcat": 33000,
+				"extended": true,
+				"name": "md5($salt1.$pass.$salt2)",
+				"samples": [
+					"036a81bc84e01700faf965c3caaa3954:0243402616975530019305541949338903179746132451440267505028190519468680111713847350899833009965414425621884797638402856957040435715380438220464016:0757380776148401126145133134435506200715895167468508855794708942913462135276430452032928239699197100625556660484150983610760766285767453357925167463064045123083116191440783332986105343359475417787249790516137833723344398087127577224833364437305770807742238"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 21310,
+				"extended": true,
+				"name": "md5($salt1.sha1($salt2.$pass))",
+				"samples": [
+					"dc91b5a658ef4b7d859e90742f340e24:708237:d270e9eea5802e346bcaa9b229f37766"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 3730,
+				"extended": true,
+				"name": "md5($salt1.strtoupper(md5($salt2.$pass)))",
+				"samples": [
+					"0e1484eb061b8e9cfd81868bba1dc4a0:229381927:182719643"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 2630,
+				"extended": true,
+				"name": "md5(md5($pass.$salt))",
+				"samples": [
+					"0127eecea3120e34c8934ba3b72a390a:0"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 30500,
+				"extended": true,
+				"name": "md5(md5($salt).md5(md5($pass)))",
+				"samples": [
+					"e13bb4b8e5a98db7277df344aa3363cf:28945624531"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 3610,
+				"extended": true,
+				"name": "md5(md5(md5($pass)).$salt)",
+				"samples": [
+					"a0ab79f9e2b5a4434d2da61673b56362:1234"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 21900,
+				"extended": true,
+				"name": "md5(md5(md5($pass.$salt1)).$salt2)",
+				"samples": [
+					"2c749af6c65cf3e82e5837e3056727f5:59331674906582121215362940957615121466283616005471:17254656838978443692786064919357750120910718779182716907569266"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 4420,
+				"extended": true,
+				"name": "md5(sha1($pass.$salt))",
+				"samples": [
+					"34ebbba3e5c98f6253c160eae53da092:6224378456121050285"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 4430,
+				"extended": true,
+				"name": "md5(sha1($salt.$pass))",
+				"samples": [
+					"df0e9ede5b6c7d1f1b47199f86029002:59132809201799180722359939692710461886"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 32800,
+				"extended": true,
+				"name": "md5(sha1(md5($pass)))",
+				"samples": [
+					"7b4f60b54472980e922280e225150dfa"
+				]
 			}
 		]
 	},
@@ -1605,7 +1701,7 @@
 		]
 	},
 	{
-		"regex": "\\A[a-f0-9]{56}\\Z",
+		"regex": "\\A[a-f0-9]{56}(?::.+)?\\Z",
 		"modes": [
 			{
 				"john": "raw-sha224",
@@ -1619,21 +1715,30 @@
 			},
 			{
 				"john": "dynamic_51",
-				"hashcat": null,
+				"hashcat": 1320,
 				"extended": true,
-				"name": "sha224($salt.$pass)"
+				"name": "sha224($salt.$pass)",
+				"samples": [
+					"4258a61d3d0d5a5b6796f0ab02d081e998fe657d55d22091d3b51409:36669207"
+				]
 			},
 			{
 				"john": "dynamic_52",
-				"hashcat": null,
+				"hashcat": 1310,
 				"extended": true,
-				"name": "sha224($pass.$salt)"
+				"name": "sha224($pass.$salt)",
+				"samples": [
+					"0cf361904f4b0234cf4ade8496d8c11c04e5982db967603e82f22b2f:89452466460220844541730694146873525188525677"
+				]
 			},
 			{
 				"john": "dynamic_53",
-				"hashcat": null,
+				"hashcat": 34400,
 				"extended": true,
-				"name": "sha224(sha224($pass))"
+				"name": "sha224(sha224($pass))",
+				"samples": [
+					"b7d9a0e57e6e94e8b87996b81ffa64b05d237c58fff1d7a4e4fe2a77"
+				]
 			},
 			{
 				"john": "dynamic_54",
@@ -1750,6 +1855,15 @@
 					"bcb34bae2f591c257a07d6d07adecd4cd968cdd06ab4a4d3bb001574",
 					"e745e2e424aaed1cef3c765b6c22396bb6bcc5215128100f54031132"
 				]
+			},
+			{
+				"john": null,
+				"hashcat": 34500,
+				"extended": true,
+				"name": "sha224(sha1($pass))",
+				"samples": [
+					"10d302483c927df95abba98d69dcd9608365241d1523a8cc5fcbcedc"
+				]
 			}
 		]
 	},
@@ -1803,6 +1917,21 @@
 			}
 		]
 	},
+	{
+		"regex": "\\A\\$bcrypt-sha256\\$v=2,t=2b,r=\\d{1,2}\\$[a-z0-9\/.]{22}\\$[a-z0-9\/.]{31}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 30601,
+				"extended": true,
+				"name": "bcrypt(HMAC-SHA256($pass)) / bcryptsha256 v2",
+				"samples": [
+					"$bcrypt-sha256$v=2,t=2b,r=12$KSOjON/ciJR86a00N5q61.$AmWZucQuHk13FGkQWhgMeiFvBfm2GCy",
+					"$bcrypt-sha256$v=2,t=2b,r=12$n79VH.0Q2TMWmt3Oqt9uku$Kq4Noyk3094Y2QlB8NdRT8SvGiI4ft2"
+				]
+			}
+		]
+	},
 	{
 		"regex": "\\A[a-f0-9]{40}:[a-f0-9]{16}\\Z",
 		"modes": [
@@ -1826,13 +1955,16 @@
 		]
 	},
 	{
-		"regex": "\\A\\$bcrypt-sha256\\$(2[axy]|2)\\,\\d+\\$[a-z0-9\\/.]{22}\\$[a-z0-9\\/.]{31}\\Z",
+		"regex": "\\A(?:\\$bcrypt-sha256)?\\$(?:2[abxy]?)\\$\\d{2}\\$[a-z0-9\\/.]{53}\\Z",
 		"modes": [
 			{
 				"john": null,
-				"hashcat": null,
+				"hashcat": 30600,
 				"extended": false,
-				"name": "bcrypt(SHA-256)"
+				"name": "bcrypt(sha256($pass)) / bcryptsha256",
+				"samples": [
+					"$2b$10$FxDtpTNaL303lLcWtd6LFO2U6Gc63VJ07qycHcfqbQQ71GhO/qSzu"
+				]
 			}
 		]
 	},
@@ -2113,11 +2245,12 @@
 			},
 			{
 				"john": null,
-				"hashcat": null,
+				"hashcat": 34600,
 				"extended": false,
 				"name": "MD6-256",
 				"samples": [
-					"bc9e2022386d929ae3936306153d9366fc555dc868579c87c7faf8846f79f414"
+					"bc9e2022386d929ae3936306153d9366fc555dc868579c87c7faf8846f79f414",
+					"539a8b63639c94b80e746611c476a684e7cc95235187b2f8b81a188d6dfbf64c"
 				]
 			},
 			{
@@ -2179,6 +2312,15 @@
 					"3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb",
 					"3e7dea7f2384b6c5a3d0e24aaa29c05e89ddd762145030ec22c71a6db8b2c1f4"
 				]
+			},
+			{
+				"john": null,
+				"hashcat": 20730,
+				"extended": true,
+				"name": "sha256(sha256($pass.$salt))",
+				"samples": [
+					"ad66bdc0841d7e08d96c03de271ce14e77de078746b535adbf9d4b6ccbf2a517:7218532375810603"
+				]
 			}
 		]
 	},
@@ -2197,6 +2339,43 @@
 			}
 		]
 	},
+	{
+		"regex": "\\A\\$BLAKE2\\$[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 34800,
+				"extended": false,
+				"name": "BLAKE2-256 (blake2b)",
+				"samples": [
+					"$BLAKE2$68b163391b3e779dcddba4e6d8fa03e962c29569b430efa5ba014303358557e1"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$BLAKE2\\$[a-f0-9]{64}:.+\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 34820,
+				"extended": true,
+				"name": "BLAKE2-256($salt.$pass) (blake2b)",
+				"samples": [
+					"$BLAKE2$a4cad0b026ed24adf13fb70ec31d35b02751dcb33354e2c9d20ef3f968748501:3601"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 34810,
+				"extended": true,
+				"name": "BLAKE2-256($pass.$salt) (blake2b)",
+				"samples": [
+					"$BLAKE2$2b51353016a512b60e587bea98d799c2de243468085ca6cd67f983b2e55bfb67:2353288289"
+				]
+			}
+		]
+	},
 	{
 		"regex": "\\A[a-f0-9]{32}:[a-z0-9]{32}\\Z",
 		"modes": [
@@ -2298,6 +2477,20 @@
 			}
 		]
 	},
+	{
+		"regex": "\\A[a-z0-9=+\\/]{80}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 18800,
+				"extended": false,
+				"name": "Blockchain, My Wallet, Second Password (SHA256)",
+				"samples": [
+					"YnM6WYERjJfhxwepT7zV6odWoEUz1X4esYQb4bQ3KZ7bbZAyOTc1MDM3OTc1NjMyODA0ECcAAD3vFoc="
+				]
+			}
+		]
+	},
 	{
 		"regex": "\\A\\$episerver\\$\\*1\\*[a-z0-9\\/=+]+\\*[a-z0-9\\/=+]{42,43}\\Z",
 		"modes": [
@@ -2615,9 +2808,12 @@
 			},
 			{
 				"john": "dynamic_85",
-				"hashcat": null,
+				"hashcat": 32410,
 				"extended": true,
-				"name": "sha512(sha512($pass).$salt)"
+				"name": "sha512(sha512($pass).$salt)",
+				"samples": [
+					"25d509824028a999f4ee851b5de404bb316b78ae8e974874376484018f58520e082747a7ce9f769bcaccb5f63878356c780f602e23393f12b650a6931e4b9338:21881837027919828109608"
+				]
 			},
 			{
 				"john": "dynamic_86",
@@ -2685,6 +2881,29 @@
 					"8e945da209aa869f0455928529bcae4679e9873ab707b55315f56ceb98bef0a7362f715528356ee83cda5f2aac4c6ad2ba3a715c1bcd81cb8e9f90bf4c1c1a8a",
 					"d2b793a0bb6cb5904828b5b6dcfb443bb8f33efc06ad09368878ae4cdc8245b97e60802469bed1e7c21a64ff0b179a6a1e0bb74d92965450a0adab69162c00fe"
 				]
+			},
+			{
+				"john": null,
+				"hashcat": 32420,
+				"extended": false,
+				"name": "sha512(sha512_bin($pass).$salt)",
+				"samples": [
+					"c1bade2bd4ebc8db841ac6ab3e0a5035a29619e5b1a6135782b77da5d7cfaccee096f3ddb9ee23b9866378cfc2fb19f2c013fed1b7e1fffd18340a4f39238412:789"
+				]
+			}
+		]
+	},
+		{
+		"regex": "\\A[a-f0-9]{128}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 5720,
+				"extended": false,
+				"name": "Cisco-ISE Hashed Password (SHA256)",
+				"samples": [
+					"465865d4226c4d9696e601f2c99b25ae2c194ec01806bafc93933331acfc1a60e8bdcca8be9fa245a5fa16029bb52480915746f47d1c539d01da7ec6f37468d1"
+				]
 			}
 		]
 	},
@@ -4142,14 +4361,15 @@
 		"modes": [
 			{
 				"john": "saph",
-				"hashcat": null,
+				"hashcat": 35000,
 				"extended": false,
 				"name": "SAP CODVN H (PWDSALTEDHASH) iSSHA-512",
 				"samples": [
 					"{x-isSHA512, 7500}ctlX6qYsWspafEzwoej6nFp7zRQQjr8y22vE+xeveIX2gUndAw9N2Gep5azNUwuxOe2o7tusF800OfB9tg4taWI4Tg==",
 					"{x-isSHA512, 7500}Qyrh2JXgGkvIfKYOJRdWFut5/pVnXI/vZvqJ7N+Tz9M1zUTXGWCZSom4az4AhqOuAahBwuhcKqMq/pYPW4h3cThvT2JaWVBw",
 					"{x-isSHA512, 18009}C2+Sij3JyXPPDuQgsF6Zot7XnjRFX86X67tWJpUzXNnFw2dKcGPH6HDEzVJ8HN8+cJe4vZaOYTlmdz09gI7YEwECAwQFBgcICQoLDA0ODwA=",
-					"{x-isSHA512, 15000}2VwEw7rHLfYYblKU/ol7t6I7i2UjDOYOEW4H2iEHiUvNmNkxmM5rX5jcEAeRM6W+KQ0QBCsx1hDo9wXm+rbQPrL67ov+dGn/z+3o4f9pdIaJaU61YYQwl37PoYA7SvRU"
+					"{x-isSHA512, 15000}2VwEw7rHLfYYblKU/ol7t6I7i2UjDOYOEW4H2iEHiUvNmNkxmM5rX5jcEAeRM6W+KQ0QBCsx1hDo9wXm+rbQPrL67ov+dGn/z+3o4f9pdIaJaU61YYQwl37PoYA7SvRU",
+					"{x-isSHA512, 15000}YZH/V2T7zlQMGeWLBarm5Oi3qV9Y8ByXQijD28+bjtLdo7YssXaUBkxMXbS3l4yVlYw97tvYj+vu/L37sg1reDEzODQ4MDY1NzQ1NjQ="
 				]
 			}
 		]
@@ -4200,10 +4420,14 @@
 		"regex": "\\A[a-z0-9\\/.]{13,}\\Z",
 		"modes": [
 			{
-				"john": "bigcrypt",
+				"john": "descrypt",
 				"hashcat": null,
 				"extended": true,
-				"name": "BigCrypt"
+				"name": "BigCrypt (descrypt extension, DES-based crypt(3))",
+				"samples": [
+					"S/8NbAAlzbYO66hAa9XZyWy2",
+					"TO9Mdb1FHXkFU"
+				]
 			}
 		]
 	},
@@ -5812,15 +6036,137 @@
 		]
 	},
 	{
-		"regex": "\\A\\$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}\\Z",
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*2\\*\\d+\\*0\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\Z",
 		"modes": [
 			{
 				"john": "keepass",
 				"hashcat": null,
 				"extended": false,
-				"name": "KeePass 2 ChaCha20 (KDBX 3) / without keyfile",
+				"name": "KeePass 2 (KDBX 3) / AES 256 enc. / AES-KDF / without keyfile",
 				"samples": [
-					"$keepass$*2*6000*2*e852737a797fb642a2814e5965aba3473644a56ea67998526ce5e6f0e256a56a*fb300459b1e8c52fefa8e72676b57563565475b1c1306c266a48ccc2010e6a94*03027f86819941d1d0f3f2f5*af0f6c5e4319e6c10fdb95f44ded70f3115ae7dc28ec83fd3676c92076505ded*e0ab7f438903eb91dd8bc13c52c5a1c02e34b107ae16710bc57858c8c85fecd0"
+					"aes_aes:$keepass$*2*51724136*0*4349620c23fd506d0ef1513cf163a2b3f7aba29bf0bfd167433f4f948de45a80*9607e1f89e7aab4a6720d29478c17596fe5b9bbef218aabfeb87421b889bb417*03a258af4a69efe55851fcb3579753f2*8a6d25336ad495c840d0caaea8333a954ecd4f75d0d80e76cd46896f400947f2*f83af1c765569887eea00128526527a48a6e0d0943d30ff18055055329c62836"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*2\\*\\d+\\*1\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{32}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": null,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 3) / Twofish 256 enc. / AES-KDF / without keyfile",
+				"samples": [
+					"twofish_aes:$keepass$*2*45454544*1*012100297ce9a9f0bafa80baea8e25c3c544ee9a769d7bbae9d1b39544a1103e*1e69bcf23baf3941387ca91eeca84163481edcfe5f210e0a3a5d82a5077d447d*d2eeb12c093d3f554020fb0127add83d*b0d55717dfd912e1cec7bf31cc5249bdf7286ad9b487121e20f3020258a38596*991f9862a44be62723fe7088d01321b6c09c393181896b6ba566ac6300b555ef"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*2\\*\\d+\\*2\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]{24}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": null,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 3) / ChaCha20 256 enc. / AES-KDF / without keyfile",
+				"samples": [
+					"$keepass$*2*6000*2*e852737a797fb642a2814e5965aba3473644a56ea67998526ce5e6f0e256a56a*fb300459b1e8c52fefa8e72676b57563565475b1c1306c266a48ccc2010e6a94*03027f86819941d1d0f3f2f5*af0f6c5e4319e6c10fdb95f44ded70f3115ae7dc28ec83fd3676c92076505ded*e0ab7f438903eb91dd8bc13c52c5a1c02e34b107ae16710bc57858c8c85fecd0",
+					"chacha20_aes:$keepass$*2*37974684*2*df1a71413770160c73c22c5eded4bdd9ccc5324e09de09c3b8d8bf188b386469*4ff7861f57b1bc36488fd52cc81e3eb598bde02897b54f0494ee947029166e8a*1a84a4f7af7daf598ed0a0b7*7d2143822acf4e6405f3621ff545231087d18aa97993ae6139b694424f582e1a*f213f090d8c23d204eeef4583db4c7658725a15f40863e8d53ac751bf980f245"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d{1,5}\\*ef636ddf\\*\\d{3,12}\\*\\d{1,3}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": 34300,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2d KDF / without keyfile",
+				"samples": [
+					"aes_argon2d:$keepass$*4*114*ef636ddf*16777216*19*2*ab71e28c82382e66209dcd3da426a01b8c0acaa5e15569687d44054474062a53*38bb15c7489d850b337df823f140d8d296c18ba809411779aaa75e1aeeaf9bb2*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000ab71e28c82382e66209dcd3da426a01b8c0acaa5e15569687d44054474062a53071000000001f75f9095bb8c88eb5737bccde08d750b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000720000000000000005010000004d08000000000000010000000004010000005004000000020000004201000000532000000038bb15c7489d850b337df823f140d8d296c18ba809411779aaa75e1aeeaf9bb204010000005604000000130000000000040000000d0a0d0a*5858c9ad7f9a279b22090e4c741089903796cfe574695472730c54112bb7f589",
+					"twofish_argon2d:$keepass$*4*129*ef636ddf*16777216*19*2*00fc82629e2dc2fad2a50859a954ae33a2d5a932a28cf7ca7f8793fc18f0d741*71965300f0d594c27135cf96f9b7f8cc361d67c7fe26807b27391f5de4f8b1ec*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c030400000001000000042000000000fc82629e2dc2fad2a50859a954ae33a2d5a932a28cf7ca7f8793fc18f0d7410710000000fd1b5eb82e68d355a0110de77bf93b140b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000810000000000000005010000004d08000000000000010000000004010000005004000000020000004201000000532000000071965300f0d594c27135cf96f9b7f8cc361d67c7fe26807b27391f5de4f8b1ec04010000005604000000130000000000040000000d0a0d0a*bdd99728ee8011764f08bda42280ad64364069edfaafff4eca231de2d3db8617",
+					"chacha20_argon2d:$keepass$*4*97*ef636ddf*16777216*19*2*f0b92cd3b11d33694c95d92154f6c91fcf3309b9cd453512d73cd381bc5973f0*a69f92f52585cc2de6beb73d9535639faa9c8e36dc32c66e0898627333b5077a*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a0304000000010000000420000000f0b92cd3b11d33694c95d92154f6c91fcf3309b9cd453512d73cd381bc5973f0070c000000dc9942315a036a2a8216789d0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000610000000000000005010000004d080000000000000100000000040100000050040000000200000042010000005320000000a69f92f52585cc2de6beb73d9535639faa9c8e36dc32c66e0898627333b5077a04010000005604000000130000000000040000000d0a0d0a*744c592423dbe195b331c0eb12736dc8a40e62ef0e36821914d614da083c6f75",
+					"$keepass$*4*2*ef636ddf*67108864*19*2*e4e48422ecb07da38401597150a7326fdd1519007b28c306c6e7418fb8ed29cb*af527945ec56bbb37f84ef85093735b689139f46c8003f82cad269837eb69d5f*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000e4e48422ecb07da38401597150a7326fdd1519007b28c306c6e7418fb8ed29cb0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c040100000056040000001300000005010000004908000000020000000000000005010000004d080000000000000400000000040100000050040000000200000042010000005320000000af527945ec56bbb37f84ef85093735b689139f46c8003f82cad269837eb69d5f000710000000257fccc1e57ecdea03bbc06aab7cd13200040000000d0a0d0a*63249b86a7539e2bbdbf0ac7f196d460e781e221d1c580d4c718dcc1493eefa9"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d{1,5}\\*ef636ddf\\*\\d{3,12}\\*\\d{1,3}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\*\\d\\*\\d{2}\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": 34300,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2d KDF / with keyfile",
+				"samples": [
+					"keepass4_keepassxc_2.7.9_argon2d_defaultsettings_withkeyfile:$keepass$*4*10*ef636ddf*67108864*19*22*94bbea30712c123420aa1b8d35ad1b169d18c4adcd2539beef283792c799a0b0*679daecb36b9ff3d660dac67527fee408cc562338deb4bf902cb54053b690581*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000094bbea30712c123420aa1b8d35ad1b169d18c4adcd2539beef283792c799a0b00710000000bb017e400f6ac941de112eac993cd5de0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000000a0000000000000005010000004d080000000000000400000000040100000050040000001600000042010000005320000000679daecb36b9ff3d660dac67527fee408cc562338deb4bf902cb54053b69058104010000005604000000130000000000040000000d0a0d0a*e7f366cc1ad7ad924a9bbc6d76fd6637b3aa1f3d28fd9d8c0296cfa516736fea*1*64*8e2e44d8a7ff006d0cbdd27a34f2186c5c7ec3e187baaa6c722ef1ef7e860291",
+					"keepass4_keepassxc_2.7.6_argon2d_defaultsettings:$keepass$*4*60*ef636ddf*67108864*19*2*79b0ee82d9fd6debf70e9f1d3828f086ad4b42eb044e24cc96ab5c9ce9ae057e*495898d761b34446462982fc3b9794f22edc6e9c8b5c201b9a5df601ab176381*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000079b0ee82d9fd6debf70e9f1d3828f086ad4b42eb044e24cc96ab5c9ce9ae057e0710000000919e16a94771e7fb4c5063788d88999d0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000003c0000000000000005010000004d080000000000000400000000040100000050040000000200000042010000005320000000495898d761b34446462982fc3b9794f22edc6e9c8b5c201b9a5df601ab17638104010000005604000000130000000000040000000d0a0d0a*91abca3c4462bd9f562dd74b4846e8cb994342cd04d3e3551ef8f17710a30848*1*64*a4de4dda31b3bbd364dfcabf243049f4d0fd216a7b9ec63fc39eeea1b2546058",
+					"Passwords:$keepass$*4*111*ef636ddf*16777216*19*2*47df01b09fff77aa6bccd1e1b025a71d6e396b8fc5805b294f8a5c1a3e83f4bc*b2f7223e602a1191662d2804d1abf876a343f6c4653da45745642f302969e004*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000047df01b09fff77aa6bccd1e1b025a71d6e396b8fc5805b294f8a5c1a3e83f4bc07100000000ef8ed17526e3e5ce612ee8c801a39e80b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000006f0000000000000005010000004d080000000000000100000000040100000050040000000200000042010000005320000000b2f7223e602a1191662d2804d1abf876a343f6c4653da45745642f302969e00404010000005604000000130000000000040000000d0a0d0a*a71f5164a8b10c037b595a656fac06e0fd87932ca50daaa9d18f79962499f3b6*1*64*c5fc3ca8cfb936fb3757760b5ecc5981ad76c7780796c3b08ca424243b9c5527"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d{1,5}\\*9e298b19\\*\\d{3,12}\\*\\d{1,3}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": 34300,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2id KDF / without keyfile",
+				"samples": [
+					"aes_argon2id:$keepass$*4*10*9e298b19*67108864*19*4*4c89ff920a64b4de9c2cedd3ec31b8cf7fc6dc6ae332afcad9819515598770df*9c7be220e104c00be1be0897098eac49efbab66d440cfe66bb1f322cd47b1ff5*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff03040000000100000004200000004c89ff920a64b4de9c2cedd3ec31b8cf7fc6dc6ae332afcad9819515598770df071000000059b2c24bb626769c60e241780ce6b6f60b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d0800000000000004000000000401000000500400000004000000420100000053200000009c7be220e104c00be1be0897098eac49efbab66d440cfe66bb1f322cd47b1ff504010000005604000000130000000000040000000d0a0d0a*bdcfd0029f0e6a3196c2d143b3f0837e6dbbdad276daf9ba3d487c77d76b641f",
+					"twofish_argon2id:$keepass$*4*11*9e298b19*68157440*19*5*8d06bf40247fc629b057aa27f67dee07ae3a8e70101b93cfb08bdf6eb8af4e52*dc6f29d8dfd0c223b02df07f9ee917e148eef06b5dac83ac2b1021a7f3b541e4*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c03040000000100000004200000008d06bf40247fc629b057aa27f67dee07ae3a8e70101b93cfb08bdf6eb8af4e520710000000ff78aac92b043361eb3c5523d5ae67ea0b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000b0000000000000005010000004d080000000000100400000000040100000050040000000500000042010000005320000000dc6f29d8dfd0c223b02df07f9ee917e148eef06b5dac83ac2b1021a7f3b541e404010000005604000000130000000000040000000d0a0d0a*51cfd96f37a9ce577068329db68227e45eb02eeadbe30c7160bf78dc453c4744",
+					"chacha20_argon2id:$keepass$*4*10*9e298b19*67108864*19*4*4275e8698a99139c0affd9926f00a55a3db2251837f876b567419248382a766d*8e654b154ac24ae7966e43432813d2d39951007215a600dad53509472f746840*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a03040000000100000004200000004275e8698a99139c0affd9926f00a55a3db2251837f876b567419248382a766d070c00000079a90871e71cf0deb3afaa240b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d0800000000000004000000000401000000500400000004000000420100000053200000008e654b154ac24ae7966e43432813d2d39951007215a600dad53509472f74684004010000005604000000130000000000040000000d0a0d0a*54d27fe00c2ad00051b262d2dcc684e9a577bc915db6a855246f6613c002fb49"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d{1,5}\\*9e298b19\\*\\d{3,12}\\*\\d{1,3}\\*\\d{1,3}\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\*\\d\\*\\d{2}\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": 34300,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2id KDF / with keyfile",
+				"samples": [
+					"Passwords2:$keepass$*4*10*9e298b19*67108864*19*4*cab25b0c50639dfc73924f70764184b285906fcc798588b28db8c8bbe1b2a410*a9ef7e8f58bfa46a9f1cbaa0b554b7f5e2e3bb430079634561a7ff2781f0490d*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000cab25b0c50639dfc73924f70764184b285906fcc798588b28db8c8bbe1b2a41007100000000fac592c92c2da6385ab8ea6b33ce9f20b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d080000000000000400000000040100000050040000000400000042010000005320000000a9ef7e8f58bfa46a9f1cbaa0b554b7f5e2e3bb430079634561a7ff2781f0490d04010000005604000000130000000000040000000d0a0d0a*f7a91be1cdfbd5caa2d0560c6f400df08490bdcfc3fcf7691782505fd5dd168d*1*64*d9cf6daa6d6acb14ad3ecdb7a60db9e9a6fcae34505d72a7ac01323e46917f9c"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d+\\*c9d9f39a\\*0\\*0\\*0\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": null,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / AES-KDF / without keyfile",
+				"samples": [
+					"aes_aes:$keepass$*4*44776120*c9d9f39a*0*0*0*a85d8ea2370468ceb9c2de82c4bfab6c3039f31511da48284b4db1ffb50e8458*dc5b1980126661b38f1d8fb5b9e8eae6c491d7f2e95b062c4a961524f9546485*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000a85d8ea2370468ceb9c2de82c4bfab6c3039f31511da48284b4db1ffb50e84580710000000ef979a5c620cb5255ce2d7ad4e174e090b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000b83aab020000000042010000005320000000dc5b1980126661b38f1d8fb5b9e8eae6c491d7f2e95b062c4a961524f95464850000040000000d0a0d0a*f5cd3664fe32d9da8b3ad4db1434462742ec4e72a4167965d762a3bd9ea89f31",
+					"twofish_aes:$keepass$*4*42253520*c9d9f39a*0*0*0*66944e4812a44c84c65378b35966ddfb93509065b9a502f87dfa2eb51b214856*d5deb3d7f24b8e87e94b79690e73f37d6e66aa4d3d3acf5ec4fc10c72833d616*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c030400000001000000042000000066944e4812a44c84c65378b35966ddfb93509065b9a502f87dfa2eb51b2148560710000000e1793309c306e01878489ede9b2a78690b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000d0bc84020000000042010000005320000000d5deb3d7f24b8e87e94b79690e73f37d6e66aa4d3d3acf5ec4fc10c72833d6160000040000000d0a0d0a*9a0380debf44bcff62ac1410a4d4f95a4cae31555550af5433e69d7a4287eea2",
+					"chacha20_aes:$keepass$*4*33333334*c9d9f39a*0*0*0*dfd69128124421d18c2fa660224336d574b8a3a573b35cfd6b685f68141abc6b*173c2c996851314140cfd5fcc0188e774aca98867f647c1745f3fcac19fa3117*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a0304000000010000000420000000dfd69128124421d18c2fa660224336d574b8a3a573b35cfd6b685f68141abc6b070c0000004272014060b35491633b52810b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea0501000000520800000056a0fc010000000042010000005320000000173c2c996851314140cfd5fcc0188e774aca98867f647c1745f3fcac19fa31170000040000000d0a0d0a*4fc2a0f24999518d8f24047dce83d87789c14371b2f8c365464f8ec4d7578a91"
+				]
+			}
+		]
+	},
+{
+		"regex": "\\A(?:.+:)?\\$keepass\\$\\*4\\*\\d+\\*c9d9f39a\\*0\\*0\\*0\\*[a-f0-9]{64}\\*[a-f0-9]{64}\\*[a-f0-9]+\\*[a-f0-9]{64}\\*\\d\\*\\d{2}\\*[a-f0-9]{64}\\Z",
+		"modes": [
+			{
+				"john": "keepass",
+				"hashcat": null,
+				"extended": false,
+				"name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / AES-KDF / with keyfile",
+				"samples": [
+					"Passwords3:$keepass$*4*53571428*c9d9f39a*0*0*0*65b3d203279dbaeda862a76b49ba3cefb6ef0fd0cd72706d74af134cf1e24596*017158d319eda2ba3866f51d76cd45075261871274d4820ee44dc877ae4febdf*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000065b3d203279dbaeda862a76b49ba3cefb6ef0fd0cd72706d74af134cf1e245960710000000d915ab89160416406305dc22fadd879d0b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000646f31030000000042010000005320000000017158d319eda2ba3866f51d76cd45075261871274d4820ee44dc877ae4febdf0000040000000d0a0d0a*9e7c496b836e2988c49742c2720e504037745898f487dea240a7e18c8bee48c1*1*64*ca0c5137df1f4bb3bf2b3b6d9d196509a0b1a2da9b174d641419782aaffa9345"
 				]
 			}
 		]
@@ -5913,13 +6259,13 @@
 		]
 	},
 	{
-		"regex": "\\A\\$sshng\\$0\\$\\d\\$[a-f0-9]{16}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"regex": "\\A(?:.+:)?\\$sshng\\$0\\$\\d\\$[a-f0-9]{16}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
 		"modes": [
 			{
 				"john": "ssh",
 				"hashcat": 22911,
 				"extended": false,
-				"name": "OpenSSH private key (RSA/DSA/EC)",
+				"name": "OpenSSH private key (RSA/DSA + 3DES)",
 				"samples": [
 					"$sshng$0$8$7532262427635482$1224$e1b1690703b83fd0ab6677c89a00dfce57fc2f345ebd2b2993bf0d8bb267449d08839213dc234dd23c7a181077e00080ced2700a161c4352ce5574b9758926f09106157715b6d756cf6dd844e473c6bb3c2b591cdbf684394a49935f7d62bcc324c1392aee499e3d6235db0556d27adc6e35ef4654ee5fc72e60dff605484e75c6fd6ae29cb476f8a658dbcce9f9591a9dad023f6d9aa223c3d56261e056c5cafa93438937e0762b989cd10e6280a09488be07423c549514ff9686338e72dbe6bdc5015944739a9f183cacf04c1c141dc8c8d8aa8636c85a6c0578a5983ed33d5ff5ee6a66a54d86defd1c4f9d6a59446861bf4cc7bd667bc92b9d328c154f442d1d03d4d370dcc065a1d5420c5b71e4c35a457e11a0c9f489636559a2ac53bb4cfee2b0058f8a9d1ccc38a844ee0d1ff5d6938427bf24d6e4c69f10e6ebce9187d51e867ac3b362b9c6149712e8378a9ac91d1aab1a7a5f088ddbdead0cc754c30961b7a71284b5c6658f7219632de6007d5145a1ae062f807234230ff73a3436ce28ae3bfa0f880d1e49ec8a288da18db14905bc7a7b061a51c429876db81ad528efb469ba2bf46c7344aadc7d082efc83ede3894bf6b1738151e642f6f60a41069ad862d2f4f8d55733bd6d85086d1d9bb1913a9d4680ea0b49f712c590a3c18b91ef745b9bdf461af67879d94f9672de4abe0b7d2e4efba1f8bb6ffbb4a095742d5cff0e225b1b5e166854bb9821e4283d97f80855c81efea1eb3e7881a6049186650bfbf68f30302c069883668e373c12ce9a39de8d7c1be22a717d9c74410c45093aae03c5de8cc0ec662fe3bb81bf952e17b854001bcad9b36cab2f473a609878a419b735c66f3732bd5540fb1cba9fe081f87cecf63a6243cd2049dfa25a763ef2e0633bfb13a411207d8ca1c8f3c0c30b8a7583436cad7bd8c28ba625b9c53dc280b314671b0a55d75a28d3b21de250e3c554b86ca5d32821ab912c6607687c4dc5b3214216a7409621ce6fb89bd5309a7dd8ec9ae4b751bdfb6b5d12d733a89d87722dbdb1b15df5463241f0f56c401e095ea5dee07c0ded1f11ffbd7c93a41add0cfd8c57b44f255fdfd1929cd7d068d6cf951ba8ab0d718996fec10aaa26a4314d4c1272f744adf3c7e4d710ae171c072a7c61c2b020a445cf32be3083d3bc62083f2385bbae4fadddf8714258b996abd574638891bb918e877fdef3a4856b910999a6dc9dbd13c0e938825cd895c96d39cb86bb283a53fac7090c71a9320c6a34af309d2218af64c895f5eff8eee28cf94e7a7437a0922d83bfa39f08bb40e354d9ace07aa586a446dc217ede98b6ca9637545cc11ef56732fc9cd3dc06e459d868137b75d39a87e6721a95f2b84e57c94ef703486a2857821e497b990c95080015d825b6dc63d666f66cfa35912e607c3b650d81dc98c0c53322796ff9249cdfe7a375e1d01607816a85bb43f3969767a9aaed07161344e714d7e875b40f3524f95e476e605dbd2ac51e36075701fa93b66f36470796ebf5d35690a297e19729f9ac59d98622e3ad3e45a2914bdd2b807446c8b430e54c1a607fd25a69bf469a61d2e3bc3697b786c047bc60dbeabe6372d71e9b7c9787bb2559c663a011f864ecf32793e65f4bdd76370d99f602ddcbc7e5aa7d2749f36e8d0f209a378782882bc06ee5b5014c2a6248469f0fe0fc5369383db0bc898c0760b8c40fe20342fa5b"
 				]
@@ -5927,27 +6273,29 @@
 		]
 	},
 	{
-		"regex": "\\A\\$sshng\\$6\\$\\d\\$[a-f0-9]{16}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"regex": "\\A(?:.+:)?\\$sshng\\$6\\$\\d{1,2}\\$[a-f0-9]{16,32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d+)?\\Z",
 		"modes": [
 			{
 				"john": "ssh",
 				"hashcat": 22921,
 				"extended": false,
-				"name": "OpenSSH private key (RSA/DSA/EC)",
+				"name": "OpenSSH private key (RSA/DSA/EC + Bcrypt PBKDF + AES-256-CTR)",
 				"samples": [
-					"$sshng$6$8$7620048997557487$1224$13517a1204dc69528c474ef5cbb02d548698771f2a607c04ea54eb92f13dedba0f2185d2884b4db0c95ce6432856108ea2db858be443e0f8004ffcd60857e4ff1e42b17f056998ec5f96806a06e39cc6e6d7ef4ce8ae62b57b2ec0d0236c35cf4bc00dd6fda45e4788dcca0f0e44dddae1dad2d6e7b705d076f2f8fc5837eec4a002d9633bcad1f395ca8e85e78459abe293451567494d440c3f087bb7fe4d6588018f92ca327dda514a99d7b4b32434da0e3b1bf9344afb2fe29f8d8315a385fe8b81fd4c202c7d82cd9f0bb1600e59762ab6ea1b42e4e299f0a59ce510767e1e1138453d362d0a1aa6680e86b5aa0bd5c62165f4fe7c2867f9533578085adc36739d6c9cf7b36899aac39dcabac8b39194433423e8e18ba28496bbe14dd01231eb5b091ae9de0f7f9ea714c22edac394077fb758fe496e1880571ade399ac229457ddd98577f8a01a036ad3bc8b03a9fb02e26b4b76f6cb676eabe82d1606fca0c5fca62cd1d82c3df1ed58ab4acd4611b2827ebde722bc05e471a427225818aa36dabf5bf1203ccb0ebc8dec097e49f7f948bfe7b939e6d0ff1125b863c033768f588964f8b77ca1e2425751f873f80e5d6a0671f7860cf4a46533585094726c3afe5f7203fa4a01650fa9839772c713a033139cfc6a6e6f7dc62e5844d4c57ef4fc3321bc85d597a54bd6fe37e9e696cf3b5ec66f55232e0964dc5cf880d8a41a9891150618bd9c088fd9824af0d86f817f2c79429c3d56cd6eb41eb6120f9accc10a863f23a2bb6c57d4bd6193f2283ae0215e2e87e672a8438e2550c044fa9556bdb4afc40d8c2752ffbc6c95571756a3c230bb2fa95f519f8da238ef0857ecf860247a8b26e28269f9bad564e7d8bfba2eac9760b52449251cb35e183f5b309a09071535154c6f1013b58f305b544f3589c9eb0e9ac4267a84374a3eab49c53aa9bedbf97f8f19ebc212d8db74ee03554a3514140667fa4ce8e06aad3f32d1b00015be0e8979fe66736018589beee06d6f318851dbe8d9689e70202185d71fc5e5a3d2996ddb8ae1d7718c49855c6f8c43301e0915f324f30d0d9c6a8504a91ad5a7179aafb87ede58598394949910874850994abe815817359152ff6a7c8cc6f19524dfc5e50ddfd038a2275bf809e3c8f05ed3e3137ebd62d91cd3578533787c3847e3c5e07e5a891480e5ceabcf6c344e7bec8b640ab9a03e90b846b35d2f46ba150accef32d2597b064810b15fd54fca6d2b146feabcd05c0b51617ae95e36f6817a62c3ff42c5c2f6f1d20a8a1fd334d3b7d3f83bba057b79d9b5508bb0cb706ba00acb0ab797401fdcfac80b5b6e38e51aec0b38f33ff4690425ca28d88a2e876591521230150b4e20a4a82e50061cee9c0705100bfe5fdbd8ef27aec20387cf32455ef305bce2a91ae6da91fc41376b97149e9b41c901b24811df9272ff09718923b8d94e8e459a164a22b0eca47653f3efcbf08188c5da78cd9fb9eda1761094f9d8bc3d479e9f40c7d79ebaaba2a5c632329f20a9962040ff8f512b42c5f32a8460d87b8e93c6f980a1562c436eea1c8994fbf671dda3c4ccd3c142acfcdde2ab61227289ad408213ac8e22d9ef487f36925f5ba3b8e7e913d25c4a8592c861d13f03b615bc2760aabc61d68db80d35296a3312fdf4b56c0fbee5ab3fea1cf9caf3960a564046939e8002d2dd909db446d85aeae9dd42a33fe28684f722172e6"
+					"$sshng$6$8$7620048997557487$1224$13517a1204dc69528c474ef5cbb02d548698771f2a607c04ea54eb92f13dedba0f2185d2884b4db0c95ce6432856108ea2db858be443e0f8004ffcd60857e4ff1e42b17f056998ec5f96806a06e39cc6e6d7ef4ce8ae62b57b2ec0d0236c35cf4bc00dd6fda45e4788dcca0f0e44dddae1dad2d6e7b705d076f2f8fc5837eec4a002d9633bcad1f395ca8e85e78459abe293451567494d440c3f087bb7fe4d6588018f92ca327dda514a99d7b4b32434da0e3b1bf9344afb2fe29f8d8315a385fe8b81fd4c202c7d82cd9f0bb1600e59762ab6ea1b42e4e299f0a59ce510767e1e1138453d362d0a1aa6680e86b5aa0bd5c62165f4fe7c2867f9533578085adc36739d6c9cf7b36899aac39dcabac8b39194433423e8e18ba28496bbe14dd01231eb5b091ae9de0f7f9ea714c22edac394077fb758fe496e1880571ade399ac229457ddd98577f8a01a036ad3bc8b03a9fb02e26b4b76f6cb676eabe82d1606fca0c5fca62cd1d82c3df1ed58ab4acd4611b2827ebde722bc05e471a427225818aa36dabf5bf1203ccb0ebc8dec097e49f7f948bfe7b939e6d0ff1125b863c033768f588964f8b77ca1e2425751f873f80e5d6a0671f7860cf4a46533585094726c3afe5f7203fa4a01650fa9839772c713a033139cfc6a6e6f7dc62e5844d4c57ef4fc3321bc85d597a54bd6fe37e9e696cf3b5ec66f55232e0964dc5cf880d8a41a9891150618bd9c088fd9824af0d86f817f2c79429c3d56cd6eb41eb6120f9accc10a863f23a2bb6c57d4bd6193f2283ae0215e2e87e672a8438e2550c044fa9556bdb4afc40d8c2752ffbc6c95571756a3c230bb2fa95f519f8da238ef0857ecf860247a8b26e28269f9bad564e7d8bfba2eac9760b52449251cb35e183f5b309a09071535154c6f1013b58f305b544f3589c9eb0e9ac4267a84374a3eab49c53aa9bedbf97f8f19ebc212d8db74ee03554a3514140667fa4ce8e06aad3f32d1b00015be0e8979fe66736018589beee06d6f318851dbe8d9689e70202185d71fc5e5a3d2996ddb8ae1d7718c49855c6f8c43301e0915f324f30d0d9c6a8504a91ad5a7179aafb87ede58598394949910874850994abe815817359152ff6a7c8cc6f19524dfc5e50ddfd038a2275bf809e3c8f05ed3e3137ebd62d91cd3578533787c3847e3c5e07e5a891480e5ceabcf6c344e7bec8b640ab9a03e90b846b35d2f46ba150accef32d2597b064810b15fd54fca6d2b146feabcd05c0b51617ae95e36f6817a62c3ff42c5c2f6f1d20a8a1fd334d3b7d3f83bba057b79d9b5508bb0cb706ba00acb0ab797401fdcfac80b5b6e38e51aec0b38f33ff4690425ca28d88a2e876591521230150b4e20a4a82e50061cee9c0705100bfe5fdbd8ef27aec20387cf32455ef305bce2a91ae6da91fc41376b97149e9b41c901b24811df9272ff09718923b8d94e8e459a164a22b0eca47653f3efcbf08188c5da78cd9fb9eda1761094f9d8bc3d479e9f40c7d79ebaaba2a5c632329f20a9962040ff8f512b42c5f32a8460d87b8e93c6f980a1562c436eea1c8994fbf671dda3c4ccd3c142acfcdde2ab61227289ad408213ac8e22d9ef487f36925f5ba3b8e7e913d25c4a8592c861d13f03b615bc2760aabc61d68db80d35296a3312fdf4b56c0fbee5ab3fea1cf9caf3960a564046939e8002d2dd909db446d85aeae9dd42a33fe28684f722172e6",
+					"id_ed25519:$sshng$6$16$7aaacd96f5d90b595e95ec0b1ff64fa4$274$6f70656e7373682d6b65792d7631000000000a6165733235362d6374720000000662637279707400000018000000107aaacd96f5d90b595e95ec0b1ff64fa40000001800000001000000330000000b7373682d6564323535313900000020c55d041c041604ff871be853bfec2d62654416bfc01593531251157ade20ff5500000090cf59137eee3fca657818cde5c17b09e005da8abf6c856f89f27d03d3208ff1bcc9ea18054d8b1f0c13fd5d5bb7cb850f256f5578cb4f194f7b4f9a7517a78c26cc549f9cebc7026d43abf47e359caa9cf2e01adbfc5284d74bf728099780accd600fcdfd7d7aa60050698820be8564eb717379bfc618ec6f69d8d6d09670a5e9999b4dd4e1921921bf356c58e0af06ff$24$130",
+					"$sshng$6$16$c26644e92fdea90db2eaf7662b4bac6c$4730$6f70656e7373682d6b65792d7631000000000a6165733235362d637472000000066263727970740000001800000010c26644e92fdea90db2eaf7662b4bac6c00000018000000010000040b000000077373682d72736100000003010001000003f500c806d8b02f84d7ebb364b7ffc0ad621a8bfc02f566ce980b0941b7a50d468a3808cba9e7dd36c97848ce0cecb7427df5187c59c305416b43897692c5592361683e864363d14f163e4eac2da7daf5483b7cef894a27d469e7ff8547d9191cb99211854603c2f28db48a3dc46d3e5eccd7584756934a2465ba551a5766eaf3e7ccb1fd4e529b42f09cf9dc2d506b28fb314442fa8d3d94682cbdca8be9b0765399008955a79fd82ed804c71db2b6a8b502ecfdf5d22cf60b819bd748b1872a0294c0edcd050d7d4e1199f26aafbe122ad66f5364911d8896be623f4bbe7b1535f92c933a529e35e38b6bed78ccc371aab9e4a8c7d626ca51bac3321df5fc103639ac0afabf4c287a6bdc8ba11a3f0792a74ddc0b409af2836884f6f085558f67b6f2e685bdf21ff4fa9b2b67a90115fb31a60ca2787e9030d428265ca3c6b4a21999206fbfb6fa5fe203722043d04694b9dd5d1a0e21de127d0b0aa4ca945f39677f4a20674c0c931086d918dfbbc99afebaad439b81a777ae65093753153623ca2245c685e5a5bfd2f978a61f7ecef9054dd6ab2aea283bdc76f26caee7b56e4f98aa74fd32ae2e1eb786fddb863a668e0678cea284621108f282f5b09aee513d5777b4c1d536e1b3d095cdc89d0a78759607be132bdb84b1467525852c0ff825597f7ecaffb7b0071037f106609f7e00c6af64d51e51eaa4773762212d695e002578bdc06955e138baf78762a97dba8e6d81d0e51d7e5be6782b7d7cc603f45c23d93a702de88a3f6326293f35ba529657acded4a2ce496e6b4113f08f871b09b84b1d6bf001ba59cfe9662614ed1a775bc8b784b56cc49dbf9a9b21be24e99676f9b288cb0633e406d0c47469f9ecaeb02884bdc615c8235c2e36a6e0667a844f5a7bf7cbddd264391dd0278585207d04ae514d689d141c95bfaebdfa25252c3deaf59070e2122d3a3805f6e60f9186eacc8bbf1a4624005f95a7397fc795e2cc75f69644a21bbe751234746490f54d401e30d6bc5940fbc6b5823d89cff3a921d2efa90febdf4dd22c91db4dbbd178b844a2274d321498d2d92687223dc5ff8bc614e1f4c7628e79467ed36533c5ce77f295e868be1d4dbdadd2faa2d7a560571650b3b1f2eed7091b2ab7a9ec7ca0e642e777c1ec4d52590f541a0898262031b0906934a1d5e109d5f678b6a0bfba74dbe271e81c1e355c9200886a894f8c9b02233d44ce4c92351a2f3cb68caab8e0df30bd89f3d5d32b72c0fe6cb25c584317e922ed26d592cebd39aa4f0ed4bf29c802125427bcbf20a7543128b692cc7f01ee6ba9270b74ed44b331c9130901f1eb0a76650cfbf238fd124abf4f77afef9bc0396048e341633b082b4786c27cc221c0844cc564ddbc9a35f4921eaefd30ce32af9e0bd92677725e53f73962e40062671300000e2088854d5c9989180c9babd5a54e8f78b2914fe70f866e501b2a322ca0b90ac6ad2d54c169818cd27643503a97612c93d016d2614f427d4d9b4e6d7da4ee90796fc397511b912a7d9191ae016bf91e8de48e8c597ad366ef827df3ac06cc7e6d9e27ee3040e481c39507daddda3a0fa0002f6baa6f79a368ccab73a55707f41ffb26664f464fb67df24a54f25046b497f70aaf5e42c435ecc9eaeb8bcbf362659f2f5c8c389a8dd16f3c40b5d1a902d2a83f354a2b1ea0ef7cfb1bc25056bcdb34c065a9fa6b741057fc8bd4432ab80f4f8c7f16f5a9629c712e12c36063f71a664da781061145e2539011a9acded5da9635094e26a968eae89e46e182dc3bb9ed2a9644b19b8d716a1d123a5b3633d53f2ab2c741c49b04ab230b9f883c7a70e850717f13fec82c5e345870e346b24a8f97dfed80308ea9fcb5016690431f63a8aeff2f16b9555182e9c7a6a8c9d29c48e54c68aab26dc023b98a4186a3ee198209304f75fdde6b65aec2ca10a9652765fd806eefac82239f33fbadef300df9e3ea20288c94cc95b87595ca2ce36569ff8e80e0617d5c94e3c3b480ba97e2c225f115830979a7a093f7ded960cce020b08e8fca2073df8dfba47101932ef0e3f1d36019917fdba02aef1318c2c95e98de36b4669c370b57a0cf03a3977e146a34b4a8fa12e62df59ccb7fead8cec301c6508685651aa1ffd2da67abbb4a8cf4671d5af821a76e8427b19f8116cf9c3e2af53aef7250b7ccfaed0433c7d5c0c95bf6982587705a19a2a152948eef60e0f1e1c5c4d1845ae2bafd00d8e041c77c0a8eca43b2b3e5cef1ceee2e8e2e5eb442ace8a314b0bf04b7388cd495374bfe2c1d9d540bb7ce41894b6e3fe3e5fd81628c640d78c2fb73ad67b01c131e5da5b0d3bb8bb8828f5750943811f96b25b8fc08db5296b44ef7d15da180862db98843ed2f0cd6f8131668e23604b2bff1689ae3aaac223764b0b09dd672d01b97c885eea5408c3669be10280c0df06200a91bd084df829abbab2164de8abc3ba539a5ede40622432611032fc966d266631a6e7cc1ab9d346368e6d2cf1b2de5693355f6f77d5cf26e2a62bfc2ac45c18d338a01bc69ab23cd0f274fe322517fc4170c9b5d5dae0e68e9c4289ce5530a0dbcd471cf0a9ef325653f400bc287e5b7ba2136e3c0cbff61cb58055db9479ecd362093f6ac69e854946c8557af8de6d938b6caf19af3b05f8dc22f2721cf329f30e3c3cd7b90b58395324a0f11978ca31b213f8aca5c4ecfc9a1c8652c2469b8a78136b41e1f76ef5d271b67ac3d346b2d169d8dd0ef7ab26d6277ba47b0546f07599a92b2f94b8a6db50eb5d9b722eab8203bb08cf10a604b9b37b5cc0cdb83ebc43b3a866402f947b63e57f0519a749c3d993d874d662a10a1358b67332be5e5b5b938550aae99152cacc026df8794bc2e681e7e1470216520a51df69ae605a91e67e130b3dd315d390f20d86d0585e1717f419a6448e52f072d556e95fa998f297429bbb6eb8b04670234e34905d145ee456e02e86b6e008b2f04825248d16080f08ce8e3081d0c03d88331c0a4c6de650cd2ddc6141383ff28be7e4d077d0faf9aa7018bfa5f52fc48419f948189989cb87f92ecfb285db3b16a5a6941ee5a1b9aa2365eaa647903a88212621a39c5f10d3ebc75bf8ed0ce596de02d7fb3f93e67fc6d18b5124453cb468966a33ab3002bbcbc274ed2466e4d476720a1b4006329ccd12356cff654a1441f0b2d6d711214c5c4a03751fdcc4a20dac1dc91f9981ac7f2392840fe1e706cf33780ec1b8ee9c1854be2ca3bc89728ea4ec0a2440f95a2313e2512808fe7c89dbb4036b243a9aac8e07d50772c090555eb919972e86d4dececc66931f2df2f5ff73604391db4e04b183ceaaa3c992d319ca0806f59dd067f044d1fc6a1ecc89d0263c9ae3c2b361e5ae39bcc2d02d1ec966368646d9bd85b0a447a8f4235395af589dc19c57a7021d54d1fefb97dffdb534d1c9028f7bae41994480c55ec91e79015fcdc2587ff1d22a63c48d9d44eee4eb2356b8c9a183b0c65bf35fddbe4ee668a71480e1f6d92dad0266fda7e90b06d87e8301122b91f75d917db0124af75da0d859fb3e1b15d81e4c62cd92ae09d4804c2768e4f86adbedb45131b81fefdcace21b4dab7656ad8747f53f2b8abf994edb8497d27d9cdf320f15a7b55e0488bd157f4f5275b443468c77beddf414965f977b9ddb2ff42baa544f62e1e707744e91226830764e59dafdd6280a032c8585b441c6c245f84ff8d94e9ff6abb67ae11cc3736d85aeae8d04e95b5defb0a1048fffd0eff1d5182a704b7e806561b300325296fb53353d6950a8fc8d80377e0e68398dda2dba8ccaa285c60b8c2e066dbcd68b4b852bdb72e3a0a708cbc92a2a645345fe1882f71853a68c6cc81b82d9e4ad76317aa679479c81f26f6d3c665c49c6142872a72c0e6a0f5a0297eb96229ed5b26420de64ef86e4b5842505fc3ed55e0cab16bad04ed66f664056218c45ed971ae732f1747fcfd020edaeeff0d1a033c45258b577c9ab5dede4585b7be85f27e25a86818d10f1135863cdf137e0a0513b05bd4bd75462b46419dc81202bcdc5c86c268718b405915c1e0b6df974a16ce59cf2bccb81eff83e87becf1894aa6ca06a807b8be38b8cbd15bb70cbb6e81ebb0fe9bb87f6977f8a00ebc13ad0156d8b554e1d22c8c3f4038faeca3d3d8ad26c3c643133ce00c7d99dc755d82bf85987c1b52c16a29bcaa0d699035494846b9481bfcc91bf029e3d1b4f11254a7f6e46e2984c7b0e61dd446afb675004f5d5e31abf5ea53824096ad29cea40f62722f7c66acca38fa96ba2474509aaba29e9c03d6554062f3cb386d43ec4d345012c2cec03f7acfacef3108f9cdb430853c174e3cfd1d0a97f042ded010c0b774db994461a44849579534c80fcfccd5c497ebc2fe2159532d08169b2f8a19a33411f963344d4c6189b135f6545cff20b15a13fa49852f363fd9ef1ae93cd018354100142f5c6094e69b10efca389b71b8a6a6914753fa4c2c0926b851bfd9b339a1499b0a7eeef0bcffc65e8a10464105f8d7f793032e8377151ed7c847e52804f78475da5c95ebae94eef9e39dc2744ef89a5bba6c87a9b3fc96b8c10ace00d8bacf96f494eea5e6b8640ab3cfe1ac8161aec332416f08251e85ace169fc106c24826d1805f56ef6bb353c0c9a14e9869cd0cb366eb64a87ee37f58291f862c4a6e8742146553d28d5e7e6106297b8c3edc1c08a0cae6b27bbbace84062b3e59c8b37fa3df2fac17044b39c248595b91d0262037557f27c9deebeab1c1fe4acd5a3b764c6d4676c74b9e005e121b859a563d89f022483588bfd10b7c22de538c3f85219cd329c42dc23fa787d07d310625a774f29b474b81a3eb2604ce5a26b1c015d1342d5f1aa4d9295fc5d9f80cead3d67d5cc300117a3fdd7466dd7c09298f605730412de34ed77550af0313709e2b159bbc1f241d821c8842e44cc13d18d23ea0c24f66b206c9fd12147f50a95f5ade73690c9b7517925555fee96b53d5bd2dd137e5670d76bd15b1aeae1737c9903ac03789d347b61c4db113849e4b164670f39496fd1b92644409bcbb4213d3aadb032791851501643dc27f032ba4ef88f8d36e439330c4fefe65eb2304c351564e02c81e54ad90d5cb9aad8f3a35837ce3547233dee3742a0a9a86370664bf0e925c618709ab51d3141267642ed3095c4e939b1060a6bd0f18216957977967aa2bb0706d7f579828548ed238eec56c224f4883148f6f1b1ffc8a61ea10012e18e0f7f3f16a9177799fe365c301d6a8421e8e4d583a6f7c0b4791300d7537d1deef9272810a1ede18139659404149cdbe93f156c597ba2f0ef27769f2ba1eb784d7a22687e3fe860fcfd49cd134fdfbae3cc63330fb2cede41ec15a410551fd47190e4f7882d08a2b378b4e57209a6774654bdbf0275374140c4c5fe9ee019e8422c0606bbd7eea7b9682ac1713970826e0a7f285cf970610543298bfdc901818994d282e8132c5c0373959579beb71c25b5ad7181c9d712c08ad189c476798d3a345d786c2f97eb36863cbe39f4f033732513a2243a2b53fae85987d5134b5362bdc07555173fd80259b06916420727fe53ef78cc79a2a70c4a3b3cf68bf7116fee56cea9005b212c638463fa7115598cbaf56aff2df7d65d5268d4200e3c0f2ba086fd465cf24afe3a903dc4403ae2d920090f05b7954a0267ac483a2f6e28325a80f4fe69d7c36e3ab8816765e46632c86e7a7e568a95514371f4bced7ab3907607fda6218c424d6b93fb0ffaf36959bcb7b6abbee2acfb5bb3ff5e6468c5bf4ac69ee03932d67b24fce5d98c9f807788da3047c2106373775ef4422e22c5d86c9bcccda0c80e3e5fdcccb8478197a95b32b1210e06746f0afb189ccdf4786757969097bfb60ce5f5c3d7e1e0741129b9318fabdb31bdce6b5e98d21ae4bb2d70e818acfb94528264a335044a3c5a3e2888bec3478d9b6221e648d4b658498b69499f2474abfd10d42a11bd1ae8848798c473f3456eb1c619c3a20d5dc4feb0cf07797c2f45efff0cde070228f7372ae416144353468cc2925e1f8c9f7c2f0766ea85f7e57dc01414e9bb1c6992a291feafa967f0d76f7b6ed320f560a777376a7f623af260228f876f5ae519d7a853a66b73230870215f51a58c9fcbbb268f2904b8a7ffad3b7eecb068fee53c714be48a26683c06280dd7c9a5d1d26515cf34a543a88184625f64ea92fb999fcfc3d05778faddf956c8be75c73f8dfd07a096bf98bf713b14fcd949192e97048067c7c96a56d78f6bcb7da9c32898e83214426f2aac1a8da5ff06d4b12f8b5de1faa639852a1702a87d6db1df11ed39697e74578632146988625cb69923e3f23078b2781a5c96c1086b8e926e0f748ca337fc2b541771dd3f7d2c73f5d8493b4c9566c2babd7e5f5c2095749c8b4fe85e3bc62d692651ef1d8ff69e6c79ff4647f414016bb48c015a70e3ea4a463205de87d0013114835265b8215f40bfc4bc99afd7c4ee8884229bc879aaa1669751a260517d685c446b61371cb6a6e089f1d812ff6$24$1114"
 				]
 			}
 		]
 	},
 	{
-		"regex": "\\A\\$sshng\\$[13]\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"regex": "\\A(?:.+:)?\\$sshng\\$1\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
 		"modes": [
 			{
 				"john": "ssh",
 				"hashcat": 22931,
 				"extended": false,
-				"name": "OpenSSH private key (RSA/DSA/EC)",
+				"name": "OpenSSH private key (RSA/DSA + AES-128)",
 				"samples": [
 					"$sshng$1$16$14987802644369864387956120434709$1232$ffa56007ed83e49fdc439c776a9dec9656521385073bf71931a2c6503c93917e560cc98940c8cdcf2c709265e9ba20783a3bacc63423a98e40ea8999182613e1f5a80084719ca0e5c390299de1ea947df41f2ff1489bddfe13c6128612c5c82b7fc1ef5105ea28adda7b415729c66fb6cbc4b6b51ef518f74e1971f88e0cfabd69e8c4270678e360149ce15716fef4736df296a20d2607ef269a3c69896fc423683d6057e00064f84e04caf4d4663b51b307cfb1d1dbd6b3bf67764a08847c7b83fa5544e6a1e950f16acda8c8bac30675bc3cea9c7e06790ddc7cd1e4177b93bdd0d9edf9cdceb4a4444b437d967acdb92274a7b10d9cd1073ab4e9b5dd468aabe1f40a02b2e51f19840798c2311b625037eba5f0a0256638b42577385f4d4c730a9cedf4e244ce74656a21bf16756857866433dbb1feff9c4323d234d4235b72ed5a3adc3a6c9bae373472d64b7882d1762911326f330cb42d8ab7931f1ad2de56c4e6e8a6e838108cf9a2728ffa356796f63d94723b1d0aad5b4fcea16ab0730e7553804ad9ffb6ecdbdd925fca05ca1c076ed09a30df8a5add44a43c36b92248dc8dd4605bc2ee557e6e4438abf9ea7d047f764c55a5ba46a41719b9c55e54ad5fbfce6a89b9283c163d8464ecdda5aaf113d038b659950b8c79e87abad019eb77535cc8e63f760a4c87ca344a563475361766df718519b1b7e4b3ab511952fcc9b011f1d8971f9261509139b739afcc2c9acd006ee714dffc8c9a4df0d54770d70c8c28c27cdf9ee7301fd64530ef0ec3eb044fb891b193a7aaa9158625ed9f5a842c86ed09e5377d90a69aea4c5fd321bc3ac9b2a0d34509a5de0b72ac3f81304895c4381e01136b1e8654cec20c220c0ac6a1300f031ffc68ddeab554279024c122589b91556feef394a1663b42fb8460af5fe881cb1cd4984b84be75125411b1d3fc236dd81f99b872aad511d28944e91d2f8853f11be85b6930a15b4d0b3d215d76416970ade5726979c1d737980fb68ecb03d1196a69f4013dd2e296a75a4c69664b0162cb8b22af18c536a8ce51f39b1282f2fe07e6b034627f075cfb20dffee62817aabeea60befea1ac93ba608d957e4030e41be7bc55275bc4037300f6ba736370eb7c9240629853c95f9304b7ffd26a10d55ae735fa943e29aa9ed437b61955fc16cde9ea7a3658d831bdbc38befa45cec80da9ccb6d21da83ff666e32d7c5c0ca0ade2cd685407ee701c1c707fc5c80b22f3af42ac1353fcdc09a459086434db7c78792decdc91572363478a14d1256346a9ac6336b8183ed6252106aa546dd092c0bbb464cdb44ae165d67d1be135877587de3bbbd02b5ef6473f125366f6dae0536ebbe18ab8de8ce2ef3d26d6dd400319e7d07ae276b081e94446e9a72877cf23e9ba52406b1842e3a0dcf7bbdc63a1336b894be475613cc917eb47724f64e621bfc3053d7423e3e2fb141a3368dc8881fa20e040e9a6bc2e7348e923e4c20e506566b8663bf7d557e792cbe4adffcf9c520d58565d77f6bf1c9ed5fa3209f8047765d01b9c264e97a3ef9ff90766ad69a4f508041e168bf0f7419e54ec88bdc4c858231cdba60774a27cc459cd65b46e26a620a43033788c6e2ee8916670568d6e6c700515f2cbca3eef62028ce75245cf8f99cd6e0ba7839a7b335c797a06ff80571950ebec2fccebb89265025b3250e4a5c9c3a62f471324556fc4db044cebe97f62c86913"
 				]
@@ -5955,13 +6303,27 @@
 		]
 	},
 	{
-		"regex": "\\A\\$sshng\\$4\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"regex": "\\A(?:.+:)?\\$sshng\\$3\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"modes": [
+			{
+				"john": "ssh",
+				"hashcat": 22931,
+				"extended": false,
+				"name": "OpenSSH private key (EC + AES-128)",
+				"samples": [
+					"$sshng$3$16$00B535FBA963402F20C12648A59D7258$128$dfa09369ff38f33c9789d33760d16fdd47730311b41b51a0c7b1dd1dec850c5c2ff523710af12839f25a709f0076cdd3e3643fab2ea1d17c6fae52a797b55e752b71a1fdd46d5bd889b51ddc2a01922340e5be914a67dabf666aff1c88275bd8ec3529e26386279adeb480446ab869dc27c160bd8fe469d5f993b90aaffef8ce"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:.+:)?\\$sshng\\$4\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
 		"modes": [
 			{
 				"john": "ssh",
 				"hashcat": 22941,
 				"extended": false,
-				"name": "OpenSSH private key (RSA/DSA/EC)",
+				"name": "OpenSSH private key (RSA/DSA + AES-192)",
 				"samples": [
 					"$sshng$4$16$01684556100059289727957814500256$1232$b04d45fdfdf02a9ca91cbc9c53f9e59956822c72c718929aca9251cffd9ac48e48c490b7b6b6043df3a70cf5fbcc2f358b0e8b70d39155c93032b0fd79ec68f6cb8b7de8422ec95cb027a9eaacc453b0b99b5d3f8d6771d6b95b0242a1d8664de8598e8d6b6d6ee360fda5ae0106061a79e88ef2eef98a000b638f8fdc367155ec2d1120b366f74f0933efe5d174e7107db29dc8fb592b22b9837114415d78036c116b2d31b2080c7159442f2d1a61900f5ae4913548c8e7fc716dd4f812bc7e57b2dd5d3f56c6ae0e91c3bc2897d9341cb282d86b915d43cf20ad16fbd2056104529576142354a430281f5e458923ef8014ff9950351798bfcbbcb66cb98bb2cccea48c134b0e05e978d4308c82617869b207f0ed7b227893f2cdde2d6b6a98246de8a2494d5e018a84724780fbe8d1fa91c922908d18ccffbbbbc81e6578fe8bb5c8596a8cf689f3f12b810dee95887e12439e487313229a37913e3cd12bddba3bac94fab03aad8607f6034fa87f7a7a2ac74d0c0a6e6bc905f569221861e1e388cf379cda799d7b56eac58440d17fe97fa68a537d34317376c00dfa9a99e04725a0d2fcf27ee50463e725813c96fe2eed16de59e8a6944d903e11f7923d57ae6d4a1f8085ce19f4d180f13027806f3965fdf875ea092f103f28a5f42f356254958fa7eb0bca2389a6ad4e305640cc64501e6b16330b063037b1cf6fe64131f308e50d9d1dc687ffa487681941084ff21cb54c1b5903b7a78d9913595fa0124f1dde49b1bee2ea83837efe34e2cd6051a4a7a1437eaa84ad332ffd9946b952ed634948789d9541820a0f9c6f44ab6d3cad645743c76c54e79bfdc4fb8e43a0fd7d871baea98e78131bc530b6d736fa1ec5ac70438609497ab2ff8d516146b4b1b3488791cb84dccc0096b570e2ffb3a93cccefec0af7ce616a64466d2d4196941ba9e051dc00ed05e963a7b4a286973ee0b5df4fd92dfb0b229b10730d454832d945c6a596862212d109ce78ac14ffb5d775548b2f3e2ae4be059a24465cc10b7c810f8cc3db7cb327619cc104ebea575ac097d20701dc623f7aa893b785cc20851f3972390e00ab3355655f7d5bea323832c17d8e078e917843ef7fcaca349366092b6743bf7511d5fceb2d992fbd18574be532365be41ad80a114704a64a7aefdf98c907aa10e4d5c547dd8d21647ea9d5c975fe1b24525d94c3eb03e071742fd5f09f22da669b649fac9f87d8cf16c475d006421f69a9b2d5c4037ccc9bf9f0aa0e7df8ac5fcb0d88a528833f9640799026d2fe8694fa1a0307c5f24002172464b290bedd85667800edbff2f1de7119e5b65730a24922e42d53ef28b0a59817a298426dc72e29a85e59e3d777b19eb934bcd620a903aff72927cdbe7253f77694ab0ef970378b4347f6166ca2a40b23cc31970f0cbefd08d2d72bf2c3961d67c73a5a24f75a65e540dc5735520b0d81250af8980ddca3e22a9b25773afd27c76e564ff437d4208df14d802f1d0848390f45924cdd6ced3c9ffb726bb358b334ea0e0481acdd103f2db05f508f62588621d0b8fa274a69eba0d418d85086d9139391f7e28dc54fe9bab801f1fea854f27ad2e5907ae6f9a4b4527d16a8af3c8cbe2c6d82209dc6c7da060da58294eb00380598330c4c19d45581d09e04c0153a8559700b3a8ceab9b8124f84d397356cd9e38e3916afc1f63a3e1dfbc7df8dd0a7d0704e38a0ea523dfc2b9defd5"
 				]
@@ -5969,19 +6331,34 @@
 		]
 	},
 	{
-		"regex": "\\A\\$sshng\\$5\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
+		"regex": "\\A(?:.+:)?\\$sshng\\$5\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}\\Z",
 		"modes": [
 			{
 				"john": "ssh",
 				"hashcat": 22951,
 				"extended": false,
-				"name": "OpenSSH private key (RSA/DSA/EC)",
+				"name": "OpenSSH private key (RSA/DSA + AES-256)",
 				"samples": [
 					"$sshng$5$16$52935050547964524511665675049973$1232$febee392e88cea0086b3cdefd3efec8aedb6011ca4ca9884ef9776d09559109c328fd4daef62ea4094a588d90d4617bc0348cc1205ae140e5bdca4e81bf7a8ff4fcc9954d3548ba9a0d143a504750d04d41c455d6100b33dacc5f9a10036ae75be69a81471e945554a52ca12b95640a08f607eab70c4a750dc48917f3c9ee23c537e9b4a49728a9773a999dfd842cf9a38155029ea5d42f617dbec630889d078ffadaf3ff28eed65389a73528f3d0863fffd9a740edd59ca223595e330bca37ac5a003ac556d2b6232f9900fc8654586e73e7b2d83327d61b2fc561a78aacc8aff473bb3d18ddccae87d84de143a8a98550d955d01d4e6074ac62aa0af0bca58a0c53d0d7cf1a26345c1bd3eca7a0c0e711f5c7f942d50bc872be971d0c17dbc5a88f043a937ff5d28c5ef8d8d291e511d070b14a0cc696ee5088a944b113bc7e697cdc793e931c3f0f3a892b44aad1468e6c45becdcaa89febda17fcd5fe6ff430695e04b5b6271e032e3529315367e56337777a5b342c19d3ebc7441ac0f79b93749ad4526b8be0a5cf5756363aac93da6dc19dbfff15bacbbf2dae7a549afdab8e0589321ac0a612576bbfe06fde086075d1244450a3667f793ccc81fd5ccc5b1d08e6f447e3e0cd89b901049bedb1e65b23ede0d8f00ff1c984743b50342c50408e9060ed6a809a7b068972c9542cd91de0767c02a73d192ea600008bf4a6ef339c7f2db767346cc479e61abedb4ba4a67f72e91ac49a2e92bb4bacd97aed0b044c258e2004fa0fb8da3678a57d37187c1246c90a107540161462145fa7307a6d4db34694fb1b090f07bedb9ca0e71aefd3ce5601b87778fd6b66391c3c61d528a5965f91370f52a72f0622620329f96c5dd68561e0f6576f3a2bc5c21a95aed569edc4ed979746b32909178e550907c5f41d7b24480e81a874b931c23f13517ab5f9331f11819d982bf9e5b8a03034b47c8785f8902611eac26716976bccd51d19864f10ee1fbd62f8b0149c22ab06205a20f9f9fcb0a5279552a8923c3ace2e134f6b190653f430c1a4b82f762283028d9c0c8d1a3428731f4f405f40f947f297a43aa3ba2267bbc749a5677da92a63d51d24aa5ca3e9e1d35a8143d7b4bac481f0c56754e980a60cf2d330797fc81f6c6f405760f1257103ac6edf10976c9005f4a261f7aad055400c4f18dc445eb3a403740ad6c58afa4e8edb30fad907488baf0ede2eb3d3687d1e8724dd69c7bd14b90d4f113fc9f84a2c01ab00917f53cd879a4031b1c91a4d4d7d9e712a584959137001d331f6725dca81ea6cc55fac7fc0e8b578dec0983ca98c3789cdf83507e4c3ba056fdcbea26693a313077290d7c6695f4cc6de4848532f0149cc06dbf4c76d02944178520585923b636196ea2cbcacc43950b308fc7929e85de076a2ab65c9bd8ebb0c04c041281178a48d8d2165d315b3e74abf0a38505b71ae5b2a6e7f87861e174cff873a1f61980b53ef3acdd2ea6a25425b162e5dc0bc1aa2992585d2da1625a6593cc2d4fe8c86eeb4df0e27cda54685f7245e5c48063d489e8d93bd5303bebe633139dcdd04afa005d03d1185a64e8711c0b09d9d0b38b35d6ef1b1e35353a7a4396863650a3843c687a00396dd3db53e8d28baf29101abb9f628ba896b091618f24187f6eeb814e4b64130768fb37e89b9b3230e50a7e5aba852a983525c8f193deb1fe27b334cdc3bdfa4c301d04907ee29a848393"
 				]
 			}
 		]
 	},
+	{
+		"regex": "\\A(?:.+:)?\\$sshng\\$2\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d+)?\\Z",
+		"modes": [
+			{
+				"john": "ssh",
+				"hashcat": null,
+				"extended": false,
+				"name": "OpenSSH private key (RSA/DSA/EC + Bcrypt PBKDF + AES-256-CBC)",
+				"samples": [
+					"id_ed25519:$sshng$2$16$a5fb5dbace82f0b09bd8c85cfc7bd0f8$274$6f70656e7373682d6b65792d7631000000000a6165733235362d636263000000066263727970740000001800000010a5fb5dbace82f0b09bd8c85cfc7bd0f80000001800000001000000330000000b7373682d6564323535313900000020b884ea2d0820955399cde9bd1c40109d3991a78d50159dc23c01bfee73b7d29000000090d4cbee6b80c3d547afbe0baee87278619d19af1cbabf7fd8932dd90452e367a473cc7ce28c2f2ffa47307e2f1b37f891bc2f8a2d495624728487872937a9278947ecc95ecdb0e0308306336a1aaabedb86f7602393b31e2ee7512bc042dd220460ae479a8a5a23368fe4a05184581b5d20e60af19fb5c2a4cccac0b45f27e1606a569c585d04a79c30466e9257b4d022$24$130",
+					"~/.ssh/id_rsa:$sshng$2$16$042e55f014335212b806ac50186fe2a6$1910$6f70656e7373682d6b65792d7631000000000a6165733235362d636263000000066263727970740000001800000010042e55f014335212b806ac50186fe2a6000000180000000100000197000000077373682d727361000000030100010000018100dd927486e11ee6c90adbcc5dd4ba14e2d403191f5fdbe8c2ff8c3f01d024da3aaa9107e47f14d15fbf78d1494d764d375c129cc1980516b752f9fa69c674c9f19114384a156765a7e284c40934656375f4b2988a0a7ccf436a1cc650a71c65b95bf46da7429a302029be0b5cd95424779078115149188d7ea5a91725da17706d030be77691bb7f0302e433b192fdf29097ca436e5b6ad202d62b85e08aed5a39fda43362bca9527ee98dd3fbd3be25e467bb901f18091145c601821c93730f0e36d22ef0db11fc42aefacc9a589fedd6b1059f0458ddaa01fe7d1cb2c057decb91f66a7f8ef4dfe77afbf4e482abca5b5675d48db441dfa01f89745d824e444d48b60c7ea927673b752c2d283bc70bb8ef2b369b480d9dac65768c56aae7cd6c99f5a0666e31a5b3579ecb1ceaec1dccc35de6d4073c77f61bce118c4dca588ce73bec53f8ea108b99d221b3ce437086df22ed017307f603aaf7676dd0bea4942a45a6b572d9f71e6b04cc24a98b356f8867ac98143ad7b776944c3a68d95f21000005908c41c30162fc99528d0a9b699711e6e9e98e6fa6b8b16ed51083d6d17b74718390a13f0a32addd7f342ca53b4aebb60dad739fd8e6fda943667449c9e8147b348e0badecc889d17c1efd63af27c501fb63152ae903b3c0ead9fbb7d7e9b7247678099ed5d9abf4bae3cfb5f755eb21eb42858b356006c4bacf37056b76a51648c2b44e2e392ae4f82c90d37c624fe7771f64070dfefc45f492ae6b6a27cb73bce886a913a486c265f62f6c136ff9032e8fe2740eed07c0eb530d4d8328391525056eca0c09e43d0b5e59b9c809db710cbd4a0cc641ca0b23c8e04f695bbf049848b2c8847e32d59633f3f596d9cf5a8c0a8daad5d3d7aa464ce89d809dfc224daa6819f4c2e3e8c3f1d32693698f697fad3f3256a861bc9b07883e7bab2ef4c2a9dba07f50cb2097485e84c8dc486e897bec2ea47b06e2d719dcd763494ac0802c652e1d30f2744ef9487cbe2adad4b70dfeebdc4a4315d01b4b1ffb96c078f5341bf1ecff66afe8ac6b68e02b414d0fbb9e42ab01ea551472d2e86137861d1302ebde83b71895b8c085f3b81ed932cafdd9d14503a17edfe0314011b08a789c9cd8e5e851f852117729f69481a9810e61220dcbbca5b79773eba52746d7f7dcdc1d1a1e04b57ced5dc5250b94b947c97f72f88671eb877a19548f2b706561c5c72d900005d1aff00a799d1b8d5ba33a3f64fd1b2475850703ad889650341ecf2c058daf566f33612e1435d8fc62fa53c4aba1b5d97d653e6300da6f0838266d8d27db12c03678b879f6f62bd773689e8a5951f0bb42ecb71c68500ae7d4bd953b0d4d8d636b36fb02fe209afec0ba053e50cd0b74c7d723bc25a8a02f9ac97e23812641b57d887485f3c985ee2e03aefe1cee8809b00eb3c671565728f90745ec839fd96696d518bf4d9453cc26171745d938e254f18d8db3b0267d042fab5519c59e9401059c2b4ca8d9c1711ca5490deb94ef3e576fe42bfa4b88c49c845ac308de297ca1dae62fc54f6eb8508c89146e63e0a24a307e89ac6536171b6a8fa05224b0b6f3befe30d9d9af367b0939ab0ca0c729631ec3f84bbac56c6c023e5c111d236f8cfa863c6531def02ce130052b6d68de4c08ddc89a0668f0b0d31ffa752032989f9f5eb07a59ed6d2f37845343c455bf38a3738b08e0159b74931ca18a5e64780b46856b99b0d10ba40f11e7485a4e6f60a97d72e5a2c5ecf8f1fed1e1a3b879edc6e229af33b17414c6c18cc760a02927c1a9aa5937cc3c8691c422720a0bd507d62959efda6beb6d88db01bb4a1723e0bd1bafdac0eb0cbe83e9bc7cc4201a3bc77e76ae3bdb3cf11fbb90ab2435a4cd04230bfbf593e9ec9816790de523404d2a815dc35f04dcab9a2291af78b84f591bae1fb0fcc0c40737405144c91f2938ebdc286d9331658fd9403abc1998a8a6c66defc092c11027b6f7824549185a95c3286422a9c3a939f0bbaf92b33fc4cd61bc00f50cd8c0813153f36279bdaee71f2947ae824384c32741df4eefffcb035310395536d81149ab80ebbc6b6dc58a94dc36451e195305206413eac1b031b0f4265ffe8d96d992fa579804950f8400c0803b9164eb3967b01fda8d292a128714b75c881143baee4590694edfb5a00a0aed9d25e152c0ff8a9222e403af635a65cafc745b877e6d0f0ebda21c2e975961e853094534ee39f49bd9c1675615489c3d8d288562385d3063d9daca29f765fd1b00d55b97da7f1b8beb50633f9a5d4d96891e0dc2646bb375e4dac0f9d8981bc219add2881cd19589aadf95f917451b01366106f848831005f6e7800d6cecd0444895719fe734903c66f46d63b3dfb8c179e54851c38023cb522f952e8db6ebdc96ca7d1a86098c035e0327d8d2574111f47eede47a2f323856a001825051fa1908af78150290824477b9f9a0b7f5bb9db8525260567d4807bd815db2ebe717eb25048cf18e79d860fad359c10d36adf7d12c09ba1c7c1677b596f59b5bf5f0ff7f3dc12ef2d23a63$24$486"
+				]
+			}
+		]
+	},
 	{
 		"regex": "\\A\\$bitlocker\\$\\d\\$\\d{2}\\$[a-f0-9]{32}\\$\\d{7}\\$\\d{2}\\$[a-f0-9]{24}\\$\\d{2}\\$[a-f0-9]{120}\\Z",
 		"modes": [
@@ -6068,7 +6445,7 @@
 		]
 	},
 	{
-		"regex": "\\A[a-f0-9]{32}\\*[a-f0-9]{12}\\*[a-f0-9]{12}\\*[a-f0-9]{,64}\\Z",
+		"regex": "\\A[a-f0-9]{32}[*:][a-f0-9]{12}[*:][a-f0-9]{12}[*:][a-f0-9]{,64}\\Z",
 		"modes": [
 			{
 				"john": "wpapsk-pmk",
@@ -6076,7 +6453,68 @@
 				"extended": false,
 				"name": "WPA-PMKID-PBKDF2",
 				"samples": [
-					"2582a8281bf9d4308d6f5731d0e61c61*4604ba734d4e*89acf0e761f4*ed487162465a774bfba60eb603a39f3a"
+					"2582a8281bf9d4308d6f5731d0e61c61*4604ba734d4e*89acf0e761f4*ed487162465a774bfba60eb603a39f3a",
+					"2582a8281bf9d4308d6f5731d0e61c61:4604ba734d4e:89acf0e761f4:ed487162465a774bfba60eb603a39f3a"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A[a-f0-9]{32}[*:][a-f0-9]{12}[*:][a-f0-9]{12}\\Z",
+		"modes": [
+			{
+				"john": "wpapsk-pmk",
+				"hashcat": 16801,
+				"extended": false,
+				"name": "WPA-PMKID-PMK",
+				"samples": [
+					"2582a8281bf9d4308d6f5731d0e61c61:4604ba734d4e:89acf0e761f4"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A[a-f0-9]+\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 2500,
+				"extended": false,
+				"name": "WPA-EAPOL-PBKDF2",
+				"samples": [
+					"4843505804000000000235380000000000000000000000000000000000000000000000000000000000000151aecc428f182acefbd1a9e62d369a079265784da83ba4cf88375c44c830e6e5aa5d6faf352aa496a9ee129fb8292f7435df5420b823a1cd402aed449cced04f552c5b5acfebf06ae96a09c96d9a01c443a17aa62258c4f651a68aa67b0001030077fe010900200000000000000001a4cf88375c44c830e6e5aa5d6faf352aa496a9ee129fb8292f7435df5420b8230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018dd160050f20101000050f20201000050f20201000050f20200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 2501,
+				"extended": false,
+				"name": "WPA-EAPOL-PMK",
+				"samples": [
+					"4843505804000000000235380000000000000000000000000000000000000000000000000000000000000151aecc428f182acefbd1a9e62d369a079265784da83ba4cf88375c44c830e6e5aa5d6faf352aa496a9ee129fb8292f7435df5420b823a1cd402aed449cced04f552c5b5acfebf06ae96a09c96d9a01c443a17aa62258c4f651a68aa67b0001030077fe010900200000000000000001a4cf88375c44c830e6e5aa5d6faf352aa496a9ee129fb8292f7435df5420b8230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018dd160050f20101000050f20201000050f20201000050f20200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A(?:[a-f0-9]{32}\\*[a-f0-9]{12}\\*[a-f0-9]{12}\\*[a-f0-9]{,64})|(?:WPA\\*[a-f0-9]{2}\\*[a-f0-9]{32}\\*[a-f0-9]{12}\\*[a-f0-9]{12}\\*[a-f0-9]{,64}\\*[a-f0-9]{,64}\\*[a-f0-9]{,512}\\*[a-f0-9]{,2})\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 22000,
+				"extended": false,
+				"name": "WPA-PBKDF2-PMKID+EAPOL",
+				"samples": [
+					"WPA*01*4d4fe7aac3a2cecab195321ceb99a7d0*fc690c158264*f4747f87f9f4*686173686361742d6573736964***"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 22001,
+				"extended": false,
+				"name": "WPA-PMK-PMKID+EAPOL",
+				"samples": [
+					"WPA*01*5ce7ebe97a1bbfeb2822ae627b726d5b*27462da350ac*accd10fb464e*686173686361742d6573736964***"
 				]
 			}
 		]
@@ -7079,5 +7517,128 @@
 				]
 			}
 		]
+	},
+	{
+		"regex": "\\A\\$pfxng\\$\\d+\\$\\d+\\$\\d+\\$\\d+\\$[a-f0-9]+\\$[a-f0-9]+\\$[a-f0-9]+\\Z",
+		"modes": [
+			{
+				"john": "pfx",
+				"hashcat": null,
+				"extended": false,
+				"name": "PFX (PKCS#12 PBE) (SHA1/SHA2)",
+				"samples": [
+					"$pfxng$1$20$2048$8$e861d3357729c35f$308206513082032f06092a864886f70d010706a08203203082031c0201003082031506092a864886f70d010701301c060a2a864886f70d010c0103300e04086c933ea5111fd24602020800808202e83c56ad18c45e54aaca4d170750cfbfb3059d6cf161e49d379eab15e722216cb479eee8da7b6e6ffc89e01fbf30f4eb5e1b88ca146c166c700a68473d25a0979344cc60d1e58230a12d24b8be6e9174d3afecdf111cd7d96527831ac9c8f4bf3817cda021f34b61899f2a75fe511e8dedfb70367fa9902d2d3e500f853cc5a99ec8672a44713d24ae49382a20db6349bc48b23ad8d4be3aa31ba7e6d720590b5e4f6b0b5d84b7789ae9da7a80bfa3c27e507fc87e7bc943cff967db6b76f904ac52c1db5cfe9915fa3493cd42b8db6deae62bc01593e34bc8598f27a24cdfd242701ff72d997f959f3a933ab5a2762df33849c116715b78cb0d83267aff913619cbbdf003e13318e4b188a8a4f851b9f59ae2c71ab215c565f7872e5d54c06f92d6f59eaf19d95f9b4526d52d289cd17bc0c2079f9f13c20a70a566773d90ca6d888386d909b6362cb79e15cf547dceab1fe793c577b70f72463969f7b416fb5a6228053363558df18588b53406343ab320a1bbf1757b67ef8e3075f44dee4521f4a461d37ea894c940bc87f9bd33276f2843ff5922fd8e61d22a8619ad23154880fd7d957c0f151458fc4f686d96695a823b08c1795daaf79e41118a3c57ee065a693853a9c4b2004440662f51d63bb9973dc4bb8c541d424416c57d01a825be4d31dab7c7f4b2b738e4bbfdda1e3d3b95e026dadee4dfe155c0f4a24991693f679b452516bc19eab7cf7eb41b476358583d46630e8cda55974b8fcbe25b93e91e73f584a913149137c1c20d13f38826d8dba9bcf5504b8cee77e20a19d6fb050e9213b8aeb11c26a871c600701aea352ba2dcea15d8010d25034f64aa488b580b8282d226f8203bba6aa424b0a25bcceb9c7c718b6c276022d988ca063d2e88350d68903f95aa3265b44d909c07fa9477a5dfcfe3b5ed49b789d6e1c13aca012630343021dbc0c0f17dae6688eae495b76d21be49ced2c2e98e1068d8725d8a581958fb2530871dff1b3f910ae8beb3bc07bfb4b1d2d73fc5d440dc9bcd32ba656c32e357051bef3082031a06092a864886f70d010701a082030b0482030730820303308202ff060b2a864886f70d010c0a0102a08202a6308202a2301c060a2a864886f70d010c0103300e0408749558ace83617660202080004820280ef790b9cd427ec99a350a6e3afb1727cf3dd859d5377897805a7093e1ca42ab8cccc6c52d2b86d61ed55b5bd743fb2a4ec556b438933a9d97a55e5ad1fb3f9967e550be3d708feb5c7287e31afed165a4a91bd5a80292a1e061f97a8c11339963843348badf3fd898e89fd92bda5ad0195d8d4f75e7bce9f0518eeb85365860cd32ad5cea0958efef02bfb74aec0af0765729dae079f5eb08b099d3b06a9b9c6cd6f1e1e4170208ebec3c61ae3421e90cef0f2b5cd2187e43cc4ceecf4aec06340f886efb94f517e578d13659392246a69505de3914b719fba74709ef0f03f010429f899dbddab950f6e58462b2fe2663986a5e0c8ff235e89bca3bb6e41fcd602a0277a83822ac1a14101c83fd1cafdc45c1980ecf54ef092deb2fea736b428158e0847256fc1211f94ea8075145be5a5fb26206e125d55f45500844f1a83f063d0be19b60427dadbd89109bb9ee31a1ac79c863204e8e80c044b8b6bc45c756c26be514e4270a293faf4608065a27b4a51253cb9f831614d5c7f25ec1d4e36063e68e4e405c1f4deb98a786c57a376609441f2dcbe6393487b884624570f6cbb02b53f58ea4acb0faedd2931293dc87664a0c589322480686f6613ffb794c3b3b1872cd7a418712a35666b53bd8383f2e7aa6e8a9e20dd3d46cc3aaaaf17841732dde708ba5611ebcc8777fb3f7b65f2cf95992fdf4f5a17ddf01f3ebe5fb6c9cd58cb74553865cbec3c9d391dcc3e96e654faf7be7fdc8d5fb5dff98799e740147d2ca4b6df47560a4a20bd8f30cf5b495f4e919c9efad3aa59491a3e2ba4e53606e2016ce13e8271e70ccd5b57eec99a8604caf5997e648f3eb541769267f9cdf76aa84917ebd8a1f60a973ed22cca9fa0d3589bb77dafed82ea4f8cd19d3146301f06092a864886f70d01091431121e10006f00700065006e00770061006c006c302306092a864886f70d01091531160414a38a6be4b090be5e29259879b75e0e482f4a4dd8$a790274918578289d80aa9fd0d526923f7b8f4d4",
+					"$pfxng$512$64$2048$8$396f32bb64a2fa5b$308209683082041f06092a864886f70d010706a08204103082040c0201003082040506092a864886f70d010701301c060a2a864886f70d010c0106300e0408e89d3e68fd0b95b002020800808203d83f879631d938c0b6b627606a85aac3395102d8dc33544ca92f1b9d64f9bcafda920018221f1772883080e7c93dea9d1c719dd4d87e6e713573aafbb0d18b9ba326c3b3a9a14a92428cd5993c1e4cd8af3162eaef4117a6a83e464d509e1ac6dd77dc5df1d8fb4523459800fda94a261fccbfdd49fd93f2920e7e5510e111c39d35223afb19bffa39d1148f810c41a1cac93f736d3d62b202426b6dcd06c1649742eba0dae9ee2711af32b1755b6ecf7ed7633b7aa84f34281368bd509e492ea9650ea3c234726184775bf059a5acb51d407d29e09b6c3850771c4565bf5b3a4f91c2132c835249c5f4c1430dd583bcefeafcabf33bcc4b17b1b813fac43841db8bad2c186799c240673be19dcc06abb777d8cd092f96be2bbf61138f7cc86f5f636cbcd6f80e39049a28f8699f79e5e22d24a589cdd8c06aa0596b6fb1ad8744c05ccd4021aa58991bdd7fb3545b93571ab34f07681107c4fe2ecc5b81301987ced0cdd7edb249572ccb3065d58284b15fe93560b48e83c6cb082a6f7ea34ae43e95776920618f6726a8f9faca2d65fb4aca594d0cc11b78b44a5725456ac976d22de3ed81d336cce0b6dd6e944f1cb930a82ab66eda9419472196c99bedd8148c386ca9b692f0154a328939d7fcccd4dc97c6cdf740e6e05c942187eaffa11cce08f25ffab2ba25d48a3a87cf0049e62ca5bc774a11dd6c7bbd713206466f4bc1264b2102e8a82416ed31b121d0ee08d2dd8cea305cce65b9500f116de912e02c553470d02cd026f99ee78606bb577fe586f40321edb6f18858978ff183653fa4cb22e0436f7e2c867522da74f601f782fab519942dc1418101b5961c45752ac6ab2eec516af19fa78ccf4d9e8906b6d4000b8f68ebab77360138fc7315d205693a6adf7cc983a094997053df0ba1e9bcbe39b3996fabfc5e7749d887f504a7bf8be40d7497041a63afb323fb9a118dcbf22bf55f688a110dc7716e54450183855600de72b5974c27d07726f69dca17e7c003bef61e3d3120611966d4b6190688ec81ee99548b302e4b8b82437a53b66eee98da497b1e859dd9d7a02eec5121deb04814fd588c3ce2c0d9f35140951a78b6f4c2507fe27dde55c0e879713729ca5ef4279f7068f4f90063f51afced5a0d47228e8085191fe0af7a7d0b78b0db0697b4024015787199eb314328535520dc99e902e4755794d614d9eb33f51d35889086baec90699fc72827970f1aa27d097525c074da78075c57613f4a25957115b010f2264cb2d6772c1372cb66f6a7298059da4149bd2e314b0fee857e13fcd001f2284c4cdc14648f502480b97ff917e97201f1b15380ec6e27a588136b80b89142f1c19b38aafe1455462b70cc7499bdd3a35e5cbadc3082054106092a864886f70d010701a08205320482052e3082052a30820526060b2a864886f70d010c0a0102a08204ee308204ea301c060a2a864886f70d010c0103300e04081fb645183f2c3f5702020800048204c8ff64eb11712a0e513e8de34f5185c4b896d5ce774776983f670f182454ac3e77012d9520ea751cf81e1020dc8aa81b71b6f1865c105c5937d783c03f924823d858d2dd414f9fe83472b61d727b25e4b82ea1d0bf6be385ca8fc36d0faefadf2fbea9ec05b4ffbbd9f4564175107515d14a573c5b849a60ea421e1b53a5c16b3d9092bbf7eba493f29516d8a92b3dd84fad3a099df006ec81736d438d673f0f8bb97b83b7a0d58e2d2e63bc48ee412e21c589f392c7a52d6cce44c39344b9ab293d6b86f815399c6554aa2712b83f0ee39b0a144c2d64ac29f8e9fd96db4446d8fa144af3ac54367b46bf9ce27c1f36242499006fc91f9a5b840678e754309111aa4af0172449b15c42481ab6c85cf9cddfec885474d81ee559e134c07485ad8db0500de8472379a43179fbcae9c24f8c2602a89199164d0609e5794c467524c49e1b162a23e93e780490ba80e39505766809c4d2ec198557a98b0917a2bec6a5a5640a42a0dac2057b9e1c04a897c0ecef2a145bdab75032f2d73ca2082392aa952770cb877db6092dd52dadd1f741267ef60484804c312d582d23987e6fed733c9f5b7a1473e83bf1f92962ec78ece29a9ff5fd3f078ef0ad8898f4a3718691ac89abe091d5c9f47fd4c67f679d8952fc599be43a7513e8ff372eb0f9fba12045ea3f88bad0c6c535fdcd4fb905e125a7669283f65feeeb736e32ad0c71cbc38bce567188e85aa40f82da2c7bfac5608d60876d4055efcebfade47e281340d15a2d84f5f03e61196f549a8ae454e23ccc95a940ef875b5786b71827b95dbdc158b811cafcf84df33c3dbd38a197c7dd7c1db12cfbd7d564c5beb3337dfeb3e56d5e2151eb082763181ea0d4a383abb6b899859a2292e4dfd07795bcb5951abbf1dcb5125ae26f08ac210fd94ee2ececddf54bc5ec1b1176d19f6a2c4a8ad9d910537ef4149ea34e57bc5beebff2586763156d5df6c1030bd7d72318cadb0e0143462add1e2f7cd2cfe4e9ebf1dba4f3b352772b0b1225a7c8befb18ca93392452ccebe4b98fddfe27e0c7b01ad1730ad845cb8230a041e24a95802d0ef543e742360e2b6d9a26202e59cb4ba5f18e60000252c67074ded0c3bc178609e997ef24fa01abd35d3f0042a0721787ae895d3637641e2da9a2073dd2499e805d785441c248b8a8234655083700bdc58c8fb80b8c271deb4a81eacf331473f060d39bc9178b7dd4e6dbd06ad9a9b06a5c955b144bc40beeee9118fbd6128f7366f72a20a042864187195075ff51a4e56ebbf61cd0f079814b5e58fe854bcff79b1e6179a3838a704455bfe8e0a49cd98efaf0184c43b0b05d8e9c6cc60e1a7567238db973d2105fa690dcedbab2f9e8bfa706c4aa159b8e233e02c03ddfaec39ec9618a5bc1186997d01f82d38c3066e6a55aaee186e87b2cb144d3769ee436320aa54efb7259c6f5647bb31840b22e900e141a896aac5403547ad309e7933ccffbcab050e0bbbc6b7f0ca0829216df0c2792fcd1e6945cea18ee33ea3913593192c1868d3e339bef11c77ccad7c3de22711090d042bc0175cca415ef92de7b8d580afe0bdbc1a381ee337973994d098a51fc38fb175245d18cbb5510fa2d2b565a38dfc1ef0a9c2ab9fd24388b18bf90304f599fe92fd64324bd534a0a7c1c32b2c4f29653e0fb66e665c1f4c1b0dddcc0ad561fb3604e000aeb031dc04d449fe44ed0f4af82c7d191dc3125302306092a864886f70d01091531160414f60526b8d97f1ae083d90c655dcd7e0458947577$84b8b3b5751ba689b87acdded46edad28a580116c4f2689b6da009aaddab237ad542ffc337378cd6b938a1c1d5b60af582681513196ca8d97416d83e4bf18a99"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$fvde\\$\\d{1,10}\\$\\d{1,6}\\$[a-f0-9]{32}\\$\\d{1,6}\\$[a-f0-9]{48}\\Z",
+		"modes": [
+			{
+				"john": "fvde",
+				"hashcat": 16700,
+				"extended": false,
+				"name": "FileVault 2",
+				"samples": [
+					"$fvde$1$16$84286044060108438487434858307513$20000$f1620ab93192112f0a23eea89b5d4df065661f974b704191",
+					"$fvde$1$16$270186d6758a4426d3f015a019eabc46$101082$63a758b61183c5d4d06dda5e8f14dd0b1555fe2a1f2d0304"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$shiro1\\$SHA-512\\$\\d+\\$[a-z0-9=+\\/]{0,345}\\$[a-z0-9=+\\/]{88}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 12150,
+				"extended": false,
+				"name": "Apache Shiro 1 SHA-512",
+				"samples": [
+					"$shiro1$SHA-512$1024$WobJGSjbUhsMdaILomMOdw==$9uptGJ24vzZCqZI55F77N7xjUxGlVrK5aCmAwIrV1vwDmFM4akE6Hmd23Aj8ANLSUdIEkHLZ6SnoitZbOsoQNQ=="
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$as400\\$des\\$\\*.{0,8}\\*[a-f0-9]{2,16}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 8501,
+				"extended": false,
+				"name": "AS/400 DES",
+				"samples": [
+					"$as400$des$*OPEN3*EC76FC0DEF5B0A83"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$as400\\$ssha1\\$\\*.{0,10}\\*[a-f0-9]{40}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 35200,
+				"extended": false,
+				"name": "AS/400 SSHA1",
+				"samples": [
+					"$as400$ssha1$*QTEST1*7ED7D3694D0A2E40A720D41031B456C09124966E"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$blockchain\\$\\d{1,6}\\$[a-f0-9]{144,65536}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 34700,
+				"extended": false,
+				"name": "Blockchain, My Wallet, Legacy Wallets",
+				"samples": [
+					"$blockchain$269$0349575305940509451603791869345994679e29d1618f26ed65ee15ad65d1af046f51ffcfbfa82dcccea07bb0f0fff725af53b96910646440b361453addc5caeb2a09479dc6cce3a1ebf138e2649689ab286ba2db6bd5edef310cac8f9386f002a534e9346cdc61bd0e21ca738eb2418a8158c83a43517981c43d8792cad6f290cbf40d5a3c1bb20283fcb44c59cae2dc90c898dbc4e960ca666653a08d90471610a8b9bf590752e8d8bee27e7aa58d015324dae83c87a46384ed8f947e37e65d4572018b5bfd8fd8ea70df777c8b692bc613ccb528356d1844490ac2b3be2dd8927fbf1aabf9b6cedec39742ed92a03220f4468bd32c1eed5d5c3c3aa0be459e06466c94991df97f335bd661"
+				]
+			},
+			{
+				"john": null,
+				"hashcat": 12700,
+				"extended": false,
+				"name": "Blockchain, My Wallet",
+				"samples": [
+					"$blockchain$288$713253722114000682636604801283547365b7a53a802a7388d08eb7e6c32c1efb4a157fe19bca940a753d7f16e8bdaf491aa9cf6cda4035ac48d56bb025aced81455424272f3e0459ec7674df3e82abd7323bc09af4fd0869fd790b3f17f8fe424b8ec81a013e1476a5c5a6a53c4b85a055eecfbc13eccf855f905d3ddc3f0c54015b8cb177401d5942af833f655947bfc12fc00656302f31339187de2a69ab06bc61073933b3a48c9f144177ae4b330968eb919f8a22cec312f734475b28cdfe5c25b43c035bf132887f3241d86b71eb7e1cf517f99305b19c47997a1a1f89df6248749ac7f38ca7c88719cf16d6af2394307dce55600b8858f4789cf1ae8fd362ef565cd9332f32068b3c04c9282553e658b759c2e76ed092d67bd55961ae"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$blockchain\\$v2\\$\\d{1,6}\\$\\d{1,6}\\$[a-f0-9]{144,}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 15200,
+				"extended": false,
+				"name": "Blockchain, My Wallet, V2",
+				"samples": [
+					"$blockchain$v2$5000$288$324724252428471806184866704068819419467b2b32fd9593fd1a274e0b68bf2c72e5a1f5e748fd319056d1e47ca7b40767136a2d97d7133d14faaeca50986f66cdbc0faec0a3fabbd0ba5d08d5322b6b53da021aacfc439c45bec0e9fe02ad81db82f94e9bd36a7d4d76b505c2339fcd46565d3abab958fbeb1de8bfc53beb96cde8fe44128965477c9ef0762c62bbb1d66532b4888e174ea949db54374a2ed9686a63eb0b5b17ae293f7410bb4ae5106f108314a259c5fd097d558515d79350713412159103a8a174cd384a14f3da45efe18044e1146036000231f6042577d0add98fc959d265368e398dc1550b0bc693e9023cd9d51b40e701bd786e19c3a281a90465aa6ea3f9e756d430164ab2eb43be5b6796d7ac15b2fe99217410f2"
+				]
+			}
+		]
+	},
+	{
+		"regex": "\\A\\$sm3\\$.{0,20}\\$[a-z0-9\/.]{43}\\Z",
+		"modes": [
+			{
+				"john": null,
+				"hashcat": 35100,
+				"extended": false,
+				"name": "sm3crypt, SM3 (Unix)",
+				"samples": [
+					"$sm3$KTTUB40dW4mRyRFd$ul2xLiIY3FJtbo8sv1R93sAYCkxQCH/6rmS1kD5vJYA"
+				]
+			}
+		]
 	}
 ]

data/lib/haiti/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Version
-  VERSION = '2.1.0'
+class HashIdentifier
+  VERSION = '4.0.0'
 end

data/lib/haiti.rb

@@ -9,7 +9,6 @@ require 'haiti/hash'
 # The global Hash Identifier class
 class HashIdentifier
   # Constants
-  include Version
   PROTOTYPES = JSON.parse(File.read(File.join(__dir__, '../data/prototypes.json')))
   COMMONS = JSON.parse(File.read(File.join(__dir__, '../data/commons.json')))
 
@@ -57,7 +56,7 @@ class HashIdentifier
     #   HashIdentifier.list
     #   # => ["CRC-16", "CRC-16-CCITT", "FCS-16", "Adler-32", "CRC-32B", "FCS-32", ...]
     def list
-      (PROTOTYPES.flat_map { |d| d['modes'].map { |m| m['name'] } }).sort { |a, b| a.downcase <=> b.downcase }.uniq
+      PROTOTYPES.flat_map { |d| d['modes'].map { |m| m['name'] } }.sort { |a, b| a.downcase <=> b.downcase }.uniq
     end
 
     # List all hash types available as <Chf> object

data/man/haiti-fzf.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: haiti-fzf
 .\"    Author: Alexandre ZANNI (@noraj)
-.\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-11-12
+.\" Generator: Asciidoctor 2.0.23
+.\"      Date: 2026-01-01
 .\"    Manual: haiti-fzf manual
-.\"    Source: haiti-fzf 2.1.0
+.\"    Source: haiti-fzf 4.0.0
 .\"  Language: English
 .\"
-.TH "HAITI\-FZF" "1" "2023-11-12" "haiti\-fzf 2.1.0" "haiti\-fzf manual"
+.TH "HAITI\-FZF" "1" "2026-01-01" "haiti\-fzf 4.0.0" "haiti\-fzf manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -86,7 +86,7 @@ Hash string to identify, read from STDIN if equal to "\-"
 \fBhaiti\-fzf\fP jtr d41d8cd98f00b204e9800998ecf8427e
 .SH "COPYRIGHT"
 .sp
-Copyright © 2020\-2023 Alexandre ZANNI (independent)
+Copyright © 2020\-2026 Alexandre ZANNI (independent)
 .sp
 Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
 .sp
@@ -94,7 +94,7 @@ This software is distributed under the terms of the MIT License. You may freely
 redistribute copies of it, subject to the conditions of the license.
 .SH "VERSION"
 .sp
-2.1.0
+4.0.0
 .SH "REPORTING BUGS"
 .sp
 Report bugs to \c

data/man/haiti-parsable.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: haiti-parsable
 .\"    Author: Alexandre ZANNI (@noraj)
-.\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-11-12
+.\" Generator: Asciidoctor 2.0.23
+.\"      Date: 2026-01-01
 .\"    Manual: haiti-parsable manual
-.\"    Source: haiti-parsable 2.1.0
+.\"    Source: haiti-parsable 4.0.0
 .\"  Language: English
 .\"
-.TH "HAITI\-PARSABLE" "1" "2023-11-12" "haiti\-parsable 2.1.0" "haiti\-parsable manual"
+.TH "HAITI\-PARSABLE" "1" "2026-01-01" "haiti\-parsable 4.0.0" "haiti\-parsable manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -85,7 +85,7 @@ Hash string to identify, read from STDIN if equal to "\-"
 \fBhaiti\-parsable\fP jtr d41d8cd98f00b204e9800998ecf8427e
 .SH "COPYRIGHT"
 .sp
-Copyright © 2020\-2023 Alexandre ZANNI (independent)
+Copyright © 2020\-2026 Alexandre ZANNI (independent)
 .sp
 Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
 .sp
@@ -93,7 +93,7 @@ This software is distributed under the terms of the MIT License. You may freely
 redistribute copies of it, subject to the conditions of the license.
 .SH "VERSION"
 .sp
-2.1.0
+4.0.0
 .SH "REPORTING BUGS"
 .sp
 Report bugs to \c

data/man/haiti.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: haiti
 .\"    Author: Alexandre ZANNI (@noraj)
-.\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-11-12
+.\" Generator: Asciidoctor 2.0.23
+.\"      Date: 2026-01-01
 .\"    Manual: haiti manual
-.\"    Source: haiti 2.1.0
+.\"    Source: haiti 4.0.0
 .\"  Language: English
 .\"
-.TH "HAITI" "1" "2023-11-12" "haiti 2.1.0" "haiti manual"
+.TH "HAITI" "1" "2026-01-01" "haiti 4.0.0" "haiti manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -126,7 +126,7 @@ b2sum /etc/os\-release | awk \*(Aq{print $1}\*(Aq | \fBhaiti\fP \-
 \fBhaiti\fP samples crc32
 .SH "COPYRIGHT"
 .sp
-Copyright © 2020\-2023 Alexandre ZANNI (independent)
+Copyright © 2020\-2026 Alexandre ZANNI (independent)
 .sp
 Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
 .sp
@@ -134,7 +134,7 @@ This software is distributed under the terms of the MIT License. You may freely
 redistribute copies of it, subject to the conditions of the license.
 .SH "VERSION"
 .sp
-2.1.0
+4.0.0
 .SH "REPORTING BUGS"
 .sp
 Report bugs to \c

data/man/hashcat-haiti.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: hashcat-haiti
 .\"    Author: Alexandre ZANNI (@noraj)
-.\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-11-12
+.\" Generator: Asciidoctor 2.0.23
+.\"      Date: 2026-01-01
 .\"    Manual: hashcat-haiti manual
-.\"    Source: hashcat-haiti 2.1.0
+.\"    Source: hashcat-haiti 4.0.0
 .\"  Language: English
 .\"
-.TH "HASHCAT\-HAITI" "1" "2023-11-12" "hashcat\-haiti 2.1.0" "hashcat\-haiti manual"
+.TH "HASHCAT\-HAITI" "1" "2026-01-01" "hashcat\-haiti 4.0.0" "hashcat\-haiti manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -74,7 +74,7 @@ head \-1 /tmp/hash.txt | \fBhashcat\-haiti\fP \- \-\- /tmp/hash.txt
 \fBhashcat\-haiti\fP \-e d41d8cd98f00b204e9800998ecf8427e \-\- hashes.txt \-\-show
 .SH "COPYRIGHT"
 .sp
-Copyright © 2020\-2023 Alexandre ZANNI (independent)
+Copyright © 2020\-2026 Alexandre ZANNI (independent)
 .sp
 Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
 .sp
@@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely
 redistribute copies of it, subject to the conditions of the license.
 .SH "VERSION"
 .sp
-2.1.0
+4.0.0
 .SH "REPORTING BUGS"
 .sp
 Report bugs to \c

data/man/john-haiti.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: john-haiti
 .\"    Author: Alexandre ZANNI (@noraj)
-.\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-11-12
+.\" Generator: Asciidoctor 2.0.23
+.\"      Date: 2026-01-01
 .\"    Manual: john-haiti manual
-.\"    Source: john-haiti 2.1.0
+.\"    Source: john-haiti 4.0.0
 .\"  Language: English
 .\"
-.TH "JOHN\-HAITI" "1" "2023-11-12" "john\-haiti 2.1.0" "john\-haiti manual"
+.TH "JOHN\-HAITI" "1" "2026-01-01" "john\-haiti 4.0.0" "john\-haiti manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -74,7 +74,7 @@ head \-1 /tmp/hash.txt | \fBjohn\-haiti\fP \- \-\- /tmp/hash.txt
 \fBjohn\-haiti\fP \-e d41d8cd98f00b204e9800998ecf8427e \-\- hashes.txt \-\-show
 .SH "COPYRIGHT"
 .sp
-Copyright © 2020\-2023 Alexandre ZANNI (independent)
+Copyright © 2020\-2026 Alexandre ZANNI (independent)
 .sp
 Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
 .sp
@@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely
 redistribute copies of it, subject to the conditions of the license.
 .SH "VERSION"
 .sp
-2.1.0
+4.0.0
 .SH "REPORTING BUGS"
 .sp
 Report bugs to \c

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: haiti-hash
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alexandre ZANNI
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 description: Hash type identifier (CLI & lib).
 email: alexandre.zanni@engineer.com
 executables:
@@ -78,8 +77,8 @@ metadata:
   documentation_uri: https://noraj.github.io/haiti/
   homepage_uri: https://noraj.github.io/haiti/
   source_code_uri: https://github.com/noraj/haiti/
+  funding_uri: https://github.com/sponsors/noraj
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,18 +86,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4.0'
+      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: HAsh IdenTifIer
 test_files: []