update-hashes.py now understand new format

Author: jessevz

ci/files/update-hashes.py

@@ -3,6 +3,7 @@
 import json
 import sys
 import os
+import re
 
 
 class HashType:
@@ -13,7 +14,7 @@ def __init__(self, hashType, description, salted, slowHash):
         self.slowHash = slowHash
 
 
-url = "https://raw.githubusercontent.com/hashcat/hashcat/refs/tags/v7.0.0/docs/hashcat-example_hashes.md"
+url = "https://raw.githubusercontent.com/hashcat/hashcat/refs/tags/v7.1.1/docs/hashcat-example-hashes.md"
 binary = sys.argv[1]  # The hashcat binary is the first argument
 if not os.path.isfile(binary):
     print("usage: python3 update-hashes.py <hashcat binary>")
@@ -38,8 +39,11 @@ def __init__(self, hashType, description, salted, slowHash):
 
 for line in lines[4:]:  # skip first 4 header lines
     splitted = line.split("|")
-    hashType = splitted[1].strip().strip("`")
-    description = splitted[2].strip().strip("`")
+    if len(splitted) == 1:  # table is finished
+        break
+    hashType = re.search(r"\[`?(\d+)`?\]", splitted[1]).group(1)
+    description = splitted[2].strip().split("`")[1]
+    print(description)
     r = requests.get(url + hashType, headers=headers)
     if (r.status_code != 200):
         args[2] = hashType
@@ -54,8 +58,8 @@ def __init__(self, hashType, description, salted, slowHash):
 print('if (!isset($PRESENT["PLACEHOLDER"])){')
 print("  $hashTypes = [")
 for hashType in new_hashtypes:
-    print(f'        new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),')
-print("   ]")
+    print(f'    new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),')
+print("   ];")
 print('  foreach ($hashtypes as $hashtype) {')
 print('    $check = Factory::getHashTypeFactory()->get($hashtype->getId());')
 print('    if ($check === null) {')
@@ -68,3 +72,6 @@ def __init__(self, hashType, description, salted, slowHash):
 print("Add the following to the install script:")
 for hashType in new_hashtypes:
     print(f"  ({hashType.hashType},    '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),")
+
+
+print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!")