Fix missing multihash support for -m 3100

OpenCL/m03100_a0.cl

@@ -496,6 +496,220 @@ static void _des_crypt_keysetup (u32x c, u32x d, u32x Kc[16], u32x Kd[16], __loc
 
 __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *  rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
+  /**
+   * modifier
+   */
+
+  const u32 gid = get_global_id (0);
+  const u32 lid = get_local_id (0);
+  const u32 lsz = get_local_size (0);
+
+  /**
+   * sbox, kbox
+   */
+
+  __local u32 s_SPtrans[8][64];
+  __local u32 s_skb[8][64];
+
+  for (u32 i = lid; i < 64; i += lsz)
+  {
+    s_SPtrans[0][i] = c_SPtrans[0][i];
+    s_SPtrans[1][i] = c_SPtrans[1][i];
+    s_SPtrans[2][i] = c_SPtrans[2][i];
+    s_SPtrans[3][i] = c_SPtrans[3][i];
+    s_SPtrans[4][i] = c_SPtrans[4][i];
+    s_SPtrans[5][i] = c_SPtrans[5][i];
+    s_SPtrans[6][i] = c_SPtrans[6][i];
+    s_SPtrans[7][i] = c_SPtrans[7][i];
+
+    s_skb[0][i] = c_skb[0][i];
+    s_skb[1][i] = c_skb[1][i];
+    s_skb[2][i] = c_skb[2][i];
+    s_skb[3][i] = c_skb[3][i];
+    s_skb[4][i] = c_skb[4][i];
+    s_skb[5][i] = c_skb[5][i];
+    s_skb[6][i] = c_skb[6][i];
+    s_skb[7][i] = c_skb[7][i];
+  }
+
+  barrier (CLK_LOCAL_MEM_FENCE);
+
+  if (gid >= gid_max) return;
+
+  /**
+   * base
+   */
+
+  u32 pw_buf0[4];
+  u32 pw_buf1[4];
+
+  pw_buf0[0] = pws[gid].i[0];
+  pw_buf0[1] = pws[gid].i[1];
+  pw_buf0[2] = pws[gid].i[2];
+  pw_buf0[3] = pws[gid].i[3];
+  pw_buf1[0] = pws[gid].i[4];
+  pw_buf1[1] = pws[gid].i[5];
+  pw_buf1[2] = pws[gid].i[6];
+  pw_buf1[3] = pws[gid].i[7];
+
+  const u32 pw_len = pws[gid].pw_len;
+
+  /**
+   * salt
+   */
+
+  u32 salt_buf0[4];
+  u32 salt_buf1[4];
+
+  salt_buf0[0] = salt_bufs[salt_pos].salt_buf[0];
+  salt_buf0[1] = salt_bufs[salt_pos].salt_buf[1];
+  salt_buf0[2] = salt_bufs[salt_pos].salt_buf[2];
+  salt_buf0[3] = salt_bufs[salt_pos].salt_buf[3];
+  salt_buf1[0] = salt_bufs[salt_pos].salt_buf[4];
+  salt_buf1[1] = salt_bufs[salt_pos].salt_buf[5];
+  salt_buf1[2] = salt_bufs[salt_pos].salt_buf[6];
+  salt_buf1[3] = salt_bufs[salt_pos].salt_buf[7];
+
+  const u32 salt_len = salt_bufs[salt_pos].salt_len;
+
+  /**
+   * main
+   */
+
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
+  {
+    u32x w0[4] = { 0 };
+    u32x w1[4] = { 0 };
+    u32x w2[4] = { 0 };
+    u32x w3[4] = { 0 };
+
+    const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
+
+    const u32x salt_word_len = (salt_len + out_len) * 2;
+
+    /**
+     * prepend salt
+     */
+
+    switch_buffer_by_offset_le (w0, w1, w2, w3, salt_len);
+
+    u32x dst[16];
+
+    dst[ 0] = w0[0] | salt_buf0[0];
+    dst[ 1] = w0[1] | salt_buf0[1];
+    dst[ 2] = w0[2] | salt_buf0[2];
+    dst[ 3] = w0[3] | salt_buf0[3];
+    dst[ 4] = w1[0] | salt_buf1[0];
+    dst[ 5] = w1[1] | salt_buf1[1];
+    dst[ 6] = w1[2] | salt_buf1[2];
+    dst[ 7] = w1[3] | salt_buf1[3];
+    dst[ 8] = w2[0];
+    dst[ 9] = w2[1];
+    dst[10] = w2[2];
+    dst[11] = w2[3];
+    dst[12] = w3[0];
+    dst[13] = w3[1];
+    dst[14] = w3[2];
+    dst[15] = w3[3];
+
+    /**
+     * precompute key1 since key is static: 0x0123456789abcdef
+     * plus LEFT_ROTATE by 2
+     */
+
+    u32x Kc[16];
+
+    Kc[ 0] = 0x64649040;
+    Kc[ 1] = 0x14909858;
+    Kc[ 2] = 0xc4b44888;
+    Kc[ 3] = 0x9094e438;
+    Kc[ 4] = 0xd8a004f0;
+    Kc[ 5] = 0xa8f02810;
+    Kc[ 6] = 0xc84048d8;
+    Kc[ 7] = 0x68d804a8;
+    Kc[ 8] = 0x0490e40c;
+    Kc[ 9] = 0xac183024;
+    Kc[10] = 0x24c07c10;
+    Kc[11] = 0x8c88c038;
+    Kc[12] = 0xc048c824;
+    Kc[13] = 0x4c0470a8;
+    Kc[14] = 0x584020b4;
+    Kc[15] = 0x00742c4c;
+
+    u32x Kd[16];
+
+    Kd[ 0] = 0xa42ce40c;
+    Kd[ 1] = 0x64689858;
+    Kd[ 2] = 0x484050b8;
+    Kd[ 3] = 0xe8184814;
+    Kd[ 4] = 0x405cc070;
+    Kd[ 5] = 0xa010784c;
+    Kd[ 6] = 0x6074a800;
+    Kd[ 7] = 0x80701c1c;
+    Kd[ 8] = 0x9cd49430;
+    Kd[ 9] = 0x4c8ce078;
+    Kd[10] = 0x5c18c088;
+    Kd[11] = 0x28a8a4c8;
+    Kd[12] = 0x3c180838;
+    Kd[13] = 0xb0b86c20;
+    Kd[14] = 0xac84a094;
+    Kd[15] = 0x4ce0c0c4;
+
+    /**
+     * key1 (generate key)
+     */
+
+    u32x iv[2];
+
+    iv[0] = 0;
+    iv[1] = 0;
+
+    for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++)
+    {
+      u32x data[2];
+
+      data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00);
+      data[1] = ((dst[k] >>  0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00);
+
+      data[0] ^= iv[0];
+      data[1] ^= iv[1];
+
+      _des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans);
+    }
+
+    /**
+     * key2 (generate hash)
+     */
+
+    _des_crypt_keysetup (iv[0], iv[1], Kc, Kd, s_skb);
+
+    iv[0] = 0;
+    iv[1] = 0;
+
+    for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++)
+    {
+      u32x data[2];
+
+      data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00);
+      data[1] = ((dst[k] >>  0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00);
+
+      data[0] ^= iv[0];
+      data[1] ^= iv[1];
+
+      _des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans);
+    }
+
+    /**
+     * cmp
+     */
+
+    const u32x r0 = iv[0];
+    const u32x r1 = iv[1];
+    const u32x r2 = 0;
+    const u32x r3 = 0;
+
+    COMPARE_M_SIMD (r0, r1, r2, r3);
+  }
 }
 
 __kernel void m03100_m08 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)