updating to new construct syntax

liulongxiao · Mar 18, 2018 · 1046838 · 1046838
1 parent cf7502b
commit 1046838
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Windows/lazagne/config/DPAPI/structures.py b/Windows/lazagne/config/DPAPI/structures.py
@@ -8,6 +8,7 @@
 """
 
 from construct import *
+import construct
 import datetime
 import struct
 import crypto
@@ -121,12 +122,12 @@ def _decode(self, obj, context, path):
 
 UNICODE_STRING = Struct(
 	'length' 	/ Int32ul,
-	'data'		/ String(this.length, encoding='UTF_16_LE'),
+	'data'		/ PaddedString(this.length, encoding='UTF_16_LE'),
 )
 
 UNICODE_STRING_STRIP = Struct(
 	'length' 	/ Int32ul,
-	'data' 		/ UnicodeRstripZero(String(this.length, encoding='UTF_16_LE'))
+	'data' 		/ UnicodeRstripZero(PaddedString(this.length, encoding='UTF_16_LE'))
 )
 
 SIZED_DATA = Struct(
@@ -173,7 +174,7 @@ def _decode(self, obj, context, path):
 MKFILE = Struct(
 	'version' 			/ Int32ul,
 	Padding(8),
-	'guid' 				/ String(72, encoding='UTF-16'),
+	'guid' 				/ PaddedString(72, encoding='UTF-16'),
 	Padding(8),
 	'policy' 			/ Int32ul, 							# define if sha-1 or md4 is used
 	'masterkeyLen' 		/ Int64ul,