Merge pull request #72 from amadejpapez/kerberos

More Kerberos hash types need to be separated into a salt and without a salt
HashPals · Mar 20, 2021 · 3d8378e · 3d8378e
2 parents aa09931 + e291843
commit 3d8378e
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/name_that_hash/hashes.py b/name_that_hash/hashes.py
@@ -1618,7 +1618,7 @@ class HashInfo:
         ],
     ),
     Prototype(
-        regex=re.compile(r"^\$krb5pa\$17\$[^$]{1,512}\$[^$]{1,512}\$\$[a-f0-9]{104,112}$", re.IGNORECASE),
+        regex=re.compile(r"^\$krb5pa\$17\$[^$]{1,512}\$[^$]{1,512}\$[^$]{0,512}\$[a-f0-9]{104,112}$", re.IGNORECASE),
         modes=[
             HashInfo(
                 name="Kerberos 5, etype 17, Pre-Auth (with salt)",
@@ -1630,12 +1630,24 @@ class HashInfo:
         ],
     ),
     Prototype(
-        regex=re.compile(r"^\$krb5pa\$18\$[^$]{1,512}\$[^$]{1,512}\$\$?[^$]{1,512}?\$?[a-f0-9]{104,112}$", re.IGNORECASE),
+        regex=re.compile(r"^\$krb5pa\$18\$[^$]{1,512}\$[^$]{1,512}\$[^$]{0,512}\$[a-f0-9]{104,112}$", re.IGNORECASE),
+        modes=[
+            HashInfo(
+                name="Kerberos 5, etype 18, Pre-Auth (with salt)",
+                hashcat=None,
+                john="krb5pa-sha1",
+                extended=False,
+                description="Used for Windows Active Directory"
+                )
+        ],
+    ),
+    Prototype(
+        regex=re.compile(r"^\$krb5pa\$18\$[^$]{1,512}\$[^$]{1,512}\$[a-f0-9]{104,112}$", re.IGNORECASE),
         modes=[
             HashInfo(
                 name="Kerberos 5, etype 18, Pre-Auth",
                 hashcat=19900,
-                john="krb5pa-sha1",
+                john=None,
                 extended=False,
                 description="Used for Windows Active Directory"
                 )