Merge pull request #50 from nikaiw/master

Fix leading zero on DPAPI MK GUID

Author: skelsec

pypykatz/commons/win_datatypes.py

@@ -206,11 +206,11 @@ def __init__(self, reader):
 		self.Data3 = WORD(reader).value
 		self.Data4 = reader.read(8)
 		self.value = '-'.join([
-			hex(self.Data1)[2:], 
-			hex(self.Data2)[2:], 
-			hex(self.Data3)[2:], 
-			hex(int.from_bytes(self.Data4[:2], byteorder = 'big', signed = False))[2:],
-			hex(int.from_bytes(self.Data4[2:], byteorder = 'big', signed = False))[2:]
+			hex(self.Data1)[2:].zfill(8), 
+			hex(self.Data2)[2:].zfill(4), 
+			hex(self.Data3)[2:].zfill(4), 
+			hex(int.from_bytes(self.Data4[:2], byteorder = 'big', signed = False))[2:].zfill(4),
+			hex(int.from_bytes(self.Data4[2:], byteorder = 'big', signed = False))[2:].zfill(12)
 		])
 
 class PLIST_ENTRY(POINTER):
@@ -222,4 +222,4 @@ def __init__(self, reader):
 		self.location = reader.tell()
 		self.Flink = PLIST_ENTRY(reader)
 		self.Blink = PLIST_ENTRY(reader)
-		
+