Added support for callables; added base64 and hex string prototypes

hashid.py

@@ -21,6 +21,8 @@
 import os
 import re
 import sys
+import base64
+import binascii
 import argparse
 from collections import namedtuple
 
@@ -33,6 +35,23 @@
 Prototype = namedtuple('Prototype', ['regex', 'modes'])
 HashInfo = namedtuple('HashInfo', ['name', 'hashcat', 'john', 'extended'])
 
+
+def is_base64(data):
+    try:
+        base64.b64decode(data)
+        return True
+    except (TypeError, binascii.Error):
+        return False
+
+
+def is_hexstring(data):
+    try:
+        binascii.unhexlify(data)
+        return True
+    except binascii.Error:
+        return False
+
+
 prototypes = [
     Prototype(
         regex=re.compile(r'^[a-f0-9]{4}$', re.IGNORECASE),
@@ -740,7 +759,17 @@
     Prototype(
         regex=re.compile(r'^\$pdf\$[24]\*[34]\*128\*[0-9-]{1,5}\*1\*(16|32)\*[a-f0-9]{32,64}\*32\*[a-f0-9]{64}\*(8|16|32)\*[a-f0-9]{16,64}$', re.IGNORECASE),
         modes=[
-            HashInfo(name='PDF 1.4 - 1.6 (Acrobat 5 - 8)', hashcat=10500, john='pdf', extended=False)])
+            HashInfo(name='PDF 1.4 - 1.6 (Acrobat 5 - 8)', hashcat=10500, john='pdf', extended=False)]),
+    Prototype(
+        regex=re.compile(r'^([a-fA-F0-9]{2})+$', re.IGNORECASE),
+        modes=[
+            HashInfo(name='Hex string', hashcat=None, john=None, extended=False),
+        ]),
+    Prototype(
+        regex=re.compile(r'^([a-zA-Z0-9+/]{4})*([a-zA-Z0-9+/]{4}|[a-zA-Z0-9+/]{2}==|[a-zA-Z0-9+/]{3}=)$'),
+        modes=[
+            HashInfo(name='Base64', hashcat=None, john=None, extended=False)
+        ]),
 ]