From 370a5524595175c3f1845b54148b535bc3aa4dda Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Sat, 27 Jul 2019 14:16:30 +0200 Subject: [PATCH 1/3] Added hash-mode: md5(sha1().md5()) --- OpenCL/m04420_a0-pure.cl | 360 +++++++++++++++++++++++++++++++++ OpenCL/m04420_a1-pure.cl | 354 ++++++++++++++++++++++++++++++++ OpenCL/m04420_a3-pure.cl | 380 +++++++++++++++++++++++++++++++++++ docs/changes.txt | 1 + docs/credits.txt | 1 + docs/readme.txt | 1 + src/modules/module_04420.c | 215 ++++++++++++++++++++ tools/test_modules/m04420.pm | 45 +++++ 8 files changed, 1357 insertions(+) create mode 100644 OpenCL/m04420_a0-pure.cl create mode 100644 OpenCL/m04420_a1-pure.cl create mode 100644 OpenCL/m04420_a3-pure.cl create mode 100644 src/modules/module_04420.c create mode 100644 tools/test_modules/m04420.pm diff --git a/OpenCL/m04420_a0-pure.cl b/OpenCL/m04420_a0-pure.cl new file mode 100644 index 000000000..6503d8781 --- /dev/null +++ b/OpenCL/m04420_a0-pure.cl @@ -0,0 +1,360 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +//#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_scalar.cl" +#include "inc_hash_md5.cl" +#include "inc_hash_sha1.cl" +#endif + +#if VECT_SIZE == 1 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i)]) +#elif VECT_SIZE == 2 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1]) +#elif VECT_SIZE == 4 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3]) +#elif VECT_SIZE == 8 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7]) +#elif VECT_SIZE == 16 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) +#endif + +KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * base + */ + + COPY_PW (pws[gid]); + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + /** + * loop + */ + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + { + pw_t tmp = PASTE_PW; + + tmp.pw_len = apply_rules (rules_buf[il_pos].cmds, tmp.i, tmp.pw_len); + + sha1_ctx_t ctx0; + + sha1_init (&ctx0); + + sha1_update_swap (&ctx0, s, salt_len); + + sha1_final (&ctx0); + + const u32 a0 = ctx0.h[0]; + const u32 b0 = ctx0.h[1]; + const u32 c0 = ctx0.h[2]; + const u32 d0 = ctx0.h[3]; + const u32 e0 = ctx0.h[4]; + + md5_ctx_t ctx1; + + md5_init (&ctx1); + + md5_update (&ctx1, tmp.i, tmp.pw_len); + + md5_final (&ctx1); + + const u32 a1 = hc_swap32 (ctx1.h[0]); + const u32 b1 = hc_swap32 (ctx1.h[1]); + const u32 c1 = hc_swap32 (ctx1.h[2]); + const u32 d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_t ctx; + + md5_init (&ctx); + + w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 40); + + w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 32); + + md5_final (&ctx); + + const u32 r0 = ctx.h[DGST_R0]; + const u32 r1 = ctx.h[DGST_R1]; + const u32 r2 = ctx.h[DGST_R2]; + const u32 r3 = ctx.h[DGST_R3]; + + COMPARE_M_SCALAR (r0, r1, r2, r3); + } +} + +KERNEL_FQ void m04420_sxx (KERN_ATTR_RULES ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * digest + */ + + const u32 search[4] = + { + digests_buf[digests_offset].digest_buf[DGST_R0], + digests_buf[digests_offset].digest_buf[DGST_R1], + digests_buf[digests_offset].digest_buf[DGST_R2], + digests_buf[digests_offset].digest_buf[DGST_R3] + }; + + /** + * base + */ + + COPY_PW (pws[gid]); + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + /** + * loop + */ + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + { + pw_t tmp = PASTE_PW; + + tmp.pw_len = apply_rules (rules_buf[il_pos].cmds, tmp.i, tmp.pw_len); + + sha1_ctx_t ctx0; + + sha1_init (&ctx0); + + sha1_update_swap (&ctx0, s, salt_len); + + sha1_final (&ctx0); + + const u32 a0 = ctx0.h[0]; + const u32 b0 = ctx0.h[1]; + const u32 c0 = ctx0.h[2]; + const u32 d0 = ctx0.h[3]; + const u32 e0 = ctx0.h[4]; + + md5_ctx_t ctx1; + + md5_init (&ctx1); + + md5_update (&ctx1, tmp.i, tmp.pw_len); + + md5_final (&ctx1); + + const u32 a1 = hc_swap32 (ctx1.h[0]); + const u32 b1 = hc_swap32 (ctx1.h[1]); + const u32 c1 = hc_swap32 (ctx1.h[2]); + const u32 d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_t ctx; + + md5_init (&ctx); + + w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 40); + + w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 32); + + md5_final (&ctx); + + const u32 r0 = ctx.h[DGST_R0]; + const u32 r1 = ctx.h[DGST_R1]; + const u32 r2 = ctx.h[DGST_R2]; + const u32 r3 = ctx.h[DGST_R3]; + + COMPARE_S_SCALAR (r0, r1, r2, r3); + } +} diff --git a/OpenCL/m04420_a1-pure.cl b/OpenCL/m04420_a1-pure.cl new file mode 100644 index 000000000..05e845560 --- /dev/null +++ b/OpenCL/m04420_a1-pure.cl @@ -0,0 +1,354 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +//#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_scalar.cl" +#include "inc_hash_md5.cl" +#include "inc_hash_sha1.cl" +#endif + +#if VECT_SIZE == 1 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i)]) +#elif VECT_SIZE == 2 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1]) +#elif VECT_SIZE == 4 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3]) +#elif VECT_SIZE == 8 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7]) +#elif VECT_SIZE == 16 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) +#endif + +KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * base + */ + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + md5_ctx_t ctx11; + + md5_init (&ctx11); + + md5_update_global (&ctx11, pws[gid].i, pws[gid].pw_len); + + /** + * loop + */ + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + { + sha1_ctx_t ctx0; + + sha1_init (&ctx0); + + sha1_update_swap (&ctx0, s, salt_len); + + sha1_final (&ctx0); + + const u32 a0 = ctx0.h[0]; + const u32 b0 = ctx0.h[1]; + const u32 c0 = ctx0.h[2]; + const u32 d0 = ctx0.h[3]; + const u32 e0 = ctx0.h[4]; + + md5_ctx_t ctx1 = ctx11; + + md5_update_global (&ctx1, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); + + md5_final (&ctx1); + + const u32 a1 = hc_swap32 (ctx1.h[0]); + const u32 b1 = hc_swap32 (ctx1.h[1]); + const u32 c1 = hc_swap32 (ctx1.h[2]); + const u32 d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_t ctx; + + md5_init (&ctx); + + w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 40); + + w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 32); + + md5_final (&ctx); + + const u32 r0 = ctx.h[DGST_R0]; + const u32 r1 = ctx.h[DGST_R1]; + const u32 r2 = ctx.h[DGST_R2]; + const u32 r3 = ctx.h[DGST_R3]; + + COMPARE_M_SCALAR (r0, r1, r2, r3); + } +} + +KERNEL_FQ void m04420_sxx (KERN_ATTR_BASIC ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * digest + */ + + const u32 search[4] = + { + digests_buf[digests_offset].digest_buf[DGST_R0], + digests_buf[digests_offset].digest_buf[DGST_R1], + digests_buf[digests_offset].digest_buf[DGST_R2], + digests_buf[digests_offset].digest_buf[DGST_R3] + }; + + /** + * base + */ + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + md5_ctx_t ctx11; + + md5_init (&ctx11); + + md5_update_global (&ctx11, pws[gid].i, pws[gid].pw_len); + + /** + * loop + */ + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + { + sha1_ctx_t ctx0; + + sha1_init (&ctx0); + + sha1_update_swap (&ctx0, s, salt_len); + + sha1_final (&ctx0); + + const u32 a0 = ctx0.h[0]; + const u32 b0 = ctx0.h[1]; + const u32 c0 = ctx0.h[2]; + const u32 d0 = ctx0.h[3]; + const u32 e0 = ctx0.h[4]; + + md5_ctx_t ctx1 = ctx11; + + md5_update_global (&ctx1, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); + + md5_final (&ctx1); + + const u32 a1 = hc_swap32 (ctx1.h[0]); + const u32 b1 = hc_swap32 (ctx1.h[1]); + const u32 c1 = hc_swap32 (ctx1.h[2]); + const u32 d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_t ctx; + + md5_init (&ctx); + + w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 40); + + w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + md5_update_64 (&ctx, w0, w1, w2, w3, 32); + + md5_final (&ctx); + + const u32 r0 = ctx.h[DGST_R0]; + const u32 r1 = ctx.h[DGST_R1]; + const u32 r2 = ctx.h[DGST_R2]; + const u32 r3 = ctx.h[DGST_R3]; + + COMPARE_S_SCALAR (r0, r1, r2, r3); + } +} diff --git a/OpenCL/m04420_a3-pure.cl b/OpenCL/m04420_a3-pure.cl new file mode 100644 index 000000000..58c351b25 --- /dev/null +++ b/OpenCL/m04420_a3-pure.cl @@ -0,0 +1,380 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_md5.cl" +#include "inc_hash_sha1.cl" +#endif + +#if VECT_SIZE == 1 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i)]) +#elif VECT_SIZE == 2 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1]) +#elif VECT_SIZE == 4 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3]) +#elif VECT_SIZE == 8 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7]) +#elif VECT_SIZE == 16 +#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) +#endif + +KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * base + */ + + const u32 pw_len = pws[gid].pw_len; + + u32x w[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1) + { + w[idx] = pws[gid].i[idx]; + } + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + /** + * loop + */ + + u32x _w0[4]; + u32x _w1[4]; + u32x _w2[4]; + u32x _w3[4]; + + u32x w0l = w[0]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) + { + const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; + + const u32x w0 = w0l | w0r; + + w[0] = w0; + + sha1_ctx_vector_t ctx0; + + sha1_init_vector (&ctx0); + + sha1_update_vector_swap (&ctx0, s, salt_len); + + sha1_final_vector (&ctx0); + + const u32x a0 = ctx0.h[0]; + const u32x b0 = ctx0.h[1]; + const u32x c0 = ctx0.h[2]; + const u32x d0 = ctx0.h[3]; + const u32x e0 = ctx0.h[4]; + + md5_ctx_vector_t ctx1; + + md5_init_vector (&ctx1); + + md5_update_vector (&ctx1, w, pw_len); + + md5_final_vector (&ctx1); + + const u32x a1 = hc_swap32 (ctx1.h[0]); + const u32x b1 = hc_swap32 (ctx1.h[1]); + const u32x c1 = hc_swap32 (ctx1.h[2]); + const u32x d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_vector_t ctx; + + md5_init_vector (&ctx); + + _w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + _w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + _w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + _w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + _w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + _w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + _w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + _w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + _w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + _w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + _w2[2] = 0; + _w2[3] = 0; + _w3[0] = 0; + _w3[1] = 0; + _w3[2] = 0; + _w3[3] = 0; + + md5_update_vector_64 (&ctx, _w0, _w1, _w2, _w3, 40); + + _w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + _w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + _w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + _w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + _w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + _w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + _w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + _w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + _w2[0] = 0; + _w2[1] = 0; + _w2[2] = 0; + _w2[3] = 0; + _w3[0] = 0; + _w3[1] = 0; + _w3[2] = 0; + _w3[3] = 0; + + md5_update_vector_64 (&ctx, _w0, _w1, _w2, _w3, 32); + + md5_final_vector (&ctx); + + const u32x r0 = ctx.h[DGST_R0]; + const u32x r1 = ctx.h[DGST_R1]; + const u32x r2 = ctx.h[DGST_R2]; + const u32x r3 = ctx.h[DGST_R3]; + + COMPARE_M_SIMD (r0, r1, r2, r3); + } +} + +KERNEL_FQ void m04420_sxx (KERN_ATTR_VECTOR ()) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * bin2asc table + */ + + LOCAL_VK u32 l_bin2asc[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + const u32 i0 = (i >> 0) & 15; + const u32 i1 = (i >> 4) & 15; + + l_bin2asc[i] = ((i0 < 10) ? '0' + i0 : 'a' - 10 + i0) << 8 + | ((i1 < 10) ? '0' + i1 : 'a' - 10 + i1) << 0; + } + + SYNC_THREADS (); + + if (gid >= gid_max) return; + + /** + * digest + */ + + const u32 search[4] = + { + digests_buf[digests_offset].digest_buf[DGST_R0], + digests_buf[digests_offset].digest_buf[DGST_R1], + digests_buf[digests_offset].digest_buf[DGST_R2], + digests_buf[digests_offset].digest_buf[DGST_R3] + }; + + /** + * base + */ + + const u32 pw_len = pws[gid].pw_len; + + u32x w[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1) + { + w[idx] = pws[gid].i[idx]; + } + + const u32 salt_len = salt_bufs[salt_pos].salt_len; + + u32 s[64] = { 0 }; + + for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) + { + s[idx] = salt_bufs[salt_pos].salt_buf[idx]; + } + + /** + * loop + */ + + u32x _w0[4]; + u32x _w1[4]; + u32x _w2[4]; + u32x _w3[4]; + + u32x w0l = w[0]; + + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) + { + const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; + + const u32x w0 = w0l | w0r; + + w[0] = w0; + + sha1_ctx_vector_t ctx0; + + sha1_init_vector (&ctx0); + + sha1_update_vector_swap (&ctx0, s, salt_len); + + sha1_final_vector (&ctx0); + + const u32x a0 = ctx0.h[0]; + const u32x b0 = ctx0.h[1]; + const u32x c0 = ctx0.h[2]; + const u32x d0 = ctx0.h[3]; + const u32x e0 = ctx0.h[4]; + + md5_ctx_vector_t ctx1; + + md5_init_vector (&ctx1); + + md5_update_vector (&ctx1, w, pw_len); + + md5_final_vector (&ctx1); + + const u32x a1 = hc_swap32 (ctx1.h[0]); + const u32x b1 = hc_swap32 (ctx1.h[1]); + const u32x c1 = hc_swap32 (ctx1.h[2]); + const u32x d1 = hc_swap32 (ctx1.h[3]); + + md5_ctx_vector_t ctx; + + md5_init_vector (&ctx); + + _w0[0] = uint_to_hex_lower8 ((a0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 16) & 255) << 16; + _w0[1] = uint_to_hex_lower8 ((a0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a0 >> 0) & 255) << 16; + _w0[2] = uint_to_hex_lower8 ((b0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 16) & 255) << 16; + _w0[3] = uint_to_hex_lower8 ((b0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b0 >> 0) & 255) << 16; + _w1[0] = uint_to_hex_lower8 ((c0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 16) & 255) << 16; + _w1[1] = uint_to_hex_lower8 ((c0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c0 >> 0) & 255) << 16; + _w1[2] = uint_to_hex_lower8 ((d0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 16) & 255) << 16; + _w1[3] = uint_to_hex_lower8 ((d0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d0 >> 0) & 255) << 16; + _w2[0] = uint_to_hex_lower8 ((e0 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 16) & 255) << 16; + _w2[1] = uint_to_hex_lower8 ((e0 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((e0 >> 0) & 255) << 16; + + _w2[2] = 0; + _w2[3] = 0; + _w3[0] = 0; + _w3[1] = 0; + _w3[2] = 0; + _w3[3] = 0; + + md5_update_vector_64 (&ctx, _w0, _w1, _w2, _w3, 40); + + _w0[0] = uint_to_hex_lower8 ((a1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 16) & 255) << 16; + _w0[1] = uint_to_hex_lower8 ((a1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((a1 >> 0) & 255) << 16; + _w0[2] = uint_to_hex_lower8 ((b1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 16) & 255) << 16; + _w0[3] = uint_to_hex_lower8 ((b1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((b1 >> 0) & 255) << 16; + _w1[0] = uint_to_hex_lower8 ((c1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 16) & 255) << 16; + _w1[1] = uint_to_hex_lower8 ((c1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((c1 >> 0) & 255) << 16; + _w1[2] = uint_to_hex_lower8 ((d1 >> 24) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 16) & 255) << 16; + _w1[3] = uint_to_hex_lower8 ((d1 >> 8) & 255) << 0 + | uint_to_hex_lower8 ((d1 >> 0) & 255) << 16; + + _w2[0] = 0; + _w2[1] = 0; + _w2[2] = 0; + _w2[3] = 0; + _w3[0] = 0; + _w3[1] = 0; + _w3[2] = 0; + _w3[3] = 0; + + md5_update_vector_64 (&ctx, _w0, _w1, _w2, _w3, 32); + + md5_final_vector (&ctx); + + const u32x r0 = ctx.h[DGST_R0]; + const u32x r1 = ctx.h[DGST_R1]; + const u32x r2 = ctx.h[DGST_R2]; + const u32x r3 = ctx.h[DGST_R3]; + + COMPARE_S_SIMD (r0, r1, r2, r3); + } +} diff --git a/docs/changes.txt b/docs/changes.txt index 0bb228187..bab9f5bdf 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -35,6 +35,7 @@ - Added hash-mode: Python passlib pbkdf2-sha256 - Added hash-mode: Python passlib pbkdf2-sha512 - Added hash-mode: Oracle Transportation Management (SHA256) +- Added hash-mode: md5(sha1($salt).md5($pass)) ## ## Bugs diff --git a/docs/credits.txt b/docs/credits.txt index bd21d35d7..474f29925 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -18,6 +18,7 @@ Philipp "philsmd" Schmidt (@philsmd) Gabriele "matrix" Gristina (@gm4tr1x) +* md5(sha1($salt).md5($pass)) kernel module * gzip wordlists feature * SHA-224 kernel module + optimizations * Some AES OpenCL kernel module optimizations diff --git a/docs/readme.txt b/docs/readme.txt index 9e36b73ce..b4d01990c 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -74,6 +74,7 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o - md5(md5($pass).md5($salt)) - md5(strtoupper(md5($pass))) - md5(sha1($pass)) +- md5(sha1($salt).md5($pass)) - sha1($pass.$salt) - sha1($salt.$pass) - sha1(utf16le($pass).$salt) diff --git a/src/modules/module_04420.c b/src/modules/module_04420.c new file mode 100644 index 000000000..6e736d05a --- /dev/null +++ b/src/modules/module_04420.c @@ -0,0 +1,215 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#include "common.h" +#include "types.h" +#include "modules.h" +#include "bitops.h" +#include "convert.h" +#include "shared.h" + +static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; +static const u32 DGST_POS0 = 0; +static const u32 DGST_POS1 = 3; +static const u32 DGST_POS2 = 2; +static const u32 DGST_POS3 = 1; +static const u32 DGST_SIZE = DGST_SIZE_4_4; +static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; +static const char *HASH_NAME = "md5(sha1($salt).md5($pass))"; +static const u64 KERN_TYPE = 4420; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_PRECOMPUTE_INIT + | OPTI_TYPE_EARLY_SKIP + | OPTI_TYPE_NOT_ITERATED + | OPTI_TYPE_RAW_HASH; +static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE + | OPTS_TYPE_PT_ADD80 + | OPTS_TYPE_PT_ADDBITS14; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat"; +static const char *ST_HASH = "e69b7a7fe1bf2ad9ef116f79551ee919:baa038987e582431a6d"; + +u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; } +u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; } +u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; } +u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; } +u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; } +u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; } +u32 module_hash_category (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_CATEGORY; } +const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; } +u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; } +u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; } +u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; } +u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; } +const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; } +const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; } + +int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) +{ + u32 *digest = (u32 *) digest_buf; + + token_t token; + + token.token_cnt = 2; + + token.sep[0] = hashconfig->separator; + token.len_min[0] = 32; + token.len_max[0] = 32; + token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.len_min[1] = 19; + token.len_max[1] = 19; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH; + + if (hashconfig->opts_type & OPTS_TYPE_ST_HEX) + { + token.len_min[1] *= 2; + token.len_max[1] *= 2; + + token.attr[1] |= TOKEN_ATTR_VERIFY_HEX; + } + + const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token); + + if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); + + const u8 *hash_pos = token.buf[0]; + + digest[0] = hex_to_u32 (hash_pos + 0); + digest[1] = hex_to_u32 (hash_pos + 8); + digest[2] = hex_to_u32 (hash_pos + 16); + digest[3] = hex_to_u32 (hash_pos + 24); + + if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL) + { + digest[0] -= MD5M_A; + digest[1] -= MD5M_B; + digest[2] -= MD5M_C; + digest[3] -= MD5M_D; + } + + const u8 *salt_pos = token.buf[1]; + const int salt_len = token.len[1]; + + const bool parse_rc = generic_salt_decode (hashconfig, salt_pos, salt_len, (u8 *) salt->salt_buf, (int *) &salt->salt_len); + + if (parse_rc == false) return (PARSER_SALT_LENGTH); + + return (PARSER_OK); +} + +int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size) +{ + const u32 *digest = (const u32 *) digest_buf; + + // we can not change anything in the original buffer, otherwise destroying sorting + // therefore create some local buffer + + u32 tmp[4]; + + tmp[0] = digest[0]; + tmp[1] = digest[1]; + tmp[2] = digest[2]; + tmp[3] = digest[3]; + + if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL) + { + tmp[0] += MD5M_A; + tmp[1] += MD5M_B; + tmp[2] += MD5M_C; + tmp[3] += MD5M_D; + } + + u8 *out_buf = (u8 *) line_buf; + + int out_len = 0; + + u32_to_hex (tmp[0], out_buf + out_len); out_len += 8; + u32_to_hex (tmp[1], out_buf + out_len); out_len += 8; + u32_to_hex (tmp[2], out_buf + out_len); out_len += 8; + u32_to_hex (tmp[3], out_buf + out_len); out_len += 8; + + out_buf[out_len] = hashconfig->separator; + + out_len += 1; + + out_len += generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, out_buf + out_len); + + return out_len; +} + +void module_init (module_ctx_t *module_ctx) +{ + module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT; + module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT; + + module_ctx->module_attack_exec = module_attack_exec; + module_ctx->module_benchmark_esalt = MODULE_DEFAULT; + module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT; + module_ctx->module_benchmark_mask = MODULE_DEFAULT; + module_ctx->module_benchmark_salt = MODULE_DEFAULT; + module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; + module_ctx->module_deep_comp_kernel = MODULE_DEFAULT; + module_ctx->module_dgst_pos0 = module_dgst_pos0; + module_ctx->module_dgst_pos1 = module_dgst_pos1; + module_ctx->module_dgst_pos2 = module_dgst_pos2; + module_ctx->module_dgst_pos3 = module_dgst_pos3; + module_ctx->module_dgst_size = module_dgst_size; + module_ctx->module_dictstat_disable = MODULE_DEFAULT; + module_ctx->module_esalt_size = MODULE_DEFAULT; + module_ctx->module_extra_buffer_size = MODULE_DEFAULT; + module_ctx->module_extra_tmp_size = MODULE_DEFAULT; + module_ctx->module_forced_outfile_format = MODULE_DEFAULT; + module_ctx->module_hash_binary_count = MODULE_DEFAULT; + module_ctx->module_hash_binary_parse = MODULE_DEFAULT; + module_ctx->module_hash_binary_save = MODULE_DEFAULT; + module_ctx->module_hash_decode_potfile = MODULE_DEFAULT; + module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; + module_ctx->module_hash_decode = module_hash_decode; + module_ctx->module_hash_encode_status = MODULE_DEFAULT; + module_ctx->module_hash_encode_potfile = MODULE_DEFAULT; + module_ctx->module_hash_encode = module_hash_encode; + module_ctx->module_hash_init_selftest = MODULE_DEFAULT; + module_ctx->module_hash_mode = MODULE_DEFAULT; + module_ctx->module_hash_category = module_hash_category; + module_ctx->module_hash_name = module_hash_name; + module_ctx->module_hashes_count_min = MODULE_DEFAULT; + module_ctx->module_hashes_count_max = MODULE_DEFAULT; + module_ctx->module_hlfmt_disable = MODULE_DEFAULT; + module_ctx->module_hook12 = MODULE_DEFAULT; + module_ctx->module_hook23 = MODULE_DEFAULT; + module_ctx->module_hook_salt_size = MODULE_DEFAULT; + module_ctx->module_hook_size = MODULE_DEFAULT; + module_ctx->module_jit_build_options = MODULE_DEFAULT; + module_ctx->module_jit_cache_disable = MODULE_DEFAULT; + module_ctx->module_kernel_accel_max = MODULE_DEFAULT; + module_ctx->module_kernel_accel_min = MODULE_DEFAULT; + module_ctx->module_kernel_loops_max = MODULE_DEFAULT; + module_ctx->module_kernel_loops_min = MODULE_DEFAULT; + module_ctx->module_kernel_threads_max = MODULE_DEFAULT; + module_ctx->module_kernel_threads_min = MODULE_DEFAULT; + module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; + module_ctx->module_opti_type = module_opti_type; + module_ctx->module_opts_type = module_opts_type; + module_ctx->module_outfile_check_disable = MODULE_DEFAULT; + module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT; + module_ctx->module_potfile_custom_check = MODULE_DEFAULT; + module_ctx->module_potfile_disable = MODULE_DEFAULT; + module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT; + module_ctx->module_pwdump_column = MODULE_DEFAULT; + module_ctx->module_pw_max = MODULE_DEFAULT; + module_ctx->module_pw_min = MODULE_DEFAULT; + module_ctx->module_salt_max = MODULE_DEFAULT; + module_ctx->module_salt_min = MODULE_DEFAULT; + module_ctx->module_salt_type = module_salt_type; + module_ctx->module_separator = MODULE_DEFAULT; + module_ctx->module_st_hash = module_st_hash; + module_ctx->module_st_pass = module_st_pass; + module_ctx->module_tmp_size = MODULE_DEFAULT; + module_ctx->module_unstable_warning = MODULE_DEFAULT; + module_ctx->module_warmup_disable = MODULE_DEFAULT; +} diff --git a/tools/test_modules/m04420.pm b/tools/test_modules/m04420.pm new file mode 100644 index 000000000..400afd6cb --- /dev/null +++ b/tools/test_modules/m04420.pm @@ -0,0 +1,45 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::MD5 qw (md5_hex); +use Digest::SHA qw (sha1_hex); + +sub module_constraints { [[0, 256], [19, 19], [0, 55], [-1, -1], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = random_hex_string (19, 19); + + my $digest = md5_hex (sha1_hex ($salt) . md5_hex ($word)); + + my $hash = sprintf ("%s:%s", $digest, $salt); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($hash, $salt, $word) = split (':', $line); + + return unless defined $hash; + return unless defined $salt; + return unless defined $word; + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed, $salt); + + return ($new_hash, $word); +} + +1; From 6a6c393bc52906c2d2785bab8c01867c86467d04 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 30 Jul 2019 14:15:30 +0200 Subject: [PATCH 2/3] cleanup credits.txt and changes.txt --- docs/changes.txt | 1 - docs/credits.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index bab9f5bdf..0bb228187 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -35,7 +35,6 @@ - Added hash-mode: Python passlib pbkdf2-sha256 - Added hash-mode: Python passlib pbkdf2-sha512 - Added hash-mode: Oracle Transportation Management (SHA256) -- Added hash-mode: md5(sha1($salt).md5($pass)) ## ## Bugs diff --git a/docs/credits.txt b/docs/credits.txt index 474f29925..bd21d35d7 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -18,7 +18,6 @@ Philipp "philsmd" Schmidt (@philsmd) Gabriele "matrix" Gristina (@gm4tr1x) -* md5(sha1($salt).md5($pass)) kernel module * gzip wordlists feature * SHA-224 kernel module + optimizations * Some AES OpenCL kernel module optimizations From 16b4f745af9a79fa19ec41c923f862da3b2fe70c Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 30 Jul 2019 15:23:04 +0200 Subject: [PATCH 3/3] switch hash-mode from 4420 to 21200 --- OpenCL/{m04420_a0-pure.cl => m21200_a0-pure.cl} | 4 ++-- OpenCL/{m04420_a1-pure.cl => m21200_a1-pure.cl} | 4 ++-- OpenCL/{m04420_a3-pure.cl => m21200_a3-pure.cl} | 4 ++-- docs/readme.txt | 1 - src/modules/{module_04420.c => module_21200.c} | 2 +- tools/test_modules/{m04420.pm => m21200.pm} | 0 6 files changed, 7 insertions(+), 8 deletions(-) rename OpenCL/{m04420_a0-pure.cl => m21200_a0-pure.cl} (99%) rename OpenCL/{m04420_a1-pure.cl => m21200_a1-pure.cl} (99%) rename OpenCL/{m04420_a3-pure.cl => m21200_a3-pure.cl} (99%) rename src/modules/{module_04420.c => module_21200.c} (99%) rename tools/test_modules/{m04420.pm => m21200.pm} (100%) diff --git a/OpenCL/m04420_a0-pure.cl b/OpenCL/m21200_a0-pure.cl similarity index 99% rename from OpenCL/m04420_a0-pure.cl rename to OpenCL/m21200_a0-pure.cl index 6503d8781..2ebe15969 100644 --- a/OpenCL/m04420_a0-pure.cl +++ b/OpenCL/m21200_a0-pure.cl @@ -29,7 +29,7 @@ #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -188,7 +188,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04420_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04420_a1-pure.cl b/OpenCL/m21200_a1-pure.cl similarity index 99% rename from OpenCL/m04420_a1-pure.cl rename to OpenCL/m21200_a1-pure.cl index 05e845560..574cc528b 100644 --- a/OpenCL/m04420_a1-pure.cl +++ b/OpenCL/m21200_a1-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -184,7 +184,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04420_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04420_a3-pure.cl b/OpenCL/m21200_a3-pure.cl similarity index 99% rename from OpenCL/m04420_a3-pure.cl rename to OpenCL/m21200_a3-pure.cl index 58c351b25..1b097b9af 100644 --- a/OpenCL/m04420_a3-pure.cl +++ b/OpenCL/m21200_a3-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -197,7 +197,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m04420_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/docs/readme.txt b/docs/readme.txt index b4d01990c..9e36b73ce 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -74,7 +74,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o - md5(md5($pass).md5($salt)) - md5(strtoupper(md5($pass))) - md5(sha1($pass)) -- md5(sha1($salt).md5($pass)) - sha1($pass.$salt) - sha1($salt.$pass) - sha1(utf16le($pass).$salt) diff --git a/src/modules/module_04420.c b/src/modules/module_21200.c similarity index 99% rename from src/modules/module_04420.c rename to src/modules/module_21200.c index 6e736d05a..6c9ea1daf 100644 --- a/src/modules/module_04420.c +++ b/src/modules/module_21200.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 1; static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; static const char *HASH_NAME = "md5(sha1($salt).md5($pass))"; -static const u64 KERN_TYPE = 4420; +static const u64 KERN_TYPE = 21200; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m04420.pm b/tools/test_modules/m21200.pm similarity index 100% rename from tools/test_modules/m04420.pm rename to tools/test_modules/m21200.pm