arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00
Code Issues Releases Wiki Activity

UTF8-to-UTF16: Replaced naive UTF8 to UTF16 conversion with true conversion for RAR3, AES Crypt and MultiBit HD (scrypt)

Browse Source
This commit is contained in:
Jens Steube 2021-05-22 10:37:51 +02:00
parent d50beaa1a7
commit 0457016834
4 changed files with 26 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenCL/m12800-pure.cl
View File

@ -154,6 +154,7 @@ KERNEL_FQ void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
#undef uint_to_hex_lower8
// naive convert is fine here
make_utf16le_S (w1, w2, w3);
make_utf16le_S (w0, w0, w1);

78
OpenCL/m22700-pure.cl
View File

@ -304,41 +304,24 @@ KERNEL_FQ void m22700_init (KERN_ATTR_TMPS (scrypt_tmp_t))
if (gid >= gid_max) return;
// convert password to utf16be:
const u32 pw_len = pws[gid].pw_len;
const u32 pw_len_utf16be = pw_len * 2;
u32 w[128] = { 0 };
for (u32 i = 0, j = 0; i < 64; i += 4, j += 8)
hc_enc_t hc_enc;
hc_enc_init (&hc_enc);
const u32 w_len = hc_enc_next_global (&hc_enc, pws[gid].i, pws[gid].pw_len, 256, w, sizeof (w));
// utf16le to utf16be
for (int i = 0, j = 0; i < w_len; i += 4, j += 1)
{
u32 in[4];
in[0] = pws[gid].i[i + 0];
in[1] = pws[gid].i[i + 1];
in[2] = pws[gid].i[i + 2];
in[3] = pws[gid].i[i + 3];
u32 out0[4];
u32 out1[4];
make_utf16be_S (in, out0, out1);
w[j + 0] = out0[0];
w[j + 1] = out0[1];
w[j + 2] = out0[2];
w[j + 3] = out0[3];
w[j + 4] = out1[0];
w[j + 5] = out1[1];
w[j + 6] = out1[2];
w[j + 7] = out1[3];
w[j] = ((w[j] >> 8) & 0x00ff00ff)
| ((w[j] << 8) & 0xff00ff00);
}
sha256_hmac_ctx_t sha256_hmac_ctx;
sha256_hmac_init_swap (&sha256_hmac_ctx, w, pw_len_utf16be);
sha256_hmac_init_swap (&sha256_hmac_ctx, w, w_len);
u32 s0[4] = { 0 };
u32 s1[4] = { 0 };
@ -557,41 +540,24 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t))
* 2nd pbkdf2, creates B
*/
// convert password to utf16be:
const u32 pw_len = pws[gid].pw_len;
const u32 pw_len_utf16be = pw_len * 2;
u32 w[128] = { 0 };
for (u32 i = 0, j = 0; i < 64; i += 4, j += 8)
hc_enc_t hc_enc;
hc_enc_init (&hc_enc);
const u32 w_len = hc_enc_next_global (&hc_enc, pws[gid].i, pws[gid].pw_len, 256, w, sizeof (w));
// utf16le to utf16be
for (int i = 0, j = 0; i < w_len; i += 4, j += 1)
{
u32 in[4];
in[0] = pws[gid].i[i + 0];
in[1] = pws[gid].i[i + 1];
in[2] = pws[gid].i[i + 2];
in[3] = pws[gid].i[i + 3];
u32 out0[4];
u32 out1[4];
make_utf16be_S (in, out0, out1);
w[j + 0] = out0[0];
w[j + 1] = out0[1];
w[j + 2] = out0[2];
w[j + 3] = out0[3];
w[j + 4] = out1[0];
w[j + 5] = out1[1];
w[j + 6] = out1[2];
w[j + 7] = out1[3];
w[j] = ((w[j] >> 8) & 0x00ff00ff)
| ((w[j] << 8) & 0xff00ff00);
}
sha256_hmac_ctx_t ctx;
sha256_hmac_init_swap (&ctx, w, pw_len_utf16be);
sha256_hmac_init_swap (&ctx, w, w_len);
u32 w0[4];
u32 w1[4];

3
docs/changes.txt
View File

@ -16,7 +16,8 @@
- CUDA Backend: Do not warn about missing CUDA SDK installation if --stdout is used
- Performance Monitor: Add -S as a user suggestion to improve cracking performance in specific attack configurations
- Status Screen: Show currently running kernel type (pure, optimized) and generator type (host, device)
- RAR3 Plugins: Replaced naive with true UTF8 to UTF16 conversion in optimized and pure kernels
- UTF8-to-UTF16: Replaced naive UTF8 to UTF16 conversion with true conversion for RAR3, AES Crypt and MultiBit HD (scrypt)
- AES Crypt Plugin: Reduced max password length from 256 to 128 which improved performance by 22%
##
## Technical

3
src/modules/module_22700.c
View File

@ -21,8 +21,7 @@ static const u32 HASH_CATEGORY = HASH_CATEGORY_PASSWORD_MANAGER;
static const char *HASH_NAME = "MultiBit HD (scrypt)";
static const u64 KERN_TYPE = 22700;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE;
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_UTF16BE
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_MP_MULTI_DISABLE
| OPTS_TYPE_NATIVE_THREADS
| OPTS_TYPE_LOOP_PREPARE