haiti-hash 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b5955de5a61d1e1ab59d2d6e09ca4c4be5f55b945cbf5cf587a8cfa3667d51
-  data.tar.gz: 033f766ccc4d8d1795176e55994472ce965bb4360382f8f3decd93d8044a8c43
+  metadata.gz: 9d865517b196759e4ebd0d89b9364031ac827763da623ba368aa92c3bc9fa086
+  data.tar.gz: 70848b3d1db34cf8da9ca060ad0e20591d716d922543cd85d9ae230f29642bfb
 SHA512:
-  metadata.gz: c96dd859d8a3d256891002bdfce1903978da263bc1405e18f07b4fc9ee42c2c3163cdc3783593d20e2a5f5a5798b79c425341a0ffd99910d75a5217c6e3a08ee
-  data.tar.gz: a1346e64b98974aa355efe105f1225d0f993f3c515ff5c65ab3e404ce24b7d0f39b98c0b32d322ca2e76240c0c460db64feace71714c8ad12c3d982737a574d4
+  metadata.gz: 8e0d34ac6c840a76281d4ac68a5e751d83633b4b8db5cdec17a092a502596983d8e8f3dca805dadb4b96c72d2d17a38b41c090e76b82db0a0996719b9113b802
+  data.tar.gz: 10c44b5d2331160fe9625c7cb88740973010eaa08811ebd5c7de6212657cb45a0fc3d3dbf94bc8162c33fb9b827e636cd7b011bed92efdb08484a92dca3b3617

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2022 Alexandre ZANNI (independent)
+Copyright (c) 2020-2023 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/bin/haiti-fzf

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    haiti-fzf hc [options] <hash>
+    haiti-fzf jtr [options] <hash>
+    haiti-fzf -h | --help
+    haiti-fzf --version
+
+  #{Paint['Commands:', '#00FFFF']}
+    hc             Select a Hashcat reference with fzf from one of the matching hash types
+    jtr            Select a John the Ripper reference with fzf from one of the matching hash types
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    haiti-fzf hc -e d41d8cd98f00b204e9800998ecf8427e
+    haiti-fzf jtr d41d8cd98f00b204e9800998ecf8427e
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("haiti-parsable hc #{ext} #{args['<hash>']} | fzf | cut -d '|' -f 2") if args['hc']
+    system("haiti-parsable jtr #{ext} #{args['<hash>']} | fzf | cut -d '|' -f 2") if args['jtr']
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/haiti-parsable

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    haiti-parsable hc [options] <hash>
+    haiti-parsable jtr [options] <hash>
+    haiti-parsable -h | --help
+    haiti-parsable --version
+
+  #{Paint['Commands:', '#00FFFF']}
+    hc             Display hash types matching that have a Hashcat reference
+    jtr            Display hash types matching that have a John the Ripper reference
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    haiti-parsable hc -e d41d8cd98f00b204e9800998ecf8427e
+    haiti-parsable jtr d41d8cd98f00b204e9800998ecf8427e
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+def manage_options(args, types)
+  types.each do |type|
+    next if type.extended && !args['--extended']
+
+    puts "#{type.name} |#{type.hashcat}" if args['hc'] && !type.hashcat.nil?
+    puts "#{type.name} |#{type.john}" if args['jtr'] && !type.john.nil?
+  end
+end
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    hi = HashIdentifier.new(args['<hash>'])
+    if hi.type.empty?
+      puts 'Unknown hash type'
+      exit(0)
+    end
+    manage_options(args, hi.type)
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/hashcat-haiti

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    hashcat-haiti [options] <hash> -- <hashcat_options>...
+    hashcat-haiti -h | --help
+    hashcat-haiti --version
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    hashcat-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt /usr/share/wordlists/passwords/rockyou.txt -r /usr/share/doc/hashcat/rules/best64.rule
+    hashcat-haiti d41d8cd98f00b204e9800998ecf8427e -- hashes.txt -a 3
+    head -1 /tmp/hash.txt | hashcat-haiti - -- /tmp/hash.txt
+    hashcat-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --show
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("hashcat -m $(haiti-fzf hc #{ext} #{args['<hash>']}) #{args['<hashcat_options>'].join(' ')}")
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/bin/john-haiti

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Ruby internal
+# Project internal
+require 'haiti'
+# External
+require 'docopt'
+require 'paint'
+
+doc = <<~DOCOPT
+  #{Paint['HAITI (HAsh IdenTifIer)', '#FF69B4']} v#{Paint[HashIdentifier::VERSION, :bold]}
+
+  #{Paint['Usage:', '#00FFFF']}
+    john-haiti [options] <hash> -- <john_options>...
+    john-haiti -h | --help
+    john-haiti --version
+
+  #{Paint['Parameters:', '#00FFFF']}
+    <hash>          Hash string to identify, read from STDIN if equal to "-"
+
+  #{Paint['Options:', '#00FFFF']}
+    -e, --extended  List all possible hash algorithms including ones using salt
+    --debug         Display arguments
+    -h, --help      Show this screen
+    --version       Show version
+
+  #{Paint['Examples:', '#00FFFF']}
+    john-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --wordlist=/usr/share/wordlists/passwords/rockyou.txt
+    john-haiti 1f474c6dadb3cb2370f6cb88d4576ede0db9ff43 -- hashes.txt --rules=NT --fork=3
+    head -1 /tmp/hash.txt | john-haiti - -- /tmp/hash.txt
+    john-haiti -e d41d8cd98f00b204e9800998ecf8427e -- hashes.txt --show
+
+  #{Paint['Project:', '#00FFFF']}
+    #{Paint['author', :underline]} (https://pwn.by/noraj / https://twitter.com/noraj_rawsec)
+    #{Paint['source', :underline]} (https://github.com/noraj/haiti)
+    #{Paint['documentation', :underline]} (https://noraj.github.io/haiti)
+DOCOPT
+
+begin
+  args = Docopt.docopt(doc, version: HashIdentifier::VERSION)
+  puts args if args['--debug']
+  # use case 1, using the tool
+  if args['<hash>']
+    args['<hash>'] = $stdin.read.chomp if args['<hash>'] == '-'
+    ext = args['--extended'] ? '-e' : ''
+    system("john --format=$(haiti-fzf jtr #{ext} #{args['<hash>']}) #{args['<john_options>'].join(' ')}")
+  end
+  # use case 2, help: already handled by docopt
+  # use case 3, version: already handled by docopt
+rescue Docopt::Exit => e
+  puts e.message
+end

data/data/prototypes.json

@@ -717,7 +717,7 @@
 			},
 			{
 				"john": null,
-				"hashcat": 2810,
+				"hashcat": 2811,
 				"extended": false,
 				"name": "IPB 2.x (Invision Power Board)",
 				"samples": [
@@ -5913,13 +5913,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 +5927,28 @@
 		]
 	},
 	{
-		"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{1,3})?\\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"
 				]
 			}
 		]
 	},
 	{
-		"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 +5956,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 +5984,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{1,3})?\\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 +6098,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 +6106,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 +7170,35 @@
 				]
 			}
 		]
+	},
+	{
+		"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"
+				]
+			}
+		]
 	}
 ]

data/lib/haiti/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Version
-  VERSION = '2.0.0'
+class HashIdentifier
+  VERSION = '3.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')))