From a183b5132b29879777af97f7e8e245613b632e28 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sun, 10 Feb 2019 09:40:52 +0100 Subject: [PATCH] Fix for -m 1100 --- src/modules/module_01100.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/modules/module_01100.c b/src/modules/module_01100.c index ceefbd0e1..5928a5352 100644 --- a/src/modules/module_01100.c +++ b/src/modules/module_01100.c @@ -135,9 +135,25 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE out_len += 1; - memcpy (out_buf + out_len, salt->salt_buf, salt->salt_len); + const u8 *ptr = (const u8 *) salt->salt_buf; - out_len += salt->salt_len; + if (hashconfig->opts_type & OPTS_TYPE_ST_UTF16LE) + { + for (u32 i = 0; i < salt->salt_len; i += 2) + { + out_buf[out_len] = ptr[i]; + + out_len++; + } + + out_buf[out_len] = 0; + } + else + { + memcpy (out_buf + out_len, salt->salt_buf, salt->salt_len); + + out_len += salt->salt_len; + } return out_len; }