haiti-hash 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2452aa7031d5357785f32a86f7fa53875f8ba9e1dc654f14b53f14ee53ee5194
-  data.tar.gz: 6ec09dadf5447f437d12b89f204dee3cc38d0779dbb5cfdad48296c0f949537f
+  metadata.gz: 482916c210a6e719f9399388f466ff3a394abeea38805aa6075113edcdb24320
+  data.tar.gz: 2ed345caa5a2491c2d6d1e2bd510abd06d7f53a59a46af07a25b08412ff9e4d5
 SHA512:
-  metadata.gz: 07770020da99ae8a187317a3d7db59becd25b1ec7a7c529a19a530ba766f05ab548060055b6ab12ae90ea4c2b39325485b35f887a5af98866873a83546c0ab26
-  data.tar.gz: 89763b9a81a234c690b08488e9134a03596f0d5ea91b06a0005dee92ca46ddb4e3f66800c37363f0b2be076ff000acd2aa084b49aa5935c69a6bd4ba775be19a
+  metadata.gz: 51d6ec610fdc96bdd94e84a4ba33eb037fc73c75e91ca329cb5ed9285e603d7899a0ea8c60d687fd6fd7c50c23129f1f193a464a4bfa548c63d8a0417456fa11
+  data.tar.gz: 3ae92a1ddef2d64ed8ee203ba0c592e0e727931e04f1d551ed30bc4824237e9b5496af3f11db98660019bdae5cc80210217f89b6bfc0d6224cb418a44346d961

data/data/commons.json

@@ -0,0 +1,29 @@
+[
+  "MD5",
+  "SHA-1",
+  "SHA-256",
+  "SHA-512",
+  "bcrypt",
+  "NTLM",
+  "NetNTLMv2",
+  "NetNTLMv1-VANILLA / NetNTLMv1+ESS",
+  "BLAKE2-512",
+  "SHA3-224",
+  "SHA3-256",
+  "SHA3-512",
+  "Keccak-256",
+  "Keccak-512",
+  "CRC-32B",
+  "CRC-32",
+  "CRC-16",
+  "CRC-64",
+  "GOST R 34.11-94",
+  "Apache MD5",
+  "MD5(APR)",
+  "md5apr1",
+  "Domain Cached Credentials",
+  "Domain Cached Credentials 2",
+  "LM",
+  "RIPEMD-160",
+  "scrypt"
+]

data/data/prototypes.json

@@ -713,7 +713,7 @@
             {
                 "john": null,
                 "hashcat": 1600,
-                "extended": true,
+                "extended": false,
                 "name": "md5apr1"
             }
         ]
@@ -1238,6 +1238,12 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "Skein-224"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-224"
             }
         ]
     },
@@ -1482,6 +1488,12 @@
                 "hashcat": null,
                 "extended": false,
                 "name": "PANAMA"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-256"
             }
         ]
     },
@@ -1665,6 +1677,12 @@
                 "hashcat": null,
                 "extended": true,
                 "name": "Skein-384"
+            },
+            {
+                "john": null,
+                "hashcat": null,
+                "extended": false,
+                "name": "BLAKE2-384"
             }
         ]
     },
@@ -1745,7 +1763,7 @@
                 "john": "raw-blake2",
                 "hashcat": 600,
                 "extended": false,
-                "name": "Blake2"
+                "name": "BLAKE2-512"
             },
             {
                 "john": "skein-512",
@@ -2055,7 +2073,95 @@
                 "john": "krb5pa-md5",
                 "hashcat": 7500,
                 "extended": false,
-                "name": "Kerberos 5 AS-REQ Pre-Auth"
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$23\\$\\*[^*]*\\*\\$[a-f0-9]{32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5tgs",
+                "hashcat": 13100,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$23\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": 18200,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 23"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$18\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 18"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5asrep\\$17\\$[^:]+:[a-f0-9]{32,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": "krb5asrep",
+                "hashcat": null,
+                "extended": false,
+                "name": "Kerberos 5 AS-REP etype 17"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$17\\$[^$]{1,512}\\$[^$]{1,512}\\$[^$]{1,4}?\\$?[a-f0-9]{1,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 19600,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5tgs\\$18\\$[^$]{1,512}\\$[^$]{1,512}\\$[^$]{1,4}?\\$?[a-f0-9]{1,32}\\$[a-f0-9]{64,40960}$",
+        "modes": [
+            {
+                "john": null,
+                "hashcat": 19700,
+                "extended": false,
+                "name": "Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5pa\\$17\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "modes": [
+            {
+                "john": "krb5pa-sha1",
+                "hashcat": 19800,
+                "extended": false,
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 17"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$krb5pa\\$18\\$[^$]{1,512}\\$[^$]{1,512}\\$[a-f0-9]{104,112}$",
+        "modes": [
+            {
+                "john": "krb5pa-sha1",
+                "hashcat": 19900,
+                "extended": false,
+                "name": "Kerberos 5 AS-REQ Pre-Auth etype 18"
             }
         ]
     },
@@ -2781,5 +2887,88 @@
                 "name": "PDF 1.4 - 1.6 (Acrobat 5 - 8)"
             }
         ]
+    },
+    {
+        "regex": "^\\$bitcoin\\$[0-9]{2,4}\\$[a-fA-F0-9$]{250,350}$",
+        "modes": [
+            {
+                "john": "bitcoin",
+                "hashcat": 11300,
+                "extended": false,
+                "name": "Bitcoin/Litecoin Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ethereum\\$[a-z0-9*]{150,1400}$",
+        "modes": [
+            {
+                "john": "ethereum-presale-opencl",
+                "hashcat": 16300,
+                "extended": false,
+                "name": "Ethereum Presale Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ethereum\\$[a-z0-9*]{150,250}$",
+        "modes": [
+            {
+                "john": "Ethereum Wallet",
+                "hashcat": 15600,
+                "extended": false,
+                "name": "ethereum-opencl"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$monero\\$(0)\\*[a-f0-9]{32,4096}$",
+        "modes": [
+            {
+                "john": "monero",
+                "hashcat": null,
+                "extended": false,
+                "name": "monero Wallet"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$ab\\$[0-9]{1}\\*[0-9]{1}\\*[0-9]{1,6}\\*[a-f0-9]{128}\\*[a-f0-9]{128}\\*[a-f0-9]{32}\\*[a-f0-9]{192}$",
+        "modes": [
+            {
+                "john": "AndroidBackup",
+                "hashcat": 18900,
+                "extended": false,
+                "name": "Android Backup"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$zip2\\$\\*[0-9]{1}\\*[0-9]{1}\\*[0-9]{1}\\*[a-f0-9]{16,32}\\*[a-f0-9]{1,6}\\*[a-f0-9]{1,6}\\*[a-f0-9]{0,16384}\\*[a-f0-9]{20}\\*\\$\/zip2\\$$",
+        "modes": [
+            {
+                "john": "ZIP",
+                "hashcat": 13600,
+                "extended": false,
+                "name": "WinZip"
+            }
+        ]
+    },
+    {
+        "regex": "^\\$itunes_backup\\$\\*[0-9]{1,2}\\*[a-f0-9]{80}\\*[0-9]{1,6}\\*[a-f0-9]{40}\\*[0-9]{0,10}\\*[a-f0-9]{0,40}$",
+        "modes": [
+            {
+                "john": "itunes-backup",
+                "hashcat": 14700,
+                "extended": false,
+                "name": "iTunes backup < 10.0"
+            },
+            {
+                "john": "itunes-backup",
+                "hashcat": 14800,
+                "extended": false,
+                "name": "iTunes backup >= 10.0"
+            }
+        ]
     }
 ]

data/lib/haiti.rb

@@ -11,6 +11,7 @@ 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')))
 
   # @return [String] the hash (as provided)
   # @example
@@ -26,6 +27,7 @@ class HashIdentifier
   def initialize(hash)
     @hash = hash
     @type = identify(hash)
+    sort_commons
   end
 
   private
@@ -46,4 +48,9 @@ class HashIdentifier
     end
     return res
   end
+
+  # Sort common hash types first
+  def sort_commons
+    @type.sort_by! { |e| COMMONS.include?(e.name) ? 0 : 1 }
+  end
 end

data/lib/haiti/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Version
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haiti-hash
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexandre ZANNI
@@ -161,6 +161,7 @@ files:
 - LICENSE.txt
 - bin/haiti
 - bin/haiti_console
+- data/commons.json
 - data/prototypes.json
 - lib/haiti.rb
 - lib/haiti/hash.rb