haiti-hash 3.0.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9d865517b196759e4ebd0d89b9364031ac827763da623ba368aa92c3bc9fa086
4
- data.tar.gz: 70848b3d1db34cf8da9ca060ad0e20591d716d922543cd85d9ae230f29642bfb
3
+ metadata.gz: 16a62a5cb145dca24ef572956925ef3d65d7d78a6cdfffd8d13d871f0ff8d15a
4
+ data.tar.gz: e941fd2389862186740ae0078dce99a18780df00c172784f5454d1e005fbbf0a
5
5
  SHA512:
6
- metadata.gz: 8e0d34ac6c840a76281d4ac68a5e751d83633b4b8db5cdec17a092a502596983d8e8f3dca805dadb4b96c72d2d17a38b41c090e76b82db0a0996719b9113b802
7
- data.tar.gz: 10c44b5d2331160fe9625c7cb88740973010eaa08811ebd5c7de6212657cb45a0fc3d3dbf94bc8162c33fb9b827e636cd7b011bed92efdb08484a92dca3b3617
6
+ metadata.gz: fd12a3e2d14ee548c71382a808afc9b8ea5dcb53a149921c2edb10267d630edd5e94afb4e7db30e26bcbf210f3a6550c948069c4adfeea68b3ef885f7a274be8
7
+ data.tar.gz: c8cdb908bd4014ea1ff81df98eec4abfb8925b4ffa7ac9e937a55f6cbeebd2206f94064f43cf48118c3b02a35f91cea70ab064efd442f30d974a4f8fe179c16b
data/LICENSE.txt CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2020-2023 Alexandre ZANNI (independent)
3
+ Copyright (c) 2020-2026 Alexandre ZANNI (independent)
4
4
  Copyright (c) 2019-2020 Alexandre ZANNI at Orange Cyberdefense
5
5
 
6
6
  Permission is hereby granted, free of charge, to any person obtaining a copy
data/data/prototypes.json CHANGED
@@ -600,9 +600,12 @@
600
600
  },
601
601
  {
602
602
  "john": "dynamic_14",
603
- "hashcat": null,
603
+ "hashcat": 33100,
604
604
  "extended": true,
605
- "name": "md5($salt.md5($pass).$salt)"
605
+ "name": "md5($salt.md5($pass).$salt)",
606
+ "samples": [
607
+ "866244ca1d318292a6f40b60e03fd29c:72219426709"
608
+ ]
606
609
  },
607
610
  {
608
611
  "john": "dynamic_13",
@@ -651,9 +654,12 @@
651
654
  },
652
655
  {
653
656
  "john": "dynamic_16",
654
- "hashcat": null,
657
+ "hashcat": 31700,
655
658
  "extended": true,
656
- "name": "md5(md5(md5($pass).$salt).$salt2)"
659
+ "name": "md5(md5(md5($pass).$salt1).$salt2)",
660
+ "samples": [
661
+ "c7a971e405313d0ecc22e37e8b2424a1:2316355934:478467"
662
+ ]
657
663
  },
658
664
  {
659
665
  "john": "dynamic_18",
@@ -723,6 +729,96 @@
723
729
  "samples": [
724
730
  "022f7e02b3314f7d0968f73c00ba759f:67588"
725
731
  ]
732
+ },
733
+ {
734
+ "john": null,
735
+ "hashcat": 33000,
736
+ "extended": true,
737
+ "name": "md5($salt1.$pass.$salt2)",
738
+ "samples": [
739
+ "036a81bc84e01700faf965c3caaa3954:0243402616975530019305541949338903179746132451440267505028190519468680111713847350899833009965414425621884797638402856957040435715380438220464016:0757380776148401126145133134435506200715895167468508855794708942913462135276430452032928239699197100625556660484150983610760766285767453357925167463064045123083116191440783332986105343359475417787249790516137833723344398087127577224833364437305770807742238"
740
+ ]
741
+ },
742
+ {
743
+ "john": null,
744
+ "hashcat": 21310,
745
+ "extended": true,
746
+ "name": "md5($salt1.sha1($salt2.$pass))",
747
+ "samples": [
748
+ "dc91b5a658ef4b7d859e90742f340e24:708237:d270e9eea5802e346bcaa9b229f37766"
749
+ ]
750
+ },
751
+ {
752
+ "john": null,
753
+ "hashcat": 3730,
754
+ "extended": true,
755
+ "name": "md5($salt1.strtoupper(md5($salt2.$pass)))",
756
+ "samples": [
757
+ "0e1484eb061b8e9cfd81868bba1dc4a0:229381927:182719643"
758
+ ]
759
+ },
760
+ {
761
+ "john": null,
762
+ "hashcat": 2630,
763
+ "extended": true,
764
+ "name": "md5(md5($pass.$salt))",
765
+ "samples": [
766
+ "0127eecea3120e34c8934ba3b72a390a:0"
767
+ ]
768
+ },
769
+ {
770
+ "john": null,
771
+ "hashcat": 30500,
772
+ "extended": true,
773
+ "name": "md5(md5($salt).md5(md5($pass)))",
774
+ "samples": [
775
+ "e13bb4b8e5a98db7277df344aa3363cf:28945624531"
776
+ ]
777
+ },
778
+ {
779
+ "john": null,
780
+ "hashcat": 3610,
781
+ "extended": true,
782
+ "name": "md5(md5(md5($pass)).$salt)",
783
+ "samples": [
784
+ "a0ab79f9e2b5a4434d2da61673b56362:1234"
785
+ ]
786
+ },
787
+ {
788
+ "john": null,
789
+ "hashcat": 21900,
790
+ "extended": true,
791
+ "name": "md5(md5(md5($pass.$salt1)).$salt2)",
792
+ "samples": [
793
+ "2c749af6c65cf3e82e5837e3056727f5:59331674906582121215362940957615121466283616005471:17254656838978443692786064919357750120910718779182716907569266"
794
+ ]
795
+ },
796
+ {
797
+ "john": null,
798
+ "hashcat": 4420,
799
+ "extended": true,
800
+ "name": "md5(sha1($pass.$salt))",
801
+ "samples": [
802
+ "34ebbba3e5c98f6253c160eae53da092:6224378456121050285"
803
+ ]
804
+ },
805
+ {
806
+ "john": null,
807
+ "hashcat": 4430,
808
+ "extended": true,
809
+ "name": "md5(sha1($salt.$pass))",
810
+ "samples": [
811
+ "df0e9ede5b6c7d1f1b47199f86029002:59132809201799180722359939692710461886"
812
+ ]
813
+ },
814
+ {
815
+ "john": null,
816
+ "hashcat": 32800,
817
+ "extended": true,
818
+ "name": "md5(sha1(md5($pass)))",
819
+ "samples": [
820
+ "7b4f60b54472980e922280e225150dfa"
821
+ ]
726
822
  }
727
823
  ]
728
824
  },
@@ -1605,7 +1701,7 @@
1605
1701
  ]
1606
1702
  },
1607
1703
  {
1608
- "regex": "\\A[a-f0-9]{56}\\Z",
1704
+ "regex": "\\A[a-f0-9]{56}(?::.+)?\\Z",
1609
1705
  "modes": [
1610
1706
  {
1611
1707
  "john": "raw-sha224",
@@ -1619,21 +1715,30 @@
1619
1715
  },
1620
1716
  {
1621
1717
  "john": "dynamic_51",
1622
- "hashcat": null,
1718
+ "hashcat": 1320,
1623
1719
  "extended": true,
1624
- "name": "sha224($salt.$pass)"
1720
+ "name": "sha224($salt.$pass)",
1721
+ "samples": [
1722
+ "4258a61d3d0d5a5b6796f0ab02d081e998fe657d55d22091d3b51409:36669207"
1723
+ ]
1625
1724
  },
1626
1725
  {
1627
1726
  "john": "dynamic_52",
1628
- "hashcat": null,
1727
+ "hashcat": 1310,
1629
1728
  "extended": true,
1630
- "name": "sha224($pass.$salt)"
1729
+ "name": "sha224($pass.$salt)",
1730
+ "samples": [
1731
+ "0cf361904f4b0234cf4ade8496d8c11c04e5982db967603e82f22b2f:89452466460220844541730694146873525188525677"
1732
+ ]
1631
1733
  },
1632
1734
  {
1633
1735
  "john": "dynamic_53",
1634
- "hashcat": null,
1736
+ "hashcat": 34400,
1635
1737
  "extended": true,
1636
- "name": "sha224(sha224($pass))"
1738
+ "name": "sha224(sha224($pass))",
1739
+ "samples": [
1740
+ "b7d9a0e57e6e94e8b87996b81ffa64b05d237c58fff1d7a4e4fe2a77"
1741
+ ]
1637
1742
  },
1638
1743
  {
1639
1744
  "john": "dynamic_54",
@@ -1750,6 +1855,15 @@
1750
1855
  "bcb34bae2f591c257a07d6d07adecd4cd968cdd06ab4a4d3bb001574",
1751
1856
  "e745e2e424aaed1cef3c765b6c22396bb6bcc5215128100f54031132"
1752
1857
  ]
1858
+ },
1859
+ {
1860
+ "john": null,
1861
+ "hashcat": 34500,
1862
+ "extended": true,
1863
+ "name": "sha224(sha1($pass))",
1864
+ "samples": [
1865
+ "10d302483c927df95abba98d69dcd9608365241d1523a8cc5fcbcedc"
1866
+ ]
1753
1867
  }
1754
1868
  ]
1755
1869
  },
@@ -1803,6 +1917,21 @@
1803
1917
  }
1804
1918
  ]
1805
1919
  },
1920
+ {
1921
+ "regex": "\\A\\$bcrypt-sha256\\$v=2,t=2b,r=\\d{1,2}\\$[a-z0-9\/.]{22}\\$[a-z0-9\/.]{31}\\Z",
1922
+ "modes": [
1923
+ {
1924
+ "john": null,
1925
+ "hashcat": 30601,
1926
+ "extended": true,
1927
+ "name": "bcrypt(HMAC-SHA256($pass)) / bcryptsha256 v2",
1928
+ "samples": [
1929
+ "$bcrypt-sha256$v=2,t=2b,r=12$KSOjON/ciJR86a00N5q61.$AmWZucQuHk13FGkQWhgMeiFvBfm2GCy",
1930
+ "$bcrypt-sha256$v=2,t=2b,r=12$n79VH.0Q2TMWmt3Oqt9uku$Kq4Noyk3094Y2QlB8NdRT8SvGiI4ft2"
1931
+ ]
1932
+ }
1933
+ ]
1934
+ },
1806
1935
  {
1807
1936
  "regex": "\\A[a-f0-9]{40}:[a-f0-9]{16}\\Z",
1808
1937
  "modes": [
@@ -1826,13 +1955,16 @@
1826
1955
  ]
1827
1956
  },
1828
1957
  {
1829
- "regex": "\\A\\$bcrypt-sha256\\$(2[axy]|2)\\,\\d+\\$[a-z0-9\\/.]{22}\\$[a-z0-9\\/.]{31}\\Z",
1958
+ "regex": "\\A(?:\\$bcrypt-sha256)?\\$(?:2[abxy]?)\\$\\d{2}\\$[a-z0-9\\/.]{53}\\Z",
1830
1959
  "modes": [
1831
1960
  {
1832
1961
  "john": null,
1833
- "hashcat": null,
1962
+ "hashcat": 30600,
1834
1963
  "extended": false,
1835
- "name": "bcrypt(SHA-256)"
1964
+ "name": "bcrypt(sha256($pass)) / bcryptsha256",
1965
+ "samples": [
1966
+ "$2b$10$FxDtpTNaL303lLcWtd6LFO2U6Gc63VJ07qycHcfqbQQ71GhO/qSzu"
1967
+ ]
1836
1968
  }
1837
1969
  ]
1838
1970
  },
@@ -2113,11 +2245,12 @@
2113
2245
  },
2114
2246
  {
2115
2247
  "john": null,
2116
- "hashcat": null,
2248
+ "hashcat": 34600,
2117
2249
  "extended": false,
2118
2250
  "name": "MD6-256",
2119
2251
  "samples": [
2120
- "bc9e2022386d929ae3936306153d9366fc555dc868579c87c7faf8846f79f414"
2252
+ "bc9e2022386d929ae3936306153d9366fc555dc868579c87c7faf8846f79f414",
2253
+ "539a8b63639c94b80e746611c476a684e7cc95235187b2f8b81a188d6dfbf64c"
2121
2254
  ]
2122
2255
  },
2123
2256
  {
@@ -2179,6 +2312,15 @@
2179
2312
  "3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb",
2180
2313
  "3e7dea7f2384b6c5a3d0e24aaa29c05e89ddd762145030ec22c71a6db8b2c1f4"
2181
2314
  ]
2315
+ },
2316
+ {
2317
+ "john": null,
2318
+ "hashcat": 20730,
2319
+ "extended": true,
2320
+ "name": "sha256(sha256($pass.$salt))",
2321
+ "samples": [
2322
+ "ad66bdc0841d7e08d96c03de271ce14e77de078746b535adbf9d4b6ccbf2a517:7218532375810603"
2323
+ ]
2182
2324
  }
2183
2325
  ]
2184
2326
  },
@@ -2197,6 +2339,43 @@
2197
2339
  }
2198
2340
  ]
2199
2341
  },
2342
+ {
2343
+ "regex": "\\A\\$BLAKE2\\$[a-f0-9]{64}\\Z",
2344
+ "modes": [
2345
+ {
2346
+ "john": null,
2347
+ "hashcat": 34800,
2348
+ "extended": false,
2349
+ "name": "BLAKE2-256 (blake2b)",
2350
+ "samples": [
2351
+ "$BLAKE2$68b163391b3e779dcddba4e6d8fa03e962c29569b430efa5ba014303358557e1"
2352
+ ]
2353
+ }
2354
+ ]
2355
+ },
2356
+ {
2357
+ "regex": "\\A\\$BLAKE2\\$[a-f0-9]{64}:.+\\Z",
2358
+ "modes": [
2359
+ {
2360
+ "john": null,
2361
+ "hashcat": 34820,
2362
+ "extended": true,
2363
+ "name": "BLAKE2-256($salt.$pass) (blake2b)",
2364
+ "samples": [
2365
+ "$BLAKE2$a4cad0b026ed24adf13fb70ec31d35b02751dcb33354e2c9d20ef3f968748501:3601"
2366
+ ]
2367
+ },
2368
+ {
2369
+ "john": null,
2370
+ "hashcat": 34810,
2371
+ "extended": true,
2372
+ "name": "BLAKE2-256($pass.$salt) (blake2b)",
2373
+ "samples": [
2374
+ "$BLAKE2$2b51353016a512b60e587bea98d799c2de243468085ca6cd67f983b2e55bfb67:2353288289"
2375
+ ]
2376
+ }
2377
+ ]
2378
+ },
2200
2379
  {
2201
2380
  "regex": "\\A[a-f0-9]{32}:[a-z0-9]{32}\\Z",
2202
2381
  "modes": [
@@ -2298,6 +2477,20 @@
2298
2477
  }
2299
2478
  ]
2300
2479
  },
2480
+ {
2481
+ "regex": "\\A[a-z0-9=+\\/]{80}\\Z",
2482
+ "modes": [
2483
+ {
2484
+ "john": null,
2485
+ "hashcat": 18800,
2486
+ "extended": false,
2487
+ "name": "Blockchain, My Wallet, Second Password (SHA256)",
2488
+ "samples": [
2489
+ "YnM6WYERjJfhxwepT7zV6odWoEUz1X4esYQb4bQ3KZ7bbZAyOTc1MDM3OTc1NjMyODA0ECcAAD3vFoc="
2490
+ ]
2491
+ }
2492
+ ]
2493
+ },
2301
2494
  {
2302
2495
  "regex": "\\A\\$episerver\\$\\*1\\*[a-z0-9\\/=+]+\\*[a-z0-9\\/=+]{42,43}\\Z",
2303
2496
  "modes": [
@@ -2615,9 +2808,12 @@
2615
2808
  },
2616
2809
  {
2617
2810
  "john": "dynamic_85",
2618
- "hashcat": null,
2811
+ "hashcat": 32410,
2619
2812
  "extended": true,
2620
- "name": "sha512(sha512($pass).$salt)"
2813
+ "name": "sha512(sha512($pass).$salt)",
2814
+ "samples": [
2815
+ "25d509824028a999f4ee851b5de404bb316b78ae8e974874376484018f58520e082747a7ce9f769bcaccb5f63878356c780f602e23393f12b650a6931e4b9338:21881837027919828109608"
2816
+ ]
2621
2817
  },
2622
2818
  {
2623
2819
  "john": "dynamic_86",
@@ -2685,6 +2881,29 @@
2685
2881
  "8e945da209aa869f0455928529bcae4679e9873ab707b55315f56ceb98bef0a7362f715528356ee83cda5f2aac4c6ad2ba3a715c1bcd81cb8e9f90bf4c1c1a8a",
2686
2882
  "d2b793a0bb6cb5904828b5b6dcfb443bb8f33efc06ad09368878ae4cdc8245b97e60802469bed1e7c21a64ff0b179a6a1e0bb74d92965450a0adab69162c00fe"
2687
2883
  ]
2884
+ },
2885
+ {
2886
+ "john": null,
2887
+ "hashcat": 32420,
2888
+ "extended": false,
2889
+ "name": "sha512(sha512_bin($pass).$salt)",
2890
+ "samples": [
2891
+ "c1bade2bd4ebc8db841ac6ab3e0a5035a29619e5b1a6135782b77da5d7cfaccee096f3ddb9ee23b9866378cfc2fb19f2c013fed1b7e1fffd18340a4f39238412:789"
2892
+ ]
2893
+ }
2894
+ ]
2895
+ },
2896
+ {
2897
+ "regex": "\\A[a-f0-9]{128}\\Z",
2898
+ "modes": [
2899
+ {
2900
+ "john": null,
2901
+ "hashcat": 5720,
2902
+ "extended": false,
2903
+ "name": "Cisco-ISE Hashed Password (SHA256)",
2904
+ "samples": [
2905
+ "465865d4226c4d9696e601f2c99b25ae2c194ec01806bafc93933331acfc1a60e8bdcca8be9fa245a5fa16029bb52480915746f47d1c539d01da7ec6f37468d1"
2906
+ ]
2688
2907
  }
2689
2908
  ]
2690
2909
  },
@@ -4142,14 +4361,15 @@
4142
4361
  "modes": [
4143
4362
  {
4144
4363
  "john": "saph",
4145
- "hashcat": null,
4364
+ "hashcat": 35000,
4146
4365
  "extended": false,
4147
4366
  "name": "SAP CODVN H (PWDSALTEDHASH) iSSHA-512",
4148
4367
  "samples": [
4149
4368
  "{x-isSHA512, 7500}ctlX6qYsWspafEzwoej6nFp7zRQQjr8y22vE+xeveIX2gUndAw9N2Gep5azNUwuxOe2o7tusF800OfB9tg4taWI4Tg==",
4150
4369
  "{x-isSHA512, 7500}Qyrh2JXgGkvIfKYOJRdWFut5/pVnXI/vZvqJ7N+Tz9M1zUTXGWCZSom4az4AhqOuAahBwuhcKqMq/pYPW4h3cThvT2JaWVBw",
4151
4370
  "{x-isSHA512, 18009}C2+Sij3JyXPPDuQgsF6Zot7XnjRFX86X67tWJpUzXNnFw2dKcGPH6HDEzVJ8HN8+cJe4vZaOYTlmdz09gI7YEwECAwQFBgcICQoLDA0ODwA=",
4152
- "{x-isSHA512, 15000}2VwEw7rHLfYYblKU/ol7t6I7i2UjDOYOEW4H2iEHiUvNmNkxmM5rX5jcEAeRM6W+KQ0QBCsx1hDo9wXm+rbQPrL67ov+dGn/z+3o4f9pdIaJaU61YYQwl37PoYA7SvRU"
4371
+ "{x-isSHA512, 15000}2VwEw7rHLfYYblKU/ol7t6I7i2UjDOYOEW4H2iEHiUvNmNkxmM5rX5jcEAeRM6W+KQ0QBCsx1hDo9wXm+rbQPrL67ov+dGn/z+3o4f9pdIaJaU61YYQwl37PoYA7SvRU",
4372
+ "{x-isSHA512, 15000}YZH/V2T7zlQMGeWLBarm5Oi3qV9Y8ByXQijD28+bjtLdo7YssXaUBkxMXbS3l4yVlYw97tvYj+vu/L37sg1reDEzODQ4MDY1NzQ1NjQ="
4153
4373
  ]
4154
4374
  }
4155
4375
  ]
@@ -4200,10 +4420,14 @@
4200
4420
  "regex": "\\A[a-z0-9\\/.]{13,}\\Z",
4201
4421
  "modes": [
4202
4422
  {
4203
- "john": "bigcrypt",
4423
+ "john": "descrypt",
4204
4424
  "hashcat": null,
4205
4425
  "extended": true,
4206
- "name": "BigCrypt"
4426
+ "name": "BigCrypt (descrypt extension, DES-based crypt(3))",
4427
+ "samples": [
4428
+ "S/8NbAAlzbYO66hAa9XZyWy2",
4429
+ "TO9Mdb1FHXkFU"
4430
+ ]
4207
4431
  }
4208
4432
  ]
4209
4433
  },
@@ -5812,15 +6036,137 @@
5812
6036
  ]
5813
6037
  },
5814
6038
  {
5815
- "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",
6039
+ "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",
6040
+ "modes": [
6041
+ {
6042
+ "john": "keepass",
6043
+ "hashcat": null,
6044
+ "extended": false,
6045
+ "name": "KeePass 2 (KDBX 3) / AES 256 enc. / AES-KDF / without keyfile",
6046
+ "samples": [
6047
+ "aes_aes:$keepass$*2*51724136*0*4349620c23fd506d0ef1513cf163a2b3f7aba29bf0bfd167433f4f948de45a80*9607e1f89e7aab4a6720d29478c17596fe5b9bbef218aabfeb87421b889bb417*03a258af4a69efe55851fcb3579753f2*8a6d25336ad495c840d0caaea8333a954ecd4f75d0d80e76cd46896f400947f2*f83af1c765569887eea00128526527a48a6e0d0943d30ff18055055329c62836"
6048
+ ]
6049
+ }
6050
+ ]
6051
+ },
6052
+ {
6053
+ "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",
5816
6054
  "modes": [
5817
6055
  {
5818
6056
  "john": "keepass",
5819
6057
  "hashcat": null,
5820
6058
  "extended": false,
5821
- "name": "KeePass 2 ChaCha20 (KDBX 3) / without keyfile",
6059
+ "name": "KeePass 2 (KDBX 3) / Twofish 256 enc. / AES-KDF / without keyfile",
6060
+ "samples": [
6061
+ "twofish_aes:$keepass$*2*45454544*1*012100297ce9a9f0bafa80baea8e25c3c544ee9a769d7bbae9d1b39544a1103e*1e69bcf23baf3941387ca91eeca84163481edcfe5f210e0a3a5d82a5077d447d*d2eeb12c093d3f554020fb0127add83d*b0d55717dfd912e1cec7bf31cc5249bdf7286ad9b487121e20f3020258a38596*991f9862a44be62723fe7088d01321b6c09c393181896b6ba566ac6300b555ef"
6062
+ ]
6063
+ }
6064
+ ]
6065
+ },
6066
+ {
6067
+ "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",
6068
+ "modes": [
6069
+ {
6070
+ "john": "keepass",
6071
+ "hashcat": null,
6072
+ "extended": false,
6073
+ "name": "KeePass 2 (KDBX 3) / ChaCha20 256 enc. / AES-KDF / without keyfile",
6074
+ "samples": [
6075
+ "$keepass$*2*6000*2*e852737a797fb642a2814e5965aba3473644a56ea67998526ce5e6f0e256a56a*fb300459b1e8c52fefa8e72676b57563565475b1c1306c266a48ccc2010e6a94*03027f86819941d1d0f3f2f5*af0f6c5e4319e6c10fdb95f44ded70f3115ae7dc28ec83fd3676c92076505ded*e0ab7f438903eb91dd8bc13c52c5a1c02e34b107ae16710bc57858c8c85fecd0",
6076
+ "chacha20_aes:$keepass$*2*37974684*2*df1a71413770160c73c22c5eded4bdd9ccc5324e09de09c3b8d8bf188b386469*4ff7861f57b1bc36488fd52cc81e3eb598bde02897b54f0494ee947029166e8a*1a84a4f7af7daf598ed0a0b7*7d2143822acf4e6405f3621ff545231087d18aa97993ae6139b694424f582e1a*f213f090d8c23d204eeef4583db4c7658725a15f40863e8d53ac751bf980f245"
6077
+ ]
6078
+ }
6079
+ ]
6080
+ },
6081
+ {
6082
+ "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",
6083
+ "modes": [
6084
+ {
6085
+ "john": "keepass",
6086
+ "hashcat": 34300,
6087
+ "extended": false,
6088
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2d KDF / without keyfile",
6089
+ "samples": [
6090
+ "aes_argon2d:$keepass$*4*114*ef636ddf*16777216*19*2*ab71e28c82382e66209dcd3da426a01b8c0acaa5e15569687d44054474062a53*38bb15c7489d850b337df823f140d8d296c18ba809411779aaa75e1aeeaf9bb2*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000ab71e28c82382e66209dcd3da426a01b8c0acaa5e15569687d44054474062a53071000000001f75f9095bb8c88eb5737bccde08d750b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000720000000000000005010000004d08000000000000010000000004010000005004000000020000004201000000532000000038bb15c7489d850b337df823f140d8d296c18ba809411779aaa75e1aeeaf9bb204010000005604000000130000000000040000000d0a0d0a*5858c9ad7f9a279b22090e4c741089903796cfe574695472730c54112bb7f589",
6091
+ "twofish_argon2d:$keepass$*4*129*ef636ddf*16777216*19*2*00fc82629e2dc2fad2a50859a954ae33a2d5a932a28cf7ca7f8793fc18f0d741*71965300f0d594c27135cf96f9b7f8cc361d67c7fe26807b27391f5de4f8b1ec*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c030400000001000000042000000000fc82629e2dc2fad2a50859a954ae33a2d5a932a28cf7ca7f8793fc18f0d7410710000000fd1b5eb82e68d355a0110de77bf93b140b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000810000000000000005010000004d08000000000000010000000004010000005004000000020000004201000000532000000071965300f0d594c27135cf96f9b7f8cc361d67c7fe26807b27391f5de4f8b1ec04010000005604000000130000000000040000000d0a0d0a*bdd99728ee8011764f08bda42280ad64364069edfaafff4eca231de2d3db8617",
6092
+ "chacha20_argon2d:$keepass$*4*97*ef636ddf*16777216*19*2*f0b92cd3b11d33694c95d92154f6c91fcf3309b9cd453512d73cd381bc5973f0*a69f92f52585cc2de6beb73d9535639faa9c8e36dc32c66e0898627333b5077a*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a0304000000010000000420000000f0b92cd3b11d33694c95d92154f6c91fcf3309b9cd453512d73cd381bc5973f0070c000000dc9942315a036a2a8216789d0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c05010000004908000000610000000000000005010000004d080000000000000100000000040100000050040000000200000042010000005320000000a69f92f52585cc2de6beb73d9535639faa9c8e36dc32c66e0898627333b5077a04010000005604000000130000000000040000000d0a0d0a*744c592423dbe195b331c0eb12736dc8a40e62ef0e36821914d614da083c6f75",
6093
+ "$keepass$*4*2*ef636ddf*67108864*19*2*e4e48422ecb07da38401597150a7326fdd1519007b28c306c6e7418fb8ed29cb*af527945ec56bbb37f84ef85093735b689139f46c8003f82cad269837eb69d5f*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000e4e48422ecb07da38401597150a7326fdd1519007b28c306c6e7418fb8ed29cb0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c040100000056040000001300000005010000004908000000020000000000000005010000004d080000000000000400000000040100000050040000000200000042010000005320000000af527945ec56bbb37f84ef85093735b689139f46c8003f82cad269837eb69d5f000710000000257fccc1e57ecdea03bbc06aab7cd13200040000000d0a0d0a*63249b86a7539e2bbdbf0ac7f196d460e781e221d1c580d4c718dcc1493eefa9"
6094
+ ]
6095
+ }
6096
+ ]
6097
+ },
6098
+ {
6099
+ "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",
6100
+ "modes": [
6101
+ {
6102
+ "john": "keepass",
6103
+ "hashcat": 34300,
6104
+ "extended": false,
6105
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2d KDF / with keyfile",
6106
+ "samples": [
6107
+ "keepass4_keepassxc_2.7.9_argon2d_defaultsettings_withkeyfile:$keepass$*4*10*ef636ddf*67108864*19*22*94bbea30712c123420aa1b8d35ad1b169d18c4adcd2539beef283792c799a0b0*679daecb36b9ff3d660dac67527fee408cc562338deb4bf902cb54053b690581*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000094bbea30712c123420aa1b8d35ad1b169d18c4adcd2539beef283792c799a0b00710000000bb017e400f6ac941de112eac993cd5de0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000000a0000000000000005010000004d080000000000000400000000040100000050040000001600000042010000005320000000679daecb36b9ff3d660dac67527fee408cc562338deb4bf902cb54053b69058104010000005604000000130000000000040000000d0a0d0a*e7f366cc1ad7ad924a9bbc6d76fd6637b3aa1f3d28fd9d8c0296cfa516736fea*1*64*8e2e44d8a7ff006d0cbdd27a34f2186c5c7ec3e187baaa6c722ef1ef7e860291",
6108
+ "keepass4_keepassxc_2.7.6_argon2d_defaultsettings:$keepass$*4*60*ef636ddf*67108864*19*2*79b0ee82d9fd6debf70e9f1d3828f086ad4b42eb044e24cc96ab5c9ce9ae057e*495898d761b34446462982fc3b9794f22edc6e9c8b5c201b9a5df601ab176381*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000079b0ee82d9fd6debf70e9f1d3828f086ad4b42eb044e24cc96ab5c9ce9ae057e0710000000919e16a94771e7fb4c5063788d88999d0b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000003c0000000000000005010000004d080000000000000400000000040100000050040000000200000042010000005320000000495898d761b34446462982fc3b9794f22edc6e9c8b5c201b9a5df601ab17638104010000005604000000130000000000040000000d0a0d0a*91abca3c4462bd9f562dd74b4846e8cb994342cd04d3e3551ef8f17710a30848*1*64*a4de4dda31b3bbd364dfcabf243049f4d0fd216a7b9ec63fc39eeea1b2546058",
6109
+ "Passwords:$keepass$*4*111*ef636ddf*16777216*19*2*47df01b09fff77aa6bccd1e1b025a71d6e396b8fc5805b294f8a5c1a3e83f4bc*b2f7223e602a1191662d2804d1abf876a343f6c4653da45745642f302969e004*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000047df01b09fff77aa6bccd1e1b025a71d6e396b8fc5805b294f8a5c1a3e83f4bc07100000000ef8ed17526e3e5ce612ee8c801a39e80b8b00000000014205000000245555494410000000ef636ddf8c29444b91f7a9a403e30a0c050100000049080000006f0000000000000005010000004d080000000000000100000000040100000050040000000200000042010000005320000000b2f7223e602a1191662d2804d1abf876a343f6c4653da45745642f302969e00404010000005604000000130000000000040000000d0a0d0a*a71f5164a8b10c037b595a656fac06e0fd87932ca50daaa9d18f79962499f3b6*1*64*c5fc3ca8cfb936fb3757760b5ecc5981ad76c7780796c3b08ca424243b9c5527"
6110
+ ]
6111
+ }
6112
+ ]
6113
+ },
6114
+ {
6115
+ "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",
6116
+ "modes": [
6117
+ {
6118
+ "john": "keepass",
6119
+ "hashcat": 34300,
6120
+ "extended": false,
6121
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2id KDF / without keyfile",
5822
6122
  "samples": [
5823
- "$keepass$*2*6000*2*e852737a797fb642a2814e5965aba3473644a56ea67998526ce5e6f0e256a56a*fb300459b1e8c52fefa8e72676b57563565475b1c1306c266a48ccc2010e6a94*03027f86819941d1d0f3f2f5*af0f6c5e4319e6c10fdb95f44ded70f3115ae7dc28ec83fd3676c92076505ded*e0ab7f438903eb91dd8bc13c52c5a1c02e34b107ae16710bc57858c8c85fecd0"
6123
+ "aes_argon2id:$keepass$*4*10*9e298b19*67108864*19*4*4c89ff920a64b4de9c2cedd3ec31b8cf7fc6dc6ae332afcad9819515598770df*9c7be220e104c00be1be0897098eac49efbab66d440cfe66bb1f322cd47b1ff5*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff03040000000100000004200000004c89ff920a64b4de9c2cedd3ec31b8cf7fc6dc6ae332afcad9819515598770df071000000059b2c24bb626769c60e241780ce6b6f60b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d0800000000000004000000000401000000500400000004000000420100000053200000009c7be220e104c00be1be0897098eac49efbab66d440cfe66bb1f322cd47b1ff504010000005604000000130000000000040000000d0a0d0a*bdcfd0029f0e6a3196c2d143b3f0837e6dbbdad276daf9ba3d487c77d76b641f",
6124
+ "twofish_argon2id:$keepass$*4*11*9e298b19*68157440*19*5*8d06bf40247fc629b057aa27f67dee07ae3a8e70101b93cfb08bdf6eb8af4e52*dc6f29d8dfd0c223b02df07f9ee917e148eef06b5dac83ac2b1021a7f3b541e4*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c03040000000100000004200000008d06bf40247fc629b057aa27f67dee07ae3a8e70101b93cfb08bdf6eb8af4e520710000000ff78aac92b043361eb3c5523d5ae67ea0b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000b0000000000000005010000004d080000000000100400000000040100000050040000000500000042010000005320000000dc6f29d8dfd0c223b02df07f9ee917e148eef06b5dac83ac2b1021a7f3b541e404010000005604000000130000000000040000000d0a0d0a*51cfd96f37a9ce577068329db68227e45eb02eeadbe30c7160bf78dc453c4744",
6125
+ "chacha20_argon2id:$keepass$*4*10*9e298b19*67108864*19*4*4275e8698a99139c0affd9926f00a55a3db2251837f876b567419248382a766d*8e654b154ac24ae7966e43432813d2d39951007215a600dad53509472f746840*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a03040000000100000004200000004275e8698a99139c0affd9926f00a55a3db2251837f876b567419248382a766d070c00000079a90871e71cf0deb3afaa240b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d0800000000000004000000000401000000500400000004000000420100000053200000008e654b154ac24ae7966e43432813d2d39951007215a600dad53509472f74684004010000005604000000130000000000040000000d0a0d0a*54d27fe00c2ad00051b262d2dcc684e9a577bc915db6a855246f6613c002fb49"
6126
+ ]
6127
+ }
6128
+ ]
6129
+ },
6130
+ {
6131
+ "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",
6132
+ "modes": [
6133
+ {
6134
+ "john": "keepass",
6135
+ "hashcat": 34300,
6136
+ "extended": false,
6137
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / Argon2id KDF / with keyfile",
6138
+ "samples": [
6139
+ "Passwords2:$keepass$*4*10*9e298b19*67108864*19*4*cab25b0c50639dfc73924f70764184b285906fcc798588b28db8c8bbe1b2a410*a9ef7e8f58bfa46a9f1cbaa0b554b7f5e2e3bb430079634561a7ff2781f0490d*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000cab25b0c50639dfc73924f70764184b285906fcc798588b28db8c8bbe1b2a41007100000000fac592c92c2da6385ab8ea6b33ce9f20b8b000000000142050000002455554944100000009e298b1956db4773b23dfc3ec6f0a1e6050100000049080000000a0000000000000005010000004d080000000000000400000000040100000050040000000400000042010000005320000000a9ef7e8f58bfa46a9f1cbaa0b554b7f5e2e3bb430079634561a7ff2781f0490d04010000005604000000130000000000040000000d0a0d0a*f7a91be1cdfbd5caa2d0560c6f400df08490bdcfc3fcf7691782505fd5dd168d*1*64*d9cf6daa6d6acb14ad3ecdb7a60db9e9a6fcae34505d72a7ac01323e46917f9c"
6140
+ ]
6141
+ }
6142
+ ]
6143
+ },
6144
+ {
6145
+ "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",
6146
+ "modes": [
6147
+ {
6148
+ "john": "keepass",
6149
+ "hashcat": null,
6150
+ "extended": false,
6151
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / AES-KDF / without keyfile",
6152
+ "samples": [
6153
+ "aes_aes:$keepass$*4*44776120*c9d9f39a*0*0*0*a85d8ea2370468ceb9c2de82c4bfab6c3039f31511da48284b4db1ffb50e8458*dc5b1980126661b38f1d8fb5b9e8eae6c491d7f2e95b062c4a961524f9546485*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff0304000000010000000420000000a85d8ea2370468ceb9c2de82c4bfab6c3039f31511da48284b4db1ffb50e84580710000000ef979a5c620cb5255ce2d7ad4e174e090b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000b83aab020000000042010000005320000000dc5b1980126661b38f1d8fb5b9e8eae6c491d7f2e95b062c4a961524f95464850000040000000d0a0d0a*f5cd3664fe32d9da8b3ad4db1434462742ec4e72a4167965d762a3bd9ea89f31",
6154
+ "twofish_aes:$keepass$*4*42253520*c9d9f39a*0*0*0*66944e4812a44c84c65378b35966ddfb93509065b9a502f87dfa2eb51b214856*d5deb3d7f24b8e87e94b79690e73f37d6e66aa4d3d3acf5ec4fc10c72833d616*03d9a29a67fb4bb5000004000210000000ad68f29f576f4bb9a36ad47af965346c030400000001000000042000000066944e4812a44c84c65378b35966ddfb93509065b9a502f87dfa2eb51b2148560710000000e1793309c306e01878489ede9b2a78690b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000d0bc84020000000042010000005320000000d5deb3d7f24b8e87e94b79690e73f37d6e66aa4d3d3acf5ec4fc10c72833d6160000040000000d0a0d0a*9a0380debf44bcff62ac1410a4d4f95a4cae31555550af5433e69d7a4287eea2",
6155
+ "chacha20_aes:$keepass$*4*33333334*c9d9f39a*0*0*0*dfd69128124421d18c2fa660224336d574b8a3a573b35cfd6b685f68141abc6b*173c2c996851314140cfd5fcc0188e774aca98867f647c1745f3fcac19fa3117*03d9a29a67fb4bb5000004000210000000d6038a2b8b6f4cb5a524339a31dbb59a0304000000010000000420000000dfd69128124421d18c2fa660224336d574b8a3a573b35cfd6b685f68141abc6b070c0000004272014060b35491633b52810b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea0501000000520800000056a0fc010000000042010000005320000000173c2c996851314140cfd5fcc0188e774aca98867f647c1745f3fcac19fa31170000040000000d0a0d0a*4fc2a0f24999518d8f24047dce83d87789c14371b2f8c365464f8ec4d7578a91"
6156
+ ]
6157
+ }
6158
+ ]
6159
+ },
6160
+ {
6161
+ "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",
6162
+ "modes": [
6163
+ {
6164
+ "john": "keepass",
6165
+ "hashcat": null,
6166
+ "extended": false,
6167
+ "name": "KeePass 2 (KDBX 4) / AES-Twofish-ChaCha20 256 enc. / AES-KDF / with keyfile",
6168
+ "samples": [
6169
+ "Passwords3:$keepass$*4*53571428*c9d9f39a*0*0*0*65b3d203279dbaeda862a76b49ba3cefb6ef0fd0cd72706d74af134cf1e24596*017158d319eda2ba3866f51d76cd45075261871274d4820ee44dc877ae4febdf*03d9a29a67fb4bb500000400021000000031c1f2e6bf714350be5805216afc5aff030400000001000000042000000065b3d203279dbaeda862a76b49ba3cefb6ef0fd0cd72706d74af134cf1e245960710000000d915ab89160416406305dc22fadd879d0b5d00000000014205000000245555494410000000c9d9f39a628a4460bf740d08c18a4fea05010000005208000000646f31030000000042010000005320000000017158d319eda2ba3866f51d76cd45075261871274d4820ee44dc877ae4febdf0000040000000d0a0d0a*9e7c496b836e2988c49742c2720e504037745898f487dea240a7e18c8bee48c1*1*64*ca0c5137df1f4bb3bf2b3b6d9d196509a0b1a2da9b174d641419782aaffa9345"
5824
6170
  ]
5825
6171
  }
5826
6172
  ]
@@ -5927,7 +6273,7 @@
5927
6273
  ]
5928
6274
  },
5929
6275
  {
5930
- "regex": "\\A(?:.+:)?\\$sshng\\$6\\$\\d{1,2}\\$[a-f0-9]{16,32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d{1,3})?\\Z",
6276
+ "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",
5931
6277
  "modes": [
5932
6278
  {
5933
6279
  "john": "ssh",
@@ -5936,7 +6282,8 @@
5936
6282
  "name": "OpenSSH private key (RSA/DSA/EC + Bcrypt PBKDF + AES-256-CTR)",
5937
6283
  "samples": [
5938
6284
  "$sshng$6$8$7620048997557487$1224$13517a1204dc69528c474ef5cbb02d548698771f2a607c04ea54eb92f13dedba0f2185d2884b4db0c95ce6432856108ea2db858be443e0f8004ffcd60857e4ff1e42b17f056998ec5f96806a06e39cc6e6d7ef4ce8ae62b57b2ec0d0236c35cf4bc00dd6fda45e4788dcca0f0e44dddae1dad2d6e7b705d076f2f8fc5837eec4a002d9633bcad1f395ca8e85e78459abe293451567494d440c3f087bb7fe4d6588018f92ca327dda514a99d7b4b32434da0e3b1bf9344afb2fe29f8d8315a385fe8b81fd4c202c7d82cd9f0bb1600e59762ab6ea1b42e4e299f0a59ce510767e1e1138453d362d0a1aa6680e86b5aa0bd5c62165f4fe7c2867f9533578085adc36739d6c9cf7b36899aac39dcabac8b39194433423e8e18ba28496bbe14dd01231eb5b091ae9de0f7f9ea714c22edac394077fb758fe496e1880571ade399ac229457ddd98577f8a01a036ad3bc8b03a9fb02e26b4b76f6cb676eabe82d1606fca0c5fca62cd1d82c3df1ed58ab4acd4611b2827ebde722bc05e471a427225818aa36dabf5bf1203ccb0ebc8dec097e49f7f948bfe7b939e6d0ff1125b863c033768f588964f8b77ca1e2425751f873f80e5d6a0671f7860cf4a46533585094726c3afe5f7203fa4a01650fa9839772c713a033139cfc6a6e6f7dc62e5844d4c57ef4fc3321bc85d597a54bd6fe37e9e696cf3b5ec66f55232e0964dc5cf880d8a41a9891150618bd9c088fd9824af0d86f817f2c79429c3d56cd6eb41eb6120f9accc10a863f23a2bb6c57d4bd6193f2283ae0215e2e87e672a8438e2550c044fa9556bdb4afc40d8c2752ffbc6c95571756a3c230bb2fa95f519f8da238ef0857ecf860247a8b26e28269f9bad564e7d8bfba2eac9760b52449251cb35e183f5b309a09071535154c6f1013b58f305b544f3589c9eb0e9ac4267a84374a3eab49c53aa9bedbf97f8f19ebc212d8db74ee03554a3514140667fa4ce8e06aad3f32d1b00015be0e8979fe66736018589beee06d6f318851dbe8d9689e70202185d71fc5e5a3d2996ddb8ae1d7718c49855c6f8c43301e0915f324f30d0d9c6a8504a91ad5a7179aafb87ede58598394949910874850994abe815817359152ff6a7c8cc6f19524dfc5e50ddfd038a2275bf809e3c8f05ed3e3137ebd62d91cd3578533787c3847e3c5e07e5a891480e5ceabcf6c344e7bec8b640ab9a03e90b846b35d2f46ba150accef32d2597b064810b15fd54fca6d2b146feabcd05c0b51617ae95e36f6817a62c3ff42c5c2f6f1d20a8a1fd334d3b7d3f83bba057b79d9b5508bb0cb706ba00acb0ab797401fdcfac80b5b6e38e51aec0b38f33ff4690425ca28d88a2e876591521230150b4e20a4a82e50061cee9c0705100bfe5fdbd8ef27aec20387cf32455ef305bce2a91ae6da91fc41376b97149e9b41c901b24811df9272ff09718923b8d94e8e459a164a22b0eca47653f3efcbf08188c5da78cd9fb9eda1761094f9d8bc3d479e9f40c7d79ebaaba2a5c632329f20a9962040ff8f512b42c5f32a8460d87b8e93c6f980a1562c436eea1c8994fbf671dda3c4ccd3c142acfcdde2ab61227289ad408213ac8e22d9ef487f36925f5ba3b8e7e913d25c4a8592c861d13f03b615bc2760aabc61d68db80d35296a3312fdf4b56c0fbee5ab3fea1cf9caf3960a564046939e8002d2dd909db446d85aeae9dd42a33fe28684f722172e6",
5939
- "id_ed25519:$sshng$6$16$7aaacd96f5d90b595e95ec0b1ff64fa4$274$6f70656e7373682d6b65792d7631000000000a6165733235362d6374720000000662637279707400000018000000107aaacd96f5d90b595e95ec0b1ff64fa40000001800000001000000330000000b7373682d6564323535313900000020c55d041c041604ff871be853bfec2d62654416bfc01593531251157ade20ff5500000090cf59137eee3fca657818cde5c17b09e005da8abf6c856f89f27d03d3208ff1bcc9ea18054d8b1f0c13fd5d5bb7cb850f256f5578cb4f194f7b4f9a7517a78c26cc549f9cebc7026d43abf47e359caa9cf2e01adbfc5284d74bf728099780accd600fcdfd7d7aa60050698820be8564eb717379bfc618ec6f69d8d6d09670a5e9999b4dd4e1921921bf356c58e0af06ff$24$130"
6285
+ "id_ed25519:$sshng$6$16$7aaacd96f5d90b595e95ec0b1ff64fa4$274$6f70656e7373682d6b65792d7631000000000a6165733235362d6374720000000662637279707400000018000000107aaacd96f5d90b595e95ec0b1ff64fa40000001800000001000000330000000b7373682d6564323535313900000020c55d041c041604ff871be853bfec2d62654416bfc01593531251157ade20ff5500000090cf59137eee3fca657818cde5c17b09e005da8abf6c856f89f27d03d3208ff1bcc9ea18054d8b1f0c13fd5d5bb7cb850f256f5578cb4f194f7b4f9a7517a78c26cc549f9cebc7026d43abf47e359caa9cf2e01adbfc5284d74bf728099780accd600fcdfd7d7aa60050698820be8564eb717379bfc618ec6f69d8d6d09670a5e9999b4dd4e1921921bf356c58e0af06ff$24$130",
6286
+ "$sshng$6$16$c26644e92fdea90db2eaf7662b4bac6c$4730$6f70656e7373682d6b65792d7631000000000a6165733235362d637472000000066263727970740000001800000010c26644e92fdea90db2eaf7662b4bac6c00000018000000010000040b000000077373682d72736100000003010001000003f500c806d8b02f84d7ebb364b7ffc0ad621a8bfc02f566ce980b0941b7a50d468a3808cba9e7dd36c97848ce0cecb7427df5187c59c305416b43897692c5592361683e864363d14f163e4eac2da7daf5483b7cef894a27d469e7ff8547d9191cb99211854603c2f28db48a3dc46d3e5eccd7584756934a2465ba551a5766eaf3e7ccb1fd4e529b42f09cf9dc2d506b28fb314442fa8d3d94682cbdca8be9b0765399008955a79fd82ed804c71db2b6a8b502ecfdf5d22cf60b819bd748b1872a0294c0edcd050d7d4e1199f26aafbe122ad66f5364911d8896be623f4bbe7b1535f92c933a529e35e38b6bed78ccc371aab9e4a8c7d626ca51bac3321df5fc103639ac0afabf4c287a6bdc8ba11a3f0792a74ddc0b409af2836884f6f085558f67b6f2e685bdf21ff4fa9b2b67a90115fb31a60ca2787e9030d428265ca3c6b4a21999206fbfb6fa5fe203722043d04694b9dd5d1a0e21de127d0b0aa4ca945f39677f4a20674c0c931086d918dfbbc99afebaad439b81a777ae65093753153623ca2245c685e5a5bfd2f978a61f7ecef9054dd6ab2aea283bdc76f26caee7b56e4f98aa74fd32ae2e1eb786fddb863a668e0678cea284621108f282f5b09aee513d5777b4c1d536e1b3d095cdc89d0a78759607be132bdb84b1467525852c0ff825597f7ecaffb7b0071037f106609f7e00c6af64d51e51eaa4773762212d695e002578bdc06955e138baf78762a97dba8e6d81d0e51d7e5be6782b7d7cc603f45c23d93a702de88a3f6326293f35ba529657acded4a2ce496e6b4113f08f871b09b84b1d6bf001ba59cfe9662614ed1a775bc8b784b56cc49dbf9a9b21be24e99676f9b288cb0633e406d0c47469f9ecaeb02884bdc615c8235c2e36a6e0667a844f5a7bf7cbddd264391dd0278585207d04ae514d689d141c95bfaebdfa25252c3deaf59070e2122d3a3805f6e60f9186eacc8bbf1a4624005f95a7397fc795e2cc75f69644a21bbe751234746490f54d401e30d6bc5940fbc6b5823d89cff3a921d2efa90febdf4dd22c91db4dbbd178b844a2274d321498d2d92687223dc5ff8bc614e1f4c7628e79467ed36533c5ce77f295e868be1d4dbdadd2faa2d7a560571650b3b1f2eed7091b2ab7a9ec7ca0e642e777c1ec4d52590f541a0898262031b0906934a1d5e109d5f678b6a0bfba74dbe271e81c1e355c9200886a894f8c9b02233d44ce4c92351a2f3cb68caab8e0df30bd89f3d5d32b72c0fe6cb25c584317e922ed26d592cebd39aa4f0ed4bf29c802125427bcbf20a7543128b692cc7f01ee6ba9270b74ed44b331c9130901f1eb0a76650cfbf238fd124abf4f77afef9bc0396048e341633b082b4786c27cc221c0844cc564ddbc9a35f4921eaefd30ce32af9e0bd92677725e53f73962e40062671300000e2088854d5c9989180c9babd5a54e8f78b2914fe70f866e501b2a322ca0b90ac6ad2d54c169818cd27643503a97612c93d016d2614f427d4d9b4e6d7da4ee90796fc397511b912a7d9191ae016bf91e8de48e8c597ad366ef827df3ac06cc7e6d9e27ee3040e481c39507daddda3a0fa0002f6baa6f79a368ccab73a55707f41ffb26664f464fb67df24a54f25046b497f70aaf5e42c435ecc9eaeb8bcbf362659f2f5c8c389a8dd16f3c40b5d1a902d2a83f354a2b1ea0ef7cfb1bc25056bcdb34c065a9fa6b741057fc8bd4432ab80f4f8c7f16f5a9629c712e12c36063f71a664da781061145e2539011a9acded5da9635094e26a968eae89e46e182dc3bb9ed2a9644b19b8d716a1d123a5b3633d53f2ab2c741c49b04ab230b9f883c7a70e850717f13fec82c5e345870e346b24a8f97dfed80308ea9fcb5016690431f63a8aeff2f16b9555182e9c7a6a8c9d29c48e54c68aab26dc023b98a4186a3ee198209304f75fdde6b65aec2ca10a9652765fd806eefac82239f33fbadef300df9e3ea20288c94cc95b87595ca2ce36569ff8e80e0617d5c94e3c3b480ba97e2c225f115830979a7a093f7ded960cce020b08e8fca2073df8dfba47101932ef0e3f1d36019917fdba02aef1318c2c95e98de36b4669c370b57a0cf03a3977e146a34b4a8fa12e62df59ccb7fead8cec301c6508685651aa1ffd2da67abbb4a8cf4671d5af821a76e8427b19f8116cf9c3e2af53aef7250b7ccfaed0433c7d5c0c95bf6982587705a19a2a152948eef60e0f1e1c5c4d1845ae2bafd00d8e041c77c0a8eca43b2b3e5cef1ceee2e8e2e5eb442ace8a314b0bf04b7388cd495374bfe2c1d9d540bb7ce41894b6e3fe3e5fd81628c640d78c2fb73ad67b01c131e5da5b0d3bb8bb8828f5750943811f96b25b8fc08db5296b44ef7d15da180862db98843ed2f0cd6f8131668e23604b2bff1689ae3aaac223764b0b09dd672d01b97c885eea5408c3669be10280c0df06200a91bd084df829abbab2164de8abc3ba539a5ede40622432611032fc966d266631a6e7cc1ab9d346368e6d2cf1b2de5693355f6f77d5cf26e2a62bfc2ac45c18d338a01bc69ab23cd0f274fe322517fc4170c9b5d5dae0e68e9c4289ce5530a0dbcd471cf0a9ef325653f400bc287e5b7ba2136e3c0cbff61cb58055db9479ecd362093f6ac69e854946c8557af8de6d938b6caf19af3b05f8dc22f2721cf329f30e3c3cd7b90b58395324a0f11978ca31b213f8aca5c4ecfc9a1c8652c2469b8a78136b41e1f76ef5d271b67ac3d346b2d169d8dd0ef7ab26d6277ba47b0546f07599a92b2f94b8a6db50eb5d9b722eab8203bb08cf10a604b9b37b5cc0cdb83ebc43b3a866402f947b63e57f0519a749c3d993d874d662a10a1358b67332be5e5b5b938550aae99152cacc026df8794bc2e681e7e1470216520a51df69ae605a91e67e130b3dd315d390f20d86d0585e1717f419a6448e52f072d556e95fa998f297429bbb6eb8b04670234e34905d145ee456e02e86b6e008b2f04825248d16080f08ce8e3081d0c03d88331c0a4c6de650cd2ddc6141383ff28be7e4d077d0faf9aa7018bfa5f52fc48419f948189989cb87f92ecfb285db3b16a5a6941ee5a1b9aa2365eaa647903a88212621a39c5f10d3ebc75bf8ed0ce596de02d7fb3f93e67fc6d18b5124453cb468966a33ab3002bbcbc274ed2466e4d476720a1b4006329ccd12356cff654a1441f0b2d6d711214c5c4a03751fdcc4a20dac1dc91f9981ac7f2392840fe1e706cf33780ec1b8ee9c1854be2ca3bc89728ea4ec0a2440f95a2313e2512808fe7c89dbb4036b243a9aac8e07d50772c090555eb919972e86d4dececc66931f2df2f5ff73604391db4e04b183ceaaa3c992d319ca0806f59dd067f044d1fc6a1ecc89d0263c9ae3c2b361e5ae39bcc2d02d1ec966368646d9bd85b0a447a8f4235395af589dc19c57a7021d54d1fefb97dffdb534d1c9028f7bae41994480c55ec91e79015fcdc2587ff1d22a63c48d9d44eee4eb2356b8c9a183b0c65bf35fddbe4ee668a71480e1f6d92dad0266fda7e90b06d87e8301122b91f75d917db0124af75da0d859fb3e1b15d81e4c62cd92ae09d4804c2768e4f86adbedb45131b81fefdcace21b4dab7656ad8747f53f2b8abf994edb8497d27d9cdf320f15a7b55e0488bd157f4f5275b443468c77beddf414965f977b9ddb2ff42baa544f62e1e707744e91226830764e59dafdd6280a032c8585b441c6c245f84ff8d94e9ff6abb67ae11cc3736d85aeae8d04e95b5defb0a1048fffd0eff1d5182a704b7e806561b300325296fb53353d6950a8fc8d80377e0e68398dda2dba8ccaa285c60b8c2e066dbcd68b4b852bdb72e3a0a708cbc92a2a645345fe1882f71853a68c6cc81b82d9e4ad76317aa679479c81f26f6d3c665c49c6142872a72c0e6a0f5a0297eb96229ed5b26420de64ef86e4b5842505fc3ed55e0cab16bad04ed66f664056218c45ed971ae732f1747fcfd020edaeeff0d1a033c45258b577c9ab5dede4585b7be85f27e25a86818d10f1135863cdf137e0a0513b05bd4bd75462b46419dc81202bcdc5c86c268718b405915c1e0b6df974a16ce59cf2bccb81eff83e87becf1894aa6ca06a807b8be38b8cbd15bb70cbb6e81ebb0fe9bb87f6977f8a00ebc13ad0156d8b554e1d22c8c3f4038faeca3d3d8ad26c3c643133ce00c7d99dc755d82bf85987c1b52c16a29bcaa0d699035494846b9481bfcc91bf029e3d1b4f11254a7f6e46e2984c7b0e61dd446afb675004f5d5e31abf5ea53824096ad29cea40f62722f7c66acca38fa96ba2474509aaba29e9c03d6554062f3cb386d43ec4d345012c2cec03f7acfacef3108f9cdb430853c174e3cfd1d0a97f042ded010c0b774db994461a44849579534c80fcfccd5c497ebc2fe2159532d08169b2f8a19a33411f963344d4c6189b135f6545cff20b15a13fa49852f363fd9ef1ae93cd018354100142f5c6094e69b10efca389b71b8a6a6914753fa4c2c0926b851bfd9b339a1499b0a7eeef0bcffc65e8a10464105f8d7f793032e8377151ed7c847e52804f78475da5c95ebae94eef9e39dc2744ef89a5bba6c87a9b3fc96b8c10ace00d8bacf96f494eea5e6b8640ab3cfe1ac8161aec332416f08251e85ace169fc106c24826d1805f56ef6bb353c0c9a14e9869cd0cb366eb64a87ee37f58291f862c4a6e8742146553d28d5e7e6106297b8c3edc1c08a0cae6b27bbbace84062b3e59c8b37fa3df2fac17044b39c248595b91d0262037557f27c9deebeab1c1fe4acd5a3b764c6d4676c74b9e005e121b859a563d89f022483588bfd10b7c22de538c3f85219cd329c42dc23fa787d07d310625a774f29b474b81a3eb2604ce5a26b1c015d1342d5f1aa4d9295fc5d9f80cead3d67d5cc300117a3fdd7466dd7c09298f605730412de34ed77550af0313709e2b159bbc1f241d821c8842e44cc13d18d23ea0c24f66b206c9fd12147f50a95f5ade73690c9b7517925555fee96b53d5bd2dd137e5670d76bd15b1aeae1737c9903ac03789d347b61c4db113849e4b164670f39496fd1b92644409bcbb4213d3aadb032791851501643dc27f032ba4ef88f8d36e439330c4fefe65eb2304c351564e02c81e54ad90d5cb9aad8f3a35837ce3547233dee3742a0a9a86370664bf0e925c618709ab51d3141267642ed3095c4e939b1060a6bd0f18216957977967aa2bb0706d7f579828548ed238eec56c224f4883148f6f1b1ffc8a61ea10012e18e0f7f3f16a9177799fe365c301d6a8421e8e4d583a6f7c0b4791300d7537d1deef9272810a1ede18139659404149cdbe93f156c597ba2f0ef27769f2ba1eb784d7a22687e3fe860fcfd49cd134fdfbae3cc63330fb2cede41ec15a410551fd47190e4f7882d08a2b378b4e57209a6774654bdbf0275374140c4c5fe9ee019e8422c0606bbd7eea7b9682ac1713970826e0a7f285cf970610543298bfdc901818994d282e8132c5c0373959579beb71c25b5ad7181c9d712c08ad189c476798d3a345d786c2f97eb36863cbe39f4f033732513a2243a2b53fae85987d5134b5362bdc07555173fd80259b06916420727fe53ef78cc79a2a70c4a3b3cf68bf7116fee56cea9005b212c638463fa7115598cbaf56aff2df7d65d5268d4200e3c0f2ba086fd465cf24afe3a903dc4403ae2d920090f05b7954a0267ac483a2f6e28325a80f4fe69d7c36e3ab8816765e46632c86e7a7e568a95514371f4bced7ab3907607fda6218c424d6b93fb0ffaf36959bcb7b6abbee2acfb5bb3ff5e6468c5bf4ac69ee03932d67b24fce5d98c9f807788da3047c2106373775ef4422e22c5d86c9bcccda0c80e3e5fdcccb8478197a95b32b1210e06746f0afb189ccdf4786757969097bfb60ce5f5c3d7e1e0741129b9318fabdb31bdce6b5e98d21ae4bb2d70e818acfb94528264a335044a3c5a3e2888bec3478d9b6221e648d4b658498b69499f2474abfd10d42a11bd1ae8848798c473f3456eb1c619c3a20d5dc4feb0cf07797c2f45efff0cde070228f7372ae416144353468cc2925e1f8c9f7c2f0766ea85f7e57dc01414e9bb1c6992a291feafa967f0d76f7b6ed320f560a777376a7f623af260228f876f5ae519d7a853a66b73230870215f51a58c9fcbbb268f2904b8a7ffad3b7eecb068fee53c714be48a26683c06280dd7c9a5d1d26515cf34a543a88184625f64ea92fb999fcfc3d05778faddf956c8be75c73f8dfd07a096bf98bf713b14fcd949192e97048067c7c96a56d78f6bcb7da9c32898e83214426f2aac1a8da5ff06d4b12f8b5de1faa639852a1702a87d6db1df11ed39697e74578632146988625cb69923e3f23078b2781a5c96c1086b8e926e0f748ca337fc2b541771dd3f7d2c73f5d8493b4c9566c2babd7e5f5c2095749c8b4fe85e3bc62d692651ef1d8ff69e6c79ff4647f414016bb48c015a70e3ea4a463205de87d0013114835265b8215f40bfc4bc99afd7c4ee8884229bc879aaa1669751a260517d685c446b61371cb6a6e089f1d812ff6$24$1114"
5940
6287
  ]
5941
6288
  }
5942
6289
  ]
@@ -5998,7 +6345,7 @@
5998
6345
  ]
5999
6346
  },
6000
6347
  {
6001
- "regex": "\\A(?:.+:)?\\$sshng\\$2\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d{1,3})?\\Z",
6348
+ "regex": "\\A(?:.+:)?\\$sshng\\$2\\$\\d{1,2}\\$[a-f0-9]{32}\\$\\d{1,8}\\$[a-f0-9]{64,65536}(?:\\$\\d{1,2}\\$\\d+)?\\Z",
6002
6349
  "modes": [
6003
6350
  {
6004
6351
  "john": "ssh",
@@ -7200,5 +7547,98 @@
7200
7547
  ]
7201
7548
  }
7202
7549
  ]
7550
+ },
7551
+ {
7552
+ "regex": "\\A\\$shiro1\\$SHA-512\\$\\d+\\$[a-z0-9=+\\/]{0,345}\\$[a-z0-9=+\\/]{88}\\Z",
7553
+ "modes": [
7554
+ {
7555
+ "john": null,
7556
+ "hashcat": 12150,
7557
+ "extended": false,
7558
+ "name": "Apache Shiro 1 SHA-512",
7559
+ "samples": [
7560
+ "$shiro1$SHA-512$1024$WobJGSjbUhsMdaILomMOdw==$9uptGJ24vzZCqZI55F77N7xjUxGlVrK5aCmAwIrV1vwDmFM4akE6Hmd23Aj8ANLSUdIEkHLZ6SnoitZbOsoQNQ=="
7561
+ ]
7562
+ }
7563
+ ]
7564
+ },
7565
+ {
7566
+ "regex": "\\A\\$as400\\$des\\$\\*.{0,8}\\*[a-f0-9]{2,16}\\Z",
7567
+ "modes": [
7568
+ {
7569
+ "john": null,
7570
+ "hashcat": 8501,
7571
+ "extended": false,
7572
+ "name": "AS/400 DES",
7573
+ "samples": [
7574
+ "$as400$des$*OPEN3*EC76FC0DEF5B0A83"
7575
+ ]
7576
+ }
7577
+ ]
7578
+ },
7579
+ {
7580
+ "regex": "\\A\\$as400\\$ssha1\\$\\*.{0,10}\\*[a-f0-9]{40}\\Z",
7581
+ "modes": [
7582
+ {
7583
+ "john": null,
7584
+ "hashcat": 35200,
7585
+ "extended": false,
7586
+ "name": "AS/400 SSHA1",
7587
+ "samples": [
7588
+ "$as400$ssha1$*QTEST1*7ED7D3694D0A2E40A720D41031B456C09124966E"
7589
+ ]
7590
+ }
7591
+ ]
7592
+ },
7593
+ {
7594
+ "regex": "\\A\\$blockchain\\$\\d{1,6}\\$[a-f0-9]{144,65536}\\Z",
7595
+ "modes": [
7596
+ {
7597
+ "john": null,
7598
+ "hashcat": 34700,
7599
+ "extended": false,
7600
+ "name": "Blockchain, My Wallet, Legacy Wallets",
7601
+ "samples": [
7602
+ "$blockchain$269$0349575305940509451603791869345994679e29d1618f26ed65ee15ad65d1af046f51ffcfbfa82dcccea07bb0f0fff725af53b96910646440b361453addc5caeb2a09479dc6cce3a1ebf138e2649689ab286ba2db6bd5edef310cac8f9386f002a534e9346cdc61bd0e21ca738eb2418a8158c83a43517981c43d8792cad6f290cbf40d5a3c1bb20283fcb44c59cae2dc90c898dbc4e960ca666653a08d90471610a8b9bf590752e8d8bee27e7aa58d015324dae83c87a46384ed8f947e37e65d4572018b5bfd8fd8ea70df777c8b692bc613ccb528356d1844490ac2b3be2dd8927fbf1aabf9b6cedec39742ed92a03220f4468bd32c1eed5d5c3c3aa0be459e06466c94991df97f335bd661"
7603
+ ]
7604
+ },
7605
+ {
7606
+ "john": null,
7607
+ "hashcat": 12700,
7608
+ "extended": false,
7609
+ "name": "Blockchain, My Wallet",
7610
+ "samples": [
7611
+ "$blockchain$288$713253722114000682636604801283547365b7a53a802a7388d08eb7e6c32c1efb4a157fe19bca940a753d7f16e8bdaf491aa9cf6cda4035ac48d56bb025aced81455424272f3e0459ec7674df3e82abd7323bc09af4fd0869fd790b3f17f8fe424b8ec81a013e1476a5c5a6a53c4b85a055eecfbc13eccf855f905d3ddc3f0c54015b8cb177401d5942af833f655947bfc12fc00656302f31339187de2a69ab06bc61073933b3a48c9f144177ae4b330968eb919f8a22cec312f734475b28cdfe5c25b43c035bf132887f3241d86b71eb7e1cf517f99305b19c47997a1a1f89df6248749ac7f38ca7c88719cf16d6af2394307dce55600b8858f4789cf1ae8fd362ef565cd9332f32068b3c04c9282553e658b759c2e76ed092d67bd55961ae"
7612
+ ]
7613
+ }
7614
+ ]
7615
+ },
7616
+ {
7617
+ "regex": "\\A\\$blockchain\\$v2\\$\\d{1,6}\\$\\d{1,6}\\$[a-f0-9]{144,}\\Z",
7618
+ "modes": [
7619
+ {
7620
+ "john": null,
7621
+ "hashcat": 15200,
7622
+ "extended": false,
7623
+ "name": "Blockchain, My Wallet, V2",
7624
+ "samples": [
7625
+ "$blockchain$v2$5000$288$324724252428471806184866704068819419467b2b32fd9593fd1a274e0b68bf2c72e5a1f5e748fd319056d1e47ca7b40767136a2d97d7133d14faaeca50986f66cdbc0faec0a3fabbd0ba5d08d5322b6b53da021aacfc439c45bec0e9fe02ad81db82f94e9bd36a7d4d76b505c2339fcd46565d3abab958fbeb1de8bfc53beb96cde8fe44128965477c9ef0762c62bbb1d66532b4888e174ea949db54374a2ed9686a63eb0b5b17ae293f7410bb4ae5106f108314a259c5fd097d558515d79350713412159103a8a174cd384a14f3da45efe18044e1146036000231f6042577d0add98fc959d265368e398dc1550b0bc693e9023cd9d51b40e701bd786e19c3a281a90465aa6ea3f9e756d430164ab2eb43be5b6796d7ac15b2fe99217410f2"
7626
+ ]
7627
+ }
7628
+ ]
7629
+ },
7630
+ {
7631
+ "regex": "\\A\\$sm3\\$.{0,20}\\$[a-z0-9\/.]{43}\\Z",
7632
+ "modes": [
7633
+ {
7634
+ "john": null,
7635
+ "hashcat": 35100,
7636
+ "extended": false,
7637
+ "name": "sm3crypt, SM3 (Unix)",
7638
+ "samples": [
7639
+ "$sm3$KTTUB40dW4mRyRFd$ul2xLiIY3FJtbo8sv1R93sAYCkxQCH/6rmS1kD5vJYA"
7640
+ ]
7641
+ }
7642
+ ]
7203
7643
  }
7204
7644
  ]
data/lib/haiti/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class HashIdentifier
4
- VERSION = '3.0.0'
4
+ VERSION = '4.0.0'
5
5
  end
data/lib/haiti.rb CHANGED
@@ -56,7 +56,7 @@ class HashIdentifier
56
56
  # HashIdentifier.list
57
57
  # # => ["CRC-16", "CRC-16-CCITT", "FCS-16", "Adler-32", "CRC-32B", "FCS-32", ...]
58
58
  def list
59
- (PROTOTYPES.flat_map { |d| d['modes'].map { |m| m['name'] } }).sort { |a, b| a.downcase <=> b.downcase }.uniq
59
+ PROTOTYPES.flat_map { |d| d['modes'].map { |m| m['name'] } }.sort { |a, b| a.downcase <=> b.downcase }.uniq
60
60
  end
61
61
 
62
62
  # List all hash types available as <Chf> object
data/man/haiti-fzf.1 CHANGED
@@ -2,12 +2,12 @@
2
2
  .\" Title: haiti-fzf
3
3
  .\" Author: Alexandre ZANNI (@noraj)
4
4
  .\" Generator: Asciidoctor 2.0.23
5
- .\" Date: 2025-02-02
5
+ .\" Date: 2026-01-01
6
6
  .\" Manual: haiti-fzf manual
7
- .\" Source: haiti-fzf 3.0.0
7
+ .\" Source: haiti-fzf 4.0.0
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "HAITI\-FZF" "1" "2025-02-02" "haiti\-fzf 3.0.0" "haiti\-fzf manual"
10
+ .TH "HAITI\-FZF" "1" "2026-01-01" "haiti\-fzf 4.0.0" "haiti\-fzf manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -86,7 +86,7 @@ Hash string to identify, read from STDIN if equal to "\-"
86
86
  \fBhaiti\-fzf\fP jtr d41d8cd98f00b204e9800998ecf8427e
87
87
  .SH "COPYRIGHT"
88
88
  .sp
89
- Copyright © 2020\-2023 Alexandre ZANNI (independent)
89
+ Copyright © 2020\-2026 Alexandre ZANNI (independent)
90
90
  .sp
91
91
  Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
92
92
  .sp
@@ -94,7 +94,7 @@ This software is distributed under the terms of the MIT License. You may freely
94
94
  redistribute copies of it, subject to the conditions of the license.
95
95
  .SH "VERSION"
96
96
  .sp
97
- 3.0.0
97
+ 4.0.0
98
98
  .SH "REPORTING BUGS"
99
99
  .sp
100
100
  Report bugs to \c
data/man/haiti-parsable.1 CHANGED
@@ -2,12 +2,12 @@
2
2
  .\" Title: haiti-parsable
3
3
  .\" Author: Alexandre ZANNI (@noraj)
4
4
  .\" Generator: Asciidoctor 2.0.23
5
- .\" Date: 2025-02-02
5
+ .\" Date: 2026-01-01
6
6
  .\" Manual: haiti-parsable manual
7
- .\" Source: haiti-parsable 3.0.0
7
+ .\" Source: haiti-parsable 4.0.0
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "HAITI\-PARSABLE" "1" "2025-02-02" "haiti\-parsable 3.0.0" "haiti\-parsable manual"
10
+ .TH "HAITI\-PARSABLE" "1" "2026-01-01" "haiti\-parsable 4.0.0" "haiti\-parsable manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -85,7 +85,7 @@ Hash string to identify, read from STDIN if equal to "\-"
85
85
  \fBhaiti\-parsable\fP jtr d41d8cd98f00b204e9800998ecf8427e
86
86
  .SH "COPYRIGHT"
87
87
  .sp
88
- Copyright © 2020\-2023 Alexandre ZANNI (independent)
88
+ Copyright © 2020\-2026 Alexandre ZANNI (independent)
89
89
  .sp
90
90
  Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
91
91
  .sp
@@ -93,7 +93,7 @@ This software is distributed under the terms of the MIT License. You may freely
93
93
  redistribute copies of it, subject to the conditions of the license.
94
94
  .SH "VERSION"
95
95
  .sp
96
- 3.0.0
96
+ 4.0.0
97
97
  .SH "REPORTING BUGS"
98
98
  .sp
99
99
  Report bugs to \c
data/man/haiti.1 CHANGED
@@ -2,12 +2,12 @@
2
2
  .\" Title: haiti
3
3
  .\" Author: Alexandre ZANNI (@noraj)
4
4
  .\" Generator: Asciidoctor 2.0.23
5
- .\" Date: 2025-02-02
5
+ .\" Date: 2026-01-01
6
6
  .\" Manual: haiti manual
7
- .\" Source: haiti 3.0.0
7
+ .\" Source: haiti 4.0.0
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "HAITI" "1" "2025-02-02" "haiti 3.0.0" "haiti manual"
10
+ .TH "HAITI" "1" "2026-01-01" "haiti 4.0.0" "haiti manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -126,7 +126,7 @@ b2sum /etc/os\-release | awk \*(Aq{print $1}\*(Aq | \fBhaiti\fP \-
126
126
  \fBhaiti\fP samples crc32
127
127
  .SH "COPYRIGHT"
128
128
  .sp
129
- Copyright © 2020\-2023 Alexandre ZANNI (independent)
129
+ Copyright © 2020\-2026 Alexandre ZANNI (independent)
130
130
  .sp
131
131
  Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
132
132
  .sp
@@ -134,7 +134,7 @@ This software is distributed under the terms of the MIT License. You may freely
134
134
  redistribute copies of it, subject to the conditions of the license.
135
135
  .SH "VERSION"
136
136
  .sp
137
- 3.0.0
137
+ 4.0.0
138
138
  .SH "REPORTING BUGS"
139
139
  .sp
140
140
  Report bugs to \c
data/man/hashcat-haiti.1 CHANGED
@@ -2,12 +2,12 @@
2
2
  .\" Title: hashcat-haiti
3
3
  .\" Author: Alexandre ZANNI (@noraj)
4
4
  .\" Generator: Asciidoctor 2.0.23
5
- .\" Date: 2025-02-02
5
+ .\" Date: 2026-01-01
6
6
  .\" Manual: hashcat-haiti manual
7
- .\" Source: hashcat-haiti 3.0.0
7
+ .\" Source: hashcat-haiti 4.0.0
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "HASHCAT\-HAITI" "1" "2025-02-02" "hashcat\-haiti 3.0.0" "hashcat\-haiti manual"
10
+ .TH "HASHCAT\-HAITI" "1" "2026-01-01" "hashcat\-haiti 4.0.0" "hashcat\-haiti manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -74,7 +74,7 @@ head \-1 /tmp/hash.txt | \fBhashcat\-haiti\fP \- \-\- /tmp/hash.txt
74
74
  \fBhashcat\-haiti\fP \-e d41d8cd98f00b204e9800998ecf8427e \-\- hashes.txt \-\-show
75
75
  .SH "COPYRIGHT"
76
76
  .sp
77
- Copyright © 2020\-2023 Alexandre ZANNI (independent)
77
+ Copyright © 2020\-2026 Alexandre ZANNI (independent)
78
78
  .sp
79
79
  Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
80
80
  .sp
@@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely
82
82
  redistribute copies of it, subject to the conditions of the license.
83
83
  .SH "VERSION"
84
84
  .sp
85
- 3.0.0
85
+ 4.0.0
86
86
  .SH "REPORTING BUGS"
87
87
  .sp
88
88
  Report bugs to \c
data/man/john-haiti.1 CHANGED
@@ -2,12 +2,12 @@
2
2
  .\" Title: john-haiti
3
3
  .\" Author: Alexandre ZANNI (@noraj)
4
4
  .\" Generator: Asciidoctor 2.0.23
5
- .\" Date: 2025-02-02
5
+ .\" Date: 2026-01-01
6
6
  .\" Manual: john-haiti manual
7
- .\" Source: john-haiti 3.0.0
7
+ .\" Source: john-haiti 4.0.0
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "JOHN\-HAITI" "1" "2025-02-02" "john\-haiti 3.0.0" "john\-haiti manual"
10
+ .TH "JOHN\-HAITI" "1" "2026-01-01" "john\-haiti 4.0.0" "john\-haiti manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -74,7 +74,7 @@ head \-1 /tmp/hash.txt | \fBjohn\-haiti\fP \- \-\- /tmp/hash.txt
74
74
  \fBjohn\-haiti\fP \-e d41d8cd98f00b204e9800998ecf8427e \-\- hashes.txt \-\-show
75
75
  .SH "COPYRIGHT"
76
76
  .sp
77
- Copyright © 2020\-2023 Alexandre ZANNI (independent)
77
+ Copyright © 2020\-2026 Alexandre ZANNI (independent)
78
78
  .sp
79
79
  Copyright © 2019\-2020 Alexandre ZANNI at Orange Cyberdefense
80
80
  .sp
@@ -82,7 +82,7 @@ This software is distributed under the terms of the MIT License. You may freely
82
82
  redistribute copies of it, subject to the conditions of the license.
83
83
  .SH "VERSION"
84
84
  .sp
85
- 3.0.0
85
+ 4.0.0
86
86
  .SH "REPORTING BUGS"
87
87
  .sp
88
88
  Report bugs to \c
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haiti-hash
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 4.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexandre ZANNI
8
8
  bindir: bin
9
9
  cert_chain: []
10
- date: 2025-02-02 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
11
11
  dependencies:
12
12
  - !ruby/object:Gem::Dependency
13
13
  name: docopt
@@ -86,17 +86,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: 3.1.0
89
+ version: 3.2.0
90
90
  - - "<"
91
91
  - !ruby/object:Gem::Version
92
- version: '4.0'
92
+ version: '5.0'
93
93
  required_rubygems_version: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - ">="
96
96
  - !ruby/object:Gem::Version
97
97
  version: '0'
98
98
  requirements: []
99
- rubygems_version: 3.6.2
99
+ rubygems_version: 4.0.3
100
100
  specification_version: 4
101
101
  summary: HAsh IdenTifIer
102
102
  test_files: []