Skip to content

correct définition of attribute in module construct #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

correct définition of attribute in module construct #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6380612
modification de l'attribut ULInt32 car pas définis de la même facon d…
huyusukesan Oct 23, 2016
9e1afd9
modification de l'attribut Field car pas définis de la même facon dan…
huyusukesan Oct 23, 2016
c3e4cfe
Revert "modification de l'attribut Field car pas définis de la même f…
huyusukesan Oct 23, 2016
62240b4
modification des attributs ULInt.. car pas définis de la même facon …
huyusukesan Oct 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions FrancescoPicasso/mimikatz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,18 @@ class LsaDecryptor():
MSSK_TAG = 0x4d53534b

HARD_KEY = construct.Struct('KIWI_HARD_KEY',
construct.ULInt32('cbSecret'),
construct.Int32ul('cbSecret'),
construct.Field('data', lambda ctx: ctx.cbSecret))

# Modified to include HARD_KEY size.
BCRYPT_KEY = construct.Struct('KIWI_BCRYPT_KEY',
construct.ULInt32('size'),
construct.ULInt32('tag'), # 'MSSK'.
construct.ULInt32('type'),
construct.ULInt32('unk0'),
construct.ULInt32('unk1'),
construct.ULInt32('unk2'),
construct.ULInt32('cbSecret'))
construct.Int32ul('size'),
construct.Int32ul('tag'), # 'MSSK'.
construct.Int32ul('type'),
construct.Int32ul('unk0'),
construct.Int32ul('unk1'),
construct.Int32ul('unk2'),
construct.Int32ul('cbSecret'))

def __init__(self):
self.iv = ''
Expand Down Expand Up @@ -225,7 +225,7 @@ def get_key(self, pos, key_offset):
if data:
kbk = self.BCRYPT_KEY.parse(data)
if kbk.tag == self.MSSK_TAG:
adjust = construct.ULInt32('').sizeof()
adjust = construct.Int32ul('').sizeof()
size = kbk.cbSecret + adjust
ptr_key = ptr_key + self.BCRYPT_KEY.sizeof() - adjust
data = self.get_data(ptr_key, size)
Expand Down Expand Up @@ -311,11 +311,11 @@ class LsaDecryptor_Vista_x86(LsaDecryptor_x86):
PTR_DES_KEY_OFFSET = -70;

BCRYPT_HANDLE_KEY = construct.Struct('KIWI_BCRYPT_HANDLE_KEY',
construct.ULInt32('size'),
construct.ULInt32('tag'), # Tag 'UUUR', 0x55555552.
construct.ULInt32('ptr_void_algorithm'),
construct.ULInt32('ptr_kiwi_bcrypt_key'),
construct.ULInt32('ptr_unknown'))
construct.Int32ul('size'),
construct.Int32ul('tag'), # Tag 'UUUR', 0x55555552.
construct.Int32ul('ptr_void_algorithm'),
construct.Int32ul('ptr_kiwi_bcrypt_key'),
construct.Int32ul('ptr_unknown'))

def __init__(self, lsass_task):
LsaDecryptor_x86.__init__(self, lsass_task)
Expand All @@ -330,11 +330,11 @@ class LsaDecryptor_Win7_x86(LsaDecryptor_x86):
PTR_DES_KEY_OFFSET = -70;

BCRYPT_HANDLE_KEY = construct.Struct('KIWI_BCRYPT_HANDLE_KEY',
construct.ULInt32('size'),
construct.ULInt32('tag'), # Tag 'UUUR', 0x55555552.
construct.ULInt32('ptr_void_algorithm'),
construct.ULInt32('ptr_kiwi_bcrypt_key'),
construct.ULInt32('ptr_unknown'))
construct.Int32ul('size'),
construct.Int32ul('tag'), # Tag 'UUUR', 0x55555552.
construct.Int32ul('ptr_void_algorithm'),
construct.Int32ul('ptr_kiwi_bcrypt_key'),
construct.Int32ul('ptr_unknown'))

def __init__(self, lsass_task):
LsaDecryptor_x86.__init__(self, lsass_task)
Expand All @@ -348,11 +348,11 @@ class LsaDecryptor_Vista_x64(LsaDecryptor_x64):
PTR_DES_KEY_OFFSET = -69;

BCRYPT_HANDLE_KEY = construct.Struct('KIWI_BCRYPT_HANDLE_KEY',
construct.ULInt32('size'),
construct.ULInt32('tag'), # Tag 'UUUR', 0x55555552.
construct.ULInt64('ptr_void_algorithm'),
construct.ULInt64('ptr_kiwi_bcrypt_key'),
construct.ULInt64('ptr_unknown'))
construct.Int32ul('size'),
construct.Int32ul('tag'), # Tag 'UUUR', 0x55555552.
construct.Int64ul('ptr_void_algorithm'),
construct.Int64ul('ptr_kiwi_bcrypt_key'),
construct.Int64ul('ptr_unknown'))

def __init__(self, lsass_task):
LsaDecryptor_x64.__init__(self, lsass_task)
Expand All @@ -367,11 +367,11 @@ class LsaDecryptor_Win7_x64(LsaDecryptor_x64):
PTR_DES_KEY_OFFSET = -61;

BCRYPT_HANDLE_KEY = construct.Struct('KIWI_BCRYPT_HANDLE_KEY',
construct.ULInt32('size'),
construct.ULInt32('tag'), # Tag 'UUUR', 0x55555552.
construct.ULInt64('ptr_void_algorithm'),
construct.ULInt64('ptr_kiwi_bcrypt_key'),
construct.ULInt64('ptr_unknown'))
construct.Int32ul('size'),
construct.Int32ul('tag'), # Tag 'UUUR', 0x55555552.
construct.Int64ul('ptr_void_algorithm'),
construct.Int64ul('ptr_kiwi_bcrypt_key'),
construct.Int64ul('ptr_unknown'))

def __init__(self, lsass_task):
LsaDecryptor_x64.__init__(self, lsass_task)
Expand Down Expand Up @@ -474,21 +474,21 @@ class Wdigest_x86(Wdigest, Mimikatz_x86):
"""TODO: add description."""

WDIGEST_LIST_ENTRY = construct.Struct('WdigestListEntry',
construct.ULInt32('previous'),
construct.ULInt32('next'),
construct.ULInt32('usage_count'),
construct.ULInt32('this_entry'),
construct.ULInt64('luid'),
construct.ULInt64('flag'),
construct.ULInt16('user_len'),
construct.ULInt16('user_max_len'),
construct.ULInt32('user_string_ptr'),
construct.ULInt16('domain_len'),
construct.ULInt16('domain_max_len'),
construct.ULInt32('domain_string_ptr'),
construct.ULInt16('password_len'),
construct.ULInt16('password_max_len'),
construct.ULInt32('password_encrypted_ptr'))
construct.Int32ul('previous'),
construct.Int32ul('next'),
construct.Int32ul('usage_count'),
construct.Int32ul('this_entry'),
construct.Int64ul('luid'),
construct.Int64ul('flag'),
construct.Int16ul('user_len'),
construct.Int16ul('user_max_len'),
construct.Int32ul('user_string_ptr'),
construct.Int16ul('domain_len'),
construct.Int16ul('domain_max_len'),
construct.Int32ul('domain_string_ptr'),
construct.Int16ul('password_len'),
construct.Int16ul('password_max_len'),
construct.Int32ul('password_encrypted_ptr'))

def __init__(self, lsass_task, credentials_obj):
Mimikatz_x86.__init__(self, lsass_task)
Expand All @@ -499,25 +499,25 @@ class Wdigest_x64(Wdigest, Mimikatz_x64):
"""TODO: add description."""

WDIGEST_LIST_ENTRY = construct.Struct('WdigestListEntry',
construct.ULInt64('previous'),
construct.ULInt64('next'),
construct.ULInt32('usage_count'),
construct.ULInt32('align1'),
construct.ULInt64('this_entry'),
construct.ULInt64('luid'),
construct.ULInt64('flag'),
construct.ULInt16('user_len'),
construct.ULInt16('user_max_len'),
construct.ULInt32('align2'),
construct.ULInt64('user_string_ptr'),
construct.ULInt16('domain_len'),
construct.ULInt16('domain_max_len'),
construct.ULInt32('align3'),
construct.ULInt64('domain_string_ptr'),
construct.ULInt16('password_len'),
construct.ULInt16('password_max_len'),
construct.ULInt32('align4'),
construct.ULInt64('password_encrypted_ptr'))
construct.Int64ul('previous'),
construct.Int64ul('next'),
construct.Int32ul('usage_count'),
construct.Int32ul('align1'),
construct.Int64ul('this_entry'),
construct.Int64ul('luid'),
construct.Int64ul('flag'),
construct.Int16ul('user_len'),
construct.Int16ul('user_max_len'),
construct.Int32ul('align2'),
construct.Int64ul('user_string_ptr'),
construct.Int16ul('domain_len'),
construct.Int16ul('domain_max_len'),
construct.Int32ul('align3'),
construct.Int64ul('domain_string_ptr'),
construct.Int16ul('password_len'),
construct.Int16ul('password_max_len'),
construct.Int32ul('align4'),
construct.Int64ul('password_encrypted_ptr'))

def __init__(self, lsass_task, credentials_obj):
Mimikatz_x64.__init__(self, lsass_task)
Expand Down