From: Jens Steube Date: Sun, 10 Apr 2016 09:33:18 +0000 (+0200) Subject: Cleanup -m 31xx kernels to latest standard X-Git-Tag: v3.00-beta~143 X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=298e9a3aad4c7bd5ebd3d7a117efc002af8fce4a;p=hashcat.git Cleanup -m 31xx kernels to latest standard --- diff --git a/OpenCL/m03100_a0.cl b/OpenCL/m03100_a0.cl index 9b539df..1793964 100644 --- a/OpenCL/m03100_a0.cl +++ b/OpenCL/m03100_a0.cl @@ -496,261 +496,6 @@ 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]; - - 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]; - - u32 pw_buf1[4]; - - 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]; - - 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]; - - u32 salt_buf1[4]; - - 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; - - /** - * loop - */ - - 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 - */ - - u32x w0_t[4]; - - w0_t[0] = w0[0]; - w0_t[1] = w0[1]; - w0_t[2] = w0[2]; - w0_t[3] = w0[3]; - - u32x w1_t[4]; - - w1_t[0] = w1[0]; - w1_t[1] = w1[1]; - w1_t[2] = w1[2]; - w1_t[3] = w1[3]; - - u32x w2_t[4]; - - w2_t[0] = w2[0]; - w2_t[1] = w2[1]; - w2_t[2] = w2[2]; - w2_t[3] = w2[3]; - - u32x w3_t[4]; - - w3_t[0] = w3[0]; - w3_t[1] = w3[1]; - w3_t[2] = w3[2]; - w3_t[3] = w3[3]; - - switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, salt_len); - - w0_t[0] |= salt_buf0[0]; - w0_t[1] |= salt_buf0[1]; - w0_t[2] |= salt_buf0[2]; - w0_t[3] |= salt_buf0[3]; - w1_t[0] |= salt_buf1[0]; - w1_t[1] |= salt_buf1[1]; - w1_t[2] |= salt_buf1[2]; - w1_t[3] |= salt_buf1[3]; - - u32x dst[16]; - - dst[ 0] = w0_t[0]; - dst[ 1] = w0_t[1]; - dst[ 2] = w0_t[2]; - dst[ 3] = w0_t[3]; - dst[ 4] = w1_t[0]; - dst[ 5] = w1_t[1]; - dst[ 6] = w1_t[2]; - dst[ 7] = w1_t[3]; - dst[ 8] = w2_t[0]; - dst[ 9] = w2_t[1]; - dst[10] = w2_t[2]; - dst[11] = w2_t[3]; - dst[12] = 0; - dst[13] = 0; - dst[14] = 0; - dst[15] = 0; - - /** - * 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) @@ -808,18 +553,16 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu */ u32 pw_buf0[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]; - u32 pw_buf1[4]; - 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]; + 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; @@ -828,14 +571,12 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu */ 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]; - - u32 salt_buf1[4]; - 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]; @@ -856,7 +597,7 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu }; /** - * loop + * main */ for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) @@ -874,63 +615,26 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu * prepend salt */ - u32x w0_t[4]; - - w0_t[0] = w0[0]; - w0_t[1] = w0[1]; - w0_t[2] = w0[2]; - w0_t[3] = w0[3]; - - u32x w1_t[4]; - - w1_t[0] = w1[0]; - w1_t[1] = w1[1]; - w1_t[2] = w1[2]; - w1_t[3] = w1[3]; - - u32x w2_t[4]; - - w2_t[0] = w2[0]; - w2_t[1] = w2[1]; - w2_t[2] = w2[2]; - w2_t[3] = w2[3]; - - u32x w3_t[4]; - - w3_t[0] = w3[0]; - w3_t[1] = w3[1]; - w3_t[2] = w3[2]; - w3_t[3] = w3[3]; - - switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, salt_len); - - w0_t[0] |= salt_buf0[0]; - w0_t[1] |= salt_buf0[1]; - w0_t[2] |= salt_buf0[2]; - w0_t[3] |= salt_buf0[3]; - w1_t[0] |= salt_buf1[0]; - w1_t[1] |= salt_buf1[1]; - w1_t[2] |= salt_buf1[2]; - w1_t[3] |= salt_buf1[3]; + switch_buffer_by_offset_le (w0, w1, w2, w3, salt_len); u32x dst[16]; - dst[ 0] = w0_t[0]; - dst[ 1] = w0_t[1]; - dst[ 2] = w0_t[2]; - dst[ 3] = w0_t[3]; - dst[ 4] = w1_t[0]; - dst[ 5] = w1_t[1]; - dst[ 6] = w1_t[2]; - dst[ 7] = w1_t[3]; - dst[ 8] = w2_t[0]; - dst[ 9] = w2_t[1]; - dst[10] = w2_t[2]; - dst[11] = w2_t[3]; - dst[12] = 0; - dst[13] = 0; - dst[14] = 0; - dst[15] = 0; + 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 @@ -1028,7 +732,7 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu const u32x r2 = 0; const u32x r3 = 0; - COMPARE_M_SIMD (r0, r1, r2, r3); + COMPARE_S_SIMD (r0, r1, r2, r3); } } diff --git a/OpenCL/m03100_a1.cl b/OpenCL/m03100_a1.cl index 439937f..ac4653c 100644 --- a/OpenCL/m03100_a1.cl +++ b/OpenCL/m03100_a1.cl @@ -7,6 +7,9 @@ #define _DES_ +//incompatible +//#define NEW_SIMD_CODE + #include "include/constants.h" #include "include/kernel_vendor.h" @@ -18,9 +21,7 @@ #include "include/kernel_functions.c" #include "OpenCL/types_ocl.c" #include "OpenCL/common.c" - -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#include "OpenCL/simd.c" #define PERM_OP(a,b,tt,n,m) \ { \ @@ -356,14 +357,24 @@ __constant u32 c_skb[8][64] = } }; +#if VECT_SIZE == 1 #define BOX(i,n,S) (S)[(n)][(i)] - -static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16], __local u32 (*s_SPtrans)[64]) +#elif VECT_SIZE == 2 +#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1]) +#elif VECT_SIZE == 4 +#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3]) +#elif VECT_SIZE == 8 +#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7]) +#elif VECT_SIZE == 16 +#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) +#endif + +static void _des_crypt_encrypt (u32x iv[2], u32x data[2], u32x Kc[16], u32x Kd[16], __local u32 (*s_SPtrans)[64]) { - u32 tt; + u32x tt; - u32 r = data[0]; - u32 l = data[1]; + u32x r = data[0]; + u32x l = data[1]; IP (r, l, tt); @@ -373,8 +384,8 @@ static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16], #pragma unroll 16 for (u32 i = 0; i < 16; i += 2) { - u32 u; - u32 t; + u32x u; + u32x t; u = Kc[i + 0] ^ r; t = Kd[i + 0] ^ rotl32 (r, 28u); @@ -410,9 +421,9 @@ static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16], iv[1] = r; } -static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u32 (*s_skb)[64]) +static void _des_crypt_keysetup (u32x c, u32x d, u32x Kc[16], u32x Kd[16], __local u32 (*s_skb)[64]) { - u32 tt; + u32x tt; PERM_OP (d, c, tt, 4, 0x0f0f0f0f); HPERM_OP (c, tt, 2, 0xcccc0000); @@ -445,32 +456,32 @@ static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u c = c & 0x0fffffff; d = d & 0x0fffffff; - const u32 c00 = (c >> 0) & 0x0000003f; - const u32 c06 = (c >> 6) & 0x00383003; - const u32 c07 = (c >> 7) & 0x0000003c; - const u32 c13 = (c >> 13) & 0x0000060f; - const u32 c20 = (c >> 20) & 0x00000001; - - u32 s = BOX (((c00 >> 0) & 0xff), 0, s_skb) - | BOX (((c06 >> 0) & 0xff) - |((c07 >> 0) & 0xff), 1, s_skb) - | BOX (((c13 >> 0) & 0xff) - |((c06 >> 8) & 0xff), 2, s_skb) - | BOX (((c20 >> 0) & 0xff) - |((c13 >> 8) & 0xff) - |((c06 >> 16) & 0xff), 3, s_skb); - - const u32 d00 = (d >> 0) & 0x00003c3f; - const u32 d07 = (d >> 7) & 0x00003f03; - const u32 d21 = (d >> 21) & 0x0000000f; - const u32 d22 = (d >> 22) & 0x00000030; - - u32 t = BOX (((d00 >> 0) & 0xff), 4, s_skb) - | BOX (((d07 >> 0) & 0xff) - |((d00 >> 8) & 0xff), 5, s_skb) - | BOX (((d07 >> 8) & 0xff), 6, s_skb) - | BOX (((d21 >> 0) & 0xff) - |((d22 >> 0) & 0xff), 7, s_skb); + const u32x c00 = (c >> 0) & 0x0000003f; + const u32x c06 = (c >> 6) & 0x00383003; + const u32x c07 = (c >> 7) & 0x0000003c; + const u32x c13 = (c >> 13) & 0x0000060f; + const u32x c20 = (c >> 20) & 0x00000001; + + u32x s = BOX (((c00 >> 0) & 0xff), 0, s_skb) + | BOX (((c06 >> 0) & 0xff) + |((c07 >> 0) & 0xff), 1, s_skb) + | BOX (((c13 >> 0) & 0xff) + |((c06 >> 8) & 0xff), 2, s_skb) + | BOX (((c20 >> 0) & 0xff) + |((c13 >> 8) & 0xff) + |((c06 >> 16) & 0xff), 3, s_skb); + + const u32x d00 = (d >> 0) & 0x00003c3f; + const u32x d07 = (d >> 7) & 0x00003f03; + const u32x d21 = (d >> 21) & 0x0000000f; + const u32x d22 = (d >> 22) & 0x00000030; + + u32x t = BOX (((d00 >> 0) & 0xff), 4, s_skb) + | BOX (((d07 >> 0) & 0xff) + |((d00 >> 8) & 0xff), 5, s_skb) + | BOX (((d07 >> 8) & 0xff), 6, s_skb) + | BOX (((d21 >> 0) & 0xff) + |((d22 >> 0) & 0xff), 7, s_skb); Kc[i] = ((t << 16) | (s & 0x0000ffff)); Kd[i] = ((s >> 16) | (t & 0xffff0000)); @@ -526,54 +537,31 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * base */ - u32 wordl0[4]; - - wordl0[0] = pws[gid].i[ 0]; - wordl0[1] = pws[gid].i[ 1]; - wordl0[2] = pws[gid].i[ 2]; - wordl0[3] = pws[gid].i[ 3]; - - u32 wordl1[4]; - - wordl1[0] = pws[gid].i[ 4]; - wordl1[1] = pws[gid].i[ 5]; - wordl1[2] = pws[gid].i[ 6]; - wordl1[3] = pws[gid].i[ 7]; - - u32 wordl2[4]; - - wordl2[0] = 0; - wordl2[1] = 0; - wordl2[2] = 0; - wordl2[3] = 0; + u32 pw_buf0[4]; + u32 pw_buf1[4]; - u32 wordl3[4]; - - wordl3[0] = 0; - wordl3[1] = 0; - wordl3[2] = 0; - wordl3[3] = 0; + 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_l_len = pws[gid].pw_len; - if (combs_mode == COMBINATOR_MODE_BASE_RIGHT) - { - switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].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]; - - u32 salt_buf1[4]; - 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]; @@ -585,70 +573,72 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) { - const u32 pw_r_len = combs_buf[il_pos].pw_len; + const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos); - const u32 pw_len = pw_l_len + pw_r_len; + const u32x pw_len = pw_l_len + pw_r_len; - const u32 salt_word_len = (salt_len + pw_len) * 2; + const u32x salt_word_len = (salt_len + pw_len) * 2; - u32 wordr0[4]; - - wordr0[0] = combs_buf[il_pos].i[0]; - wordr0[1] = combs_buf[il_pos].i[1]; - wordr0[2] = combs_buf[il_pos].i[2]; - wordr0[3] = combs_buf[il_pos].i[3]; - - u32 wordr1[4]; - - wordr1[0] = combs_buf[il_pos].i[4]; - wordr1[1] = combs_buf[il_pos].i[5]; - wordr1[2] = combs_buf[il_pos].i[6]; - wordr1[3] = combs_buf[il_pos].i[7]; - - u32 wordr2[4]; - - wordr2[0] = 0; - wordr2[1] = 0; - wordr2[2] = 0; - wordr2[3] = 0; - - u32 wordr3[4]; + /** + * concat password candidate + */ - wordr3[0] = 0; - wordr3[1] = 0; - wordr3[2] = 0; - wordr3[3] = 0; + u32x wordl0[4] = { 0 }; + u32x wordl1[4] = { 0 }; + u32x wordl2[4] = { 0 }; + u32x wordl3[4] = { 0 }; + + wordl0[0] = pw_buf0[0]; + wordl0[1] = pw_buf0[1]; + wordl0[2] = pw_buf0[2]; + wordl0[3] = pw_buf0[3]; + wordl1[0] = pw_buf1[0]; + wordl1[1] = pw_buf1[1]; + wordl1[2] = pw_buf1[2]; + wordl1[3] = pw_buf1[3]; + + u32x wordr0[4] = { 0 }; + u32x wordr1[4] = { 0 }; + u32x wordr2[4] = { 0 }; + u32x wordr3[4] = { 0 }; + + wordr0[0] = ix_create_combt (combs_buf, il_pos, 0); + wordr0[1] = ix_create_combt (combs_buf, il_pos, 1); + wordr0[2] = ix_create_combt (combs_buf, il_pos, 2); + wordr0[3] = ix_create_combt (combs_buf, il_pos, 3); + wordr1[0] = ix_create_combt (combs_buf, il_pos, 4); + wordr1[1] = ix_create_combt (combs_buf, il_pos, 5); + wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); + wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); if (combs_mode == COMBINATOR_MODE_BASE_LEFT) { - switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len); + switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); + } + else + { + switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len); } - u32 w0[4]; + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; w0[0] = wordl0[0] | wordr0[0]; w0[1] = wordl0[1] | wordr0[1]; w0[2] = wordl0[2] | wordr0[2]; w0[3] = wordl0[3] | wordr0[3]; - - u32 w1[4]; - w1[0] = wordl1[0] | wordr1[0]; w1[1] = wordl1[1] | wordr1[1]; w1[2] = wordl1[2] | wordr1[2]; w1[3] = wordl1[3] | wordr1[3]; - - u32 w2[4]; - w2[0] = wordl2[0] | wordr2[0]; w2[1] = wordl2[1] | wordr2[1]; w2[2] = wordl2[2] | wordr2[2]; w2[3] = wordl2[3] | wordr2[3]; - - u32 w3[4]; - w3[0] = wordl3[0] | wordr3[0]; w3[1] = wordl3[1] | wordr3[1]; w3[2] = wordl3[2] | wordr3[2]; @@ -658,64 +648,33 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * prepend salt */ - u32 w0_t[4]; - u32 w1_t[4]; - u32 w2_t[4]; - u32 w3_t[4]; - - w0_t[0] = w0[0]; - w0_t[1] = w0[1]; - w0_t[2] = w0[2]; - w0_t[3] = w0[3]; - w1_t[0] = w1[0]; - w1_t[1] = w1[1]; - w1_t[2] = w1[2]; - w1_t[3] = w1[3]; - w2_t[0] = w2[0]; - w2_t[1] = w2[1]; - w2_t[2] = w2[2]; - w2_t[3] = w2[3]; - w3_t[0] = w3[0]; - w3_t[1] = w3[1]; - w3_t[2] = w3[2]; - w3_t[3] = w3[3]; - - switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, salt_len); - - w0_t[0] |= salt_buf0[0]; - w0_t[1] |= salt_buf0[1]; - w0_t[2] |= salt_buf0[2]; - w0_t[3] |= salt_buf0[3]; - w1_t[0] |= salt_buf1[0]; - w1_t[1] |= salt_buf1[1]; - w1_t[2] |= salt_buf1[2]; - w1_t[3] |= salt_buf1[3]; - - u32 dst[16]; - - dst[ 0] = w0_t[0]; - dst[ 1] = w0_t[1]; - dst[ 2] = w0_t[2]; - dst[ 3] = w0_t[3]; - dst[ 4] = w1_t[0]; - dst[ 5] = w1_t[1]; - dst[ 6] = w1_t[2]; - dst[ 7] = w1_t[3]; - dst[ 8] = w2_t[0]; - dst[ 9] = w2_t[1]; - dst[10] = w2_t[2]; - dst[11] = w2_t[3]; - dst[12] = 0; - dst[13] = 0; - dst[14] = 0; - dst[15] = 0; + 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 */ - u32 Kc[16]; + u32x Kc[16]; Kc[ 0] = 0x64649040; Kc[ 1] = 0x14909858; @@ -734,7 +693,7 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, Kc[14] = 0x584020b4; Kc[15] = 0x00742c4c; - u32 Kd[16]; + u32x Kd[16]; Kd[ 0] = 0xa42ce40c; Kd[ 1] = 0x64689858; @@ -757,14 +716,14 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * key1 (generate key) */ - u32 iv[2]; + u32x iv[2]; iv[0] = 0; iv[1] = 0; for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++) { - u32 data[2]; + u32x data[2]; data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00); data[1] = ((dst[k] >> 0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00); @@ -786,7 +745,7 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++) { - u32 data[2]; + u32x data[2]; data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00); data[1] = ((dst[k] >> 0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00); @@ -801,12 +760,12 @@ __kernel void m03100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * cmp */ - const u32 r0 = iv[0]; - const u32 r1 = iv[1]; - const u32 r2 = 0; - const u32 r3 = 0; + const u32x r0 = iv[0]; + const u32x r1 = iv[1]; + const u32x r2 = 0; + const u32x r3 = 0; - #include COMPARE_M + COMPARE_M_SIMD (r0, r1, r2, r3); } } @@ -864,54 +823,31 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * base */ - u32 wordl0[4]; - - wordl0[0] = pws[gid].i[ 0]; - wordl0[1] = pws[gid].i[ 1]; - wordl0[2] = pws[gid].i[ 2]; - wordl0[3] = pws[gid].i[ 3]; - - u32 wordl1[4]; - - wordl1[0] = pws[gid].i[ 4]; - wordl1[1] = pws[gid].i[ 5]; - wordl1[2] = pws[gid].i[ 6]; - wordl1[3] = pws[gid].i[ 7]; + u32 pw_buf0[4]; + u32 pw_buf1[4]; - u32 wordl2[4]; - - wordl2[0] = 0; - wordl2[1] = 0; - wordl2[2] = 0; - wordl2[3] = 0; - - u32 wordl3[4]; - - wordl3[0] = 0; - wordl3[1] = 0; - wordl3[2] = 0; - wordl3[3] = 0; + 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_l_len = pws[gid].pw_len; - if (combs_mode == COMBINATOR_MODE_BASE_RIGHT) - { - switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].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]; - - u32 salt_buf1[4]; - 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]; @@ -935,70 +871,72 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) { - const u32 pw_r_len = combs_buf[il_pos].pw_len; - - const u32 pw_len = pw_l_len + pw_r_len; - - const u32 salt_word_len = (salt_len + pw_len) * 2; + const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos); - u32 wordr0[4]; + const u32x pw_len = pw_l_len + pw_r_len; - wordr0[0] = combs_buf[il_pos].i[0]; - wordr0[1] = combs_buf[il_pos].i[1]; - wordr0[2] = combs_buf[il_pos].i[2]; - wordr0[3] = combs_buf[il_pos].i[3]; + const u32x salt_word_len = (salt_len + pw_len) * 2; - u32 wordr1[4]; - - wordr1[0] = combs_buf[il_pos].i[4]; - wordr1[1] = combs_buf[il_pos].i[5]; - wordr1[2] = combs_buf[il_pos].i[6]; - wordr1[3] = combs_buf[il_pos].i[7]; - - u32 wordr2[4]; - - wordr2[0] = 0; - wordr2[1] = 0; - wordr2[2] = 0; - wordr2[3] = 0; - - u32 wordr3[4]; + /** + * concat password candidate + */ - wordr3[0] = 0; - wordr3[1] = 0; - wordr3[2] = 0; - wordr3[3] = 0; + u32x wordl0[4] = { 0 }; + u32x wordl1[4] = { 0 }; + u32x wordl2[4] = { 0 }; + u32x wordl3[4] = { 0 }; + + wordl0[0] = pw_buf0[0]; + wordl0[1] = pw_buf0[1]; + wordl0[2] = pw_buf0[2]; + wordl0[3] = pw_buf0[3]; + wordl1[0] = pw_buf1[0]; + wordl1[1] = pw_buf1[1]; + wordl1[2] = pw_buf1[2]; + wordl1[3] = pw_buf1[3]; + + u32x wordr0[4] = { 0 }; + u32x wordr1[4] = { 0 }; + u32x wordr2[4] = { 0 }; + u32x wordr3[4] = { 0 }; + + wordr0[0] = ix_create_combt (combs_buf, il_pos, 0); + wordr0[1] = ix_create_combt (combs_buf, il_pos, 1); + wordr0[2] = ix_create_combt (combs_buf, il_pos, 2); + wordr0[3] = ix_create_combt (combs_buf, il_pos, 3); + wordr1[0] = ix_create_combt (combs_buf, il_pos, 4); + wordr1[1] = ix_create_combt (combs_buf, il_pos, 5); + wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); + wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); if (combs_mode == COMBINATOR_MODE_BASE_LEFT) { - switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len); + switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); + } + else + { + switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len); } - u32 w0[4]; + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; w0[0] = wordl0[0] | wordr0[0]; w0[1] = wordl0[1] | wordr0[1]; w0[2] = wordl0[2] | wordr0[2]; w0[3] = wordl0[3] | wordr0[3]; - - u32 w1[4]; - w1[0] = wordl1[0] | wordr1[0]; w1[1] = wordl1[1] | wordr1[1]; w1[2] = wordl1[2] | wordr1[2]; w1[3] = wordl1[3] | wordr1[3]; - - u32 w2[4]; - w2[0] = wordl2[0] | wordr2[0]; w2[1] = wordl2[1] | wordr2[1]; w2[2] = wordl2[2] | wordr2[2]; w2[3] = wordl2[3] | wordr2[3]; - - u32 w3[4]; - w3[0] = wordl3[0] | wordr3[0]; w3[1] = wordl3[1] | wordr3[1]; w3[2] = wordl3[2] | wordr3[2]; @@ -1008,64 +946,33 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * prepend salt */ - u32 w0_t[4]; - u32 w1_t[4]; - u32 w2_t[4]; - u32 w3_t[4]; - - w0_t[0] = w0[0]; - w0_t[1] = w0[1]; - w0_t[2] = w0[2]; - w0_t[3] = w0[3]; - w1_t[0] = w1[0]; - w1_t[1] = w1[1]; - w1_t[2] = w1[2]; - w1_t[3] = w1[3]; - w2_t[0] = w2[0]; - w2_t[1] = w2[1]; - w2_t[2] = w2[2]; - w2_t[3] = w2[3]; - w3_t[0] = w3[0]; - w3_t[1] = w3[1]; - w3_t[2] = w3[2]; - w3_t[3] = w3[3]; - - switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, salt_len); - - w0_t[0] |= salt_buf0[0]; - w0_t[1] |= salt_buf0[1]; - w0_t[2] |= salt_buf0[2]; - w0_t[3] |= salt_buf0[3]; - w1_t[0] |= salt_buf1[0]; - w1_t[1] |= salt_buf1[1]; - w1_t[2] |= salt_buf1[2]; - w1_t[3] |= salt_buf1[3]; - - u32 dst[16]; - - dst[ 0] = w0_t[0]; - dst[ 1] = w0_t[1]; - dst[ 2] = w0_t[2]; - dst[ 3] = w0_t[3]; - dst[ 4] = w1_t[0]; - dst[ 5] = w1_t[1]; - dst[ 6] = w1_t[2]; - dst[ 7] = w1_t[3]; - dst[ 8] = w2_t[0]; - dst[ 9] = w2_t[1]; - dst[10] = w2_t[2]; - dst[11] = w2_t[3]; - dst[12] = 0; - dst[13] = 0; - dst[14] = 0; - dst[15] = 0; + 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 */ - u32 Kc[16]; + u32x Kc[16]; Kc[ 0] = 0x64649040; Kc[ 1] = 0x14909858; @@ -1084,7 +991,7 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, Kc[14] = 0x584020b4; Kc[15] = 0x00742c4c; - u32 Kd[16]; + u32x Kd[16]; Kd[ 0] = 0xa42ce40c; Kd[ 1] = 0x64689858; @@ -1107,14 +1014,14 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * key1 (generate key) */ - u32 iv[2]; + u32x iv[2]; iv[0] = 0; iv[1] = 0; for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++) { - u32 data[2]; + u32x data[2]; data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00); data[1] = ((dst[k] >> 0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00); @@ -1136,7 +1043,7 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, for (u32 j = 0, k = 0; j < salt_word_len; j += 8, k++) { - u32 data[2]; + u32x data[2]; data[0] = ((dst[k] << 16) & 0xff000000) | ((dst[k] << 8) & 0x0000ff00); data[1] = ((dst[k] >> 0) & 0xff000000) | ((dst[k] >> 8) & 0x0000ff00); @@ -1151,12 +1058,12 @@ __kernel void m03100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * cmp */ - const u32 r0 = iv[0]; - const u32 r1 = iv[1]; - const u32 r2 = 0; - const u32 r3 = 0; + const u32x r0 = iv[0]; + const u32x r1 = iv[1]; + const u32x r2 = 0; + const u32x r3 = 0; - #include COMPARE_S + COMPARE_S_SIMD (r0, r1, r2, r3); } } diff --git a/OpenCL/m03100_a3.cl b/OpenCL/m03100_a3.cl index 1460946..6b9a4cd 100644 --- a/OpenCL/m03100_a3.cl +++ b/OpenCL/m03100_a3.cl @@ -505,26 +505,17 @@ static void m03100m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 */ 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]; - - u32 salt_buf1[4]; - 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]; - u32 salt_buf2[4]; - - salt_buf2[0] = 0; - salt_buf2[1] = 0; - salt_buf2[2] = 0; - salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_word_len = (salt_len + pw_len) * 2; @@ -565,14 +556,6 @@ static void m03100m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 w1_t[1] |= salt_buf1[1]; w1_t[2] |= salt_buf1[2]; w1_t[3] |= salt_buf1[3]; - w2_t[0] |= salt_buf2[0]; - w2_t[1] |= salt_buf2[1]; - w2_t[2] |= salt_buf2[2]; - w2_t[3] |= salt_buf2[3]; - w3_t[0] = 0; - w3_t[1] = 0; - w3_t[2] = 0; - w3_t[3] = 0; u32x dst[16]; @@ -698,10 +681,12 @@ static void m03100m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 * cmp */ - u32x c = 0; - u32x d = 0; + const u32x r0 = iv[0]; + const u32x r1 = iv[1]; + const u32x r2 = 0; + const u32x r3 = 0; - COMPARE_M_SIMD (iv[0], iv[1], c, d); + COMPARE_M_SIMD (r0, r1, r2, r3); } } @@ -719,26 +704,17 @@ static void m03100s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 */ 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]; - - u32 salt_buf1[4]; - 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]; - u32 salt_buf2[4]; - - salt_buf2[0] = 0; - salt_buf2[1] = 0; - salt_buf2[2] = 0; - salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_word_len = (salt_len + pw_len) * 2; @@ -779,14 +755,6 @@ static void m03100s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 w1_t[1] |= salt_buf1[1]; w1_t[2] |= salt_buf1[2]; w1_t[3] |= salt_buf1[3]; - w2_t[0] |= salt_buf2[0]; - w2_t[1] |= salt_buf2[1]; - w2_t[2] |= salt_buf2[2]; - w2_t[3] |= salt_buf2[3]; - w3_t[0] = 0; - w3_t[1] = 0; - w3_t[2] = 0; - w3_t[3] = 0; u32x dst[16]; @@ -924,10 +892,12 @@ static void m03100s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 * cmp */ - u32x c = 0; - u32x d = 0; + const u32x r0 = iv[0]; + const u32x r1 = iv[1]; + const u32x r2 = 0; + const u32x r3 = 0; - COMPARE_S_SIMD (iv[0], iv[1], c, d); + COMPARE_S_SIMD (r0, r1, r2, r3); } }