Added py3 and py2 compatibility + many bugfix

tools/MultiRelay/creddump/lsadump.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with creddump.  If not, see <http://www.gnu.org/licenses/>.
 
+# pylint: disable=invalid-name,missing-docstring
+
 """
 @author:       Brendan Dolan-Gavitt
 @license:      GNU General Public License 2.0 or later
@@ -27,28 +29,40 @@ from framework.win32.lsasecrets import get_file_secrets
 # Hex dump code from
 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/142812
 
-FILTER=''.join([(len(repr(chr(x)))==3) and chr(x) or '.' for x in range(256)])
+FILTER = ''.join(32 <= i < 127 and chr(i) or '.' for i in range(256))
+
+
+def showUsage():
+    print("usage: %s <system hive> <security hive> <Vista/7>" % sys.argv[0])
+    print("\nExample (Windows Vista/7):")
+    print("%s /path/to/System32/config/SYSTEM /path/to/System32/config/SECURITY true" % sys.argv[0])
+    print("\nExample (Windows XP):")
+    print("%s /path/to/System32/SYSTEM /path/to/System32/config/SECURITY false" % sys.argv[0])
+
 
 def dump(src, length=8):
-    N=0; result=''
+    N = 0
+    result = ''
     while src:
-       s,src = src[:length],src[length:]
-       hexa = ' '.join(["%02X"%ord(x) for x in s])
-       s = s.translate(FILTER)
-       result += "%04X   %-*s   %s\n" % (N, length*3, hexa, s)
-       N+=length
+        s, src = src[:length], src[length:]
+        hexa = ' '.join(["%02X" % x for x in s])
+        s = ''.join(FILTER[b] for b in s)
+        result += "%04X   %-*s   %s\n" % (N, length * 3, hexa, s)
+        N += length
     return result
 
-if len(sys.argv) < 3:
-    print "usage: %s Bootkey <security hive>" % sys.argv[0]
-    sys.exit(1)
 
-secrets = get_file_secrets(sys.argv[1].decode("hex"), sys.argv[2])
+if len(sys.argv) < 4 or sys.argv[3].lower() not in ["true", "false"]:
+    showUsage()
+    sys.exit(1)
+else:
+    vista = sys.argv[3].lower() == "true"
+
+secrets = get_file_secrets(sys.argv[1], sys.argv[2], vista)
 if not secrets:
-    print "Unable to read LSA secrets. Perhaps you provided invalid hive files?"
+    print("Unable to read LSA secrets. Perhaps you provided invalid hive files?")
     sys.exit(1)
 
 for k in secrets:
-    print k
-    print dump(secrets[k], length=16)
-
+    print(k.decode())
+    print(dump(secrets[k], length=16))