git pushMerge branch 'main' of github.com:HashPals/Name-That-Hash into main

Author: bee-san

README.md

@@ -1,7 +1,7 @@
 <p align="center">
 
 <img src="logo.gif">
-<p align="center">➡️ <a href="https://discord.gg/zYTM3rZM4T">Discord</a> | <a href="https://nth.skerritt.blog">Website</a> ⬅️</p>
+<p align="center">➡️ <a href="http://discord.skerritt.blog">Discord</a> | <a href="https://nth.skerritt.blog">Website</a> ⬅️</p>
 <p align="center">The Modern Hash Identification System<br>
 <code>pip3 install name-that-hash && nth</code>
   <br>

name_that_hash/check_hashes.py

@@ -24,8 +24,7 @@ def file_input(self, f):
             self.single_hash(line)
 
     def single_hash(self, chash: str):
-        if "base64" in self.kwargs:
-
+        if "base64" in self.kwargs and self.kwargs["base64"]:
             logger.trace("decoding as base64")
 
             try:

name_that_hash/hashes.py

@@ -1375,6 +1375,20 @@ class HashInfo:
             )
         ],
     ),
+    Prototype(
+        regex=re.compile(
+            r"\$krb5tgs\$23\$\*(.*)\*\$(.*)",
+            re.IGNORECASE,
+        ),
+        modes=[
+            HashInfo(
+                name=u"Kerberos 5 TGS-REP etype 23",
+                hashcat=13100,
+                john="krb5tgs",
+                extended=False,
+            ),
+        ],
+    ),
     Prototype(
         regex=re.compile(
             r"^\$oldoffice\$[01]\*[a-f0-9]{32}\*[a-f0-9]{32}\*[a-f0-9]{32}$",

poetry.lock

@@ -49,3 +49,8 @@ def test_file_input():
     result = runner.invoke(main, ["-f", "tests/mocks/hashes.txt", '-b64', '-g'])
     assert "SHA-1" in result.output
     assert "SHA-512" in result.output
+
+def test_file_input():
+    runner = CliRunner()
+    result = runner.invoke(main, ["-t", "$krb5tgs$23$*user$realm$test/spn*$63386d22d359fe42230300d56852c9eb$891ad31d09ab89c6b3b8c5e5de6c06a7f49fd559d7a9a3c32576c8fedf705376cea582ab5938f7fc8bc741acf05c5990741b36ef4311fe3562a41b70a4ec6ecba849905f2385bb3799d92499909658c7287c49160276bca0006c350b0db4fd387adc27c01e9e9ad0c20ed53a7e6356dee2452e35eca2a6a1d1432796fc5c19d068978df74d3d0baf35c77de12456bf1144b6a750d11f55805f5a16ece2975246e2d026dce997fba34ac8757312e9e4e6272de35e20d52fb668c5ed"])
+    assert "Kerberos" in result.output