X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm07100.cl;h=aaafd49b14a9aa27f04f26baafdc734f4eec632e;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=17e84859ac95a9fdd4291290aabc52ad31ca9701;hpb=a62b7ed06e9663a1e330983e29110cfbcf37122a;p=hashcat.git diff --git a/OpenCL/m07100.cl b/OpenCL/m07100.cl index 17e8485..aaafd49 100644 --- a/OpenCL/m07100.cl +++ b/OpenCL/m07100.cl @@ -5,20 +5,17 @@ #define _PBKDF2_SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#define NEW_SIMD_CODE -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 +#include "inc_vendor.cl" +#include "inc_hash_constants.h" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#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" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { @@ -44,7 +41,7 @@ __constant u64 k_sha512[80] = SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f, }; -static void sha512_transform (const u64 w[16], u64 dgst[8]) +void sha512_transform_S (const u64 w[16], u64 dgst[8]) { u64 a = dgst[0]; u64 b = dgst[1]; @@ -72,6 +69,197 @@ static void sha512_transform (const u64 w[16], u64 dgst[8]) u64 we_t = w[14]; u64 wf_t = w[15]; + #define ROUND_EXPAND_S() \ + { \ + w0_t = SHA512_EXPAND_S (we_t, w9_t, w1_t, w0_t); \ + w1_t = SHA512_EXPAND_S (wf_t, wa_t, w2_t, w1_t); \ + w2_t = SHA512_EXPAND_S (w0_t, wb_t, w3_t, w2_t); \ + w3_t = SHA512_EXPAND_S (w1_t, wc_t, w4_t, w3_t); \ + w4_t = SHA512_EXPAND_S (w2_t, wd_t, w5_t, w4_t); \ + w5_t = SHA512_EXPAND_S (w3_t, we_t, w6_t, w5_t); \ + w6_t = SHA512_EXPAND_S (w4_t, wf_t, w7_t, w6_t); \ + w7_t = SHA512_EXPAND_S (w5_t, w0_t, w8_t, w7_t); \ + w8_t = SHA512_EXPAND_S (w6_t, w1_t, w9_t, w8_t); \ + w9_t = SHA512_EXPAND_S (w7_t, w2_t, wa_t, w9_t); \ + wa_t = SHA512_EXPAND_S (w8_t, w3_t, wb_t, wa_t); \ + wb_t = SHA512_EXPAND_S (w9_t, w4_t, wc_t, wb_t); \ + wc_t = SHA512_EXPAND_S (wa_t, w5_t, wd_t, wc_t); \ + wd_t = SHA512_EXPAND_S (wb_t, w6_t, we_t, wd_t); \ + we_t = SHA512_EXPAND_S (wc_t, w7_t, wf_t, we_t); \ + wf_t = SHA512_EXPAND_S (wd_t, w8_t, w0_t, wf_t); \ + } + + #define ROUND_STEP_S(i) \ + { \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, a, b, c, d, e, f, g, h, w0_t, k_sha512[i + 0]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, h, a, b, c, d, e, f, g, w1_t, k_sha512[i + 1]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, g, h, a, b, c, d, e, f, w2_t, k_sha512[i + 2]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, f, g, h, a, b, c, d, e, w3_t, k_sha512[i + 3]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, e, f, g, h, a, b, c, d, w4_t, k_sha512[i + 4]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, d, e, f, g, h, a, b, c, w5_t, k_sha512[i + 5]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, c, d, e, f, g, h, a, b, w6_t, k_sha512[i + 6]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, b, c, d, e, f, g, h, a, w7_t, k_sha512[i + 7]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, a, b, c, d, e, f, g, h, w8_t, k_sha512[i + 8]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, h, a, b, c, d, e, f, g, w9_t, k_sha512[i + 9]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, g, h, a, b, c, d, e, f, wa_t, k_sha512[i + 10]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, f, g, h, a, b, c, d, e, wb_t, k_sha512[i + 11]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, e, f, g, h, a, b, c, d, wc_t, k_sha512[i + 12]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, d, e, f, g, h, a, b, c, wd_t, k_sha512[i + 13]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, c, d, e, f, g, h, a, b, we_t, k_sha512[i + 14]); \ + SHA512_STEP_S (SHA512_F0o, SHA512_F1o, b, c, d, e, f, g, h, a, wf_t, k_sha512[i + 15]); \ + } + + ROUND_STEP_S (0); + + #ifdef _unroll + #pragma unroll + #endif + for (int i = 16; i < 80; i += 16) + { + ROUND_EXPAND_S (); ROUND_STEP_S (i); + } + + dgst[0] += a; + dgst[1] += b; + dgst[2] += c; + dgst[3] += d; + dgst[4] += e; + dgst[5] += f; + dgst[6] += g; + dgst[7] += h; +} + +void hmac_sha512_run_S (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u64 dgst[8]) +{ + dgst[0] = ipad[0]; + dgst[1] = ipad[1]; + dgst[2] = ipad[2]; + dgst[3] = ipad[3]; + dgst[4] = ipad[4]; + dgst[5] = ipad[5]; + dgst[6] = ipad[6]; + dgst[7] = ipad[7]; + + sha512_transform_S (w1, dgst); + + u64 w[16]; + + w[ 0] = dgst[0]; + w[ 1] = dgst[1]; + w[ 2] = dgst[2]; + w[ 3] = dgst[3]; + w[ 4] = dgst[4]; + w[ 5] = dgst[5]; + w[ 6] = dgst[6]; + w[ 7] = dgst[7]; + w[ 8] = 0x8000000000000000; + w[ 9] = 0; + w[10] = 0; + w[11] = 0; + w[12] = 0; + w[13] = 0; + w[14] = 0; + w[15] = (128 + 64) * 8; + + dgst[0] = opad[0]; + dgst[1] = opad[1]; + dgst[2] = opad[2]; + dgst[3] = opad[3]; + dgst[4] = opad[4]; + dgst[5] = opad[5]; + dgst[6] = opad[6]; + dgst[7] = opad[7]; + + sha512_transform_S (w, dgst); +} + +void hmac_sha512_init_S (u64 w[16], u64 ipad[8], u64 opad[8]) +{ + w[ 0] ^= 0x3636363636363636; + w[ 1] ^= 0x3636363636363636; + w[ 2] ^= 0x3636363636363636; + w[ 3] ^= 0x3636363636363636; + w[ 4] ^= 0x3636363636363636; + w[ 5] ^= 0x3636363636363636; + w[ 6] ^= 0x3636363636363636; + w[ 7] ^= 0x3636363636363636; + w[ 8] ^= 0x3636363636363636; + w[ 9] ^= 0x3636363636363636; + w[10] ^= 0x3636363636363636; + w[11] ^= 0x3636363636363636; + w[12] ^= 0x3636363636363636; + w[13] ^= 0x3636363636363636; + w[14] ^= 0x3636363636363636; + w[15] ^= 0x3636363636363636; + + ipad[0] = SHA512M_A; + ipad[1] = SHA512M_B; + ipad[2] = SHA512M_C; + ipad[3] = SHA512M_D; + ipad[4] = SHA512M_E; + ipad[5] = SHA512M_F; + ipad[6] = SHA512M_G; + ipad[7] = SHA512M_H; + + sha512_transform_S (w, ipad); + + w[ 0] ^= 0x6a6a6a6a6a6a6a6a; + w[ 1] ^= 0x6a6a6a6a6a6a6a6a; + w[ 2] ^= 0x6a6a6a6a6a6a6a6a; + w[ 3] ^= 0x6a6a6a6a6a6a6a6a; + w[ 4] ^= 0x6a6a6a6a6a6a6a6a; + w[ 5] ^= 0x6a6a6a6a6a6a6a6a; + w[ 6] ^= 0x6a6a6a6a6a6a6a6a; + w[ 7] ^= 0x6a6a6a6a6a6a6a6a; + w[ 8] ^= 0x6a6a6a6a6a6a6a6a; + w[ 9] ^= 0x6a6a6a6a6a6a6a6a; + w[10] ^= 0x6a6a6a6a6a6a6a6a; + w[11] ^= 0x6a6a6a6a6a6a6a6a; + w[12] ^= 0x6a6a6a6a6a6a6a6a; + w[13] ^= 0x6a6a6a6a6a6a6a6a; + w[14] ^= 0x6a6a6a6a6a6a6a6a; + w[15] ^= 0x6a6a6a6a6a6a6a6a; + + opad[0] = SHA512M_A; + opad[1] = SHA512M_B; + opad[2] = SHA512M_C; + opad[3] = SHA512M_D; + opad[4] = SHA512M_E; + opad[5] = SHA512M_F; + opad[6] = SHA512M_G; + opad[7] = SHA512M_H; + + sha512_transform_S (w, opad); +} + +void sha512_transform_V (const u64x w[16], u64x dgst[8]) +{ + u64x a = dgst[0]; + u64x b = dgst[1]; + u64x c = dgst[2]; + u64x d = dgst[3]; + u64x e = dgst[4]; + u64x f = dgst[5]; + u64x g = dgst[6]; + u64x h = dgst[7]; + + u64x w0_t = w[ 0]; + u64x w1_t = w[ 1]; + u64x w2_t = w[ 2]; + u64x w3_t = w[ 3]; + u64x w4_t = w[ 4]; + u64x w5_t = w[ 5]; + u64x w6_t = w[ 6]; + u64x w7_t = w[ 7]; + u64x w8_t = w[ 8]; + u64x w9_t = w[ 9]; + u64x wa_t = w[10]; + u64x wb_t = w[11]; + u64x wc_t = w[12]; + u64x wd_t = w[13]; + u64x we_t = w[14]; + u64x wf_t = w[15]; + #define ROUND_EXPAND() \ { \ w0_t = SHA512_EXPAND (we_t, w9_t, w1_t, w0_t); \ @@ -114,7 +302,9 @@ static void sha512_transform (const u64 w[16], u64 dgst[8]) ROUND_STEP (0); - //#pragma unroll + #ifdef _unroll + #pragma unroll + #endif for (int i = 16; i < 80; i += 16) { ROUND_EXPAND (); ROUND_STEP (i); @@ -130,7 +320,7 @@ static void sha512_transform (const u64 w[16], u64 dgst[8]) dgst[7] += h; } -static void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u64 dgst[8]) +void hmac_sha512_run_V (const u64x w1[16], const u64x ipad[8], const u64x opad[8], u64x dgst[8]) { dgst[0] = ipad[0]; dgst[1] = ipad[1]; @@ -141,9 +331,42 @@ static void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u6 dgst[6] = ipad[6]; dgst[7] = ipad[7]; - sha512_transform (w1, dgst); + sha512_transform_V (w1, dgst); - u64 w[16]; + u64x w[16]; + + w[ 0] = dgst[0]; + w[ 1] = dgst[1]; + w[ 2] = dgst[2]; + w[ 3] = dgst[3]; + w[ 4] = dgst[4]; + w[ 5] = dgst[5]; + w[ 6] = dgst[6]; + w[ 7] = dgst[7]; + w[ 8] = 0x8000000000000000; + w[ 9] = 0; + w[10] = 0; + w[11] = 0; + w[12] = 0; + w[13] = 0; + w[14] = 0; + w[15] = (128 + 64) * 8; + + dgst[0] = opad[0]; + dgst[1] = opad[1]; + dgst[2] = opad[2]; + dgst[3] = opad[3]; + dgst[4] = opad[4]; + dgst[5] = opad[5]; + dgst[6] = opad[6]; + dgst[7] = opad[7]; + + sha512_transform_V (w, dgst); +} + +void hmac_sha512_run_V_x (const u64x ipad[8], const u64x opad[8], u64x dgst[8]) +{ + u64x w[16]; w[ 0] = dgst[0]; w[ 1] = dgst[1]; @@ -162,6 +385,26 @@ static void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u6 w[14] = 0; w[15] = (128 + 64) * 8; + dgst[0] = ipad[0]; + dgst[1] = ipad[1]; + dgst[2] = ipad[2]; + dgst[3] = ipad[3]; + dgst[4] = ipad[4]; + dgst[5] = ipad[5]; + dgst[6] = ipad[6]; + dgst[7] = ipad[7]; + + sha512_transform_V (w, dgst); + + w[ 0] = dgst[0]; + w[ 1] = dgst[1]; + w[ 2] = dgst[2]; + w[ 3] = dgst[3]; + w[ 4] = dgst[4]; + w[ 5] = dgst[5]; + w[ 6] = dgst[6]; + w[ 7] = dgst[7]; + dgst[0] = opad[0]; dgst[1] = opad[1]; dgst[2] = opad[2]; @@ -171,10 +414,10 @@ static void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u6 dgst[6] = opad[6]; dgst[7] = opad[7]; - sha512_transform (w, dgst); + sha512_transform_V (w, dgst); } -static void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8]) +void hmac_sha512_init_V (u64x w[16], u64x ipad[8], u64x opad[8]) { w[ 0] ^= 0x3636363636363636; w[ 1] ^= 0x3636363636363636; @@ -202,7 +445,7 @@ static void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8]) ipad[6] = SHA512M_G; ipad[7] = SHA512M_H; - sha512_transform (w, ipad); + sha512_transform_V (w, ipad); w[ 0] ^= 0x6a6a6a6a6a6a6a6a; w[ 1] ^= 0x6a6a6a6a6a6a6a6a; @@ -230,10 +473,10 @@ static void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8]) opad[6] = SHA512M_G; opad[7] = SHA512M_H; - sha512_transform (w, opad); + sha512_transform_V (w, opad); } -__kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *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 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { /** * base @@ -245,31 +488,31 @@ __kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf u32 w0[4]; - w0[0] = swap32 (pws[gid].i[ 0]); - w0[1] = swap32 (pws[gid].i[ 1]); - w0[2] = swap32 (pws[gid].i[ 2]); - w0[3] = swap32 (pws[gid].i[ 3]); + w0[0] = swap32_S (pws[gid].i[ 0]); + w0[1] = swap32_S (pws[gid].i[ 1]); + w0[2] = swap32_S (pws[gid].i[ 2]); + w0[3] = swap32_S (pws[gid].i[ 3]); u32 w1[4]; - w1[0] = swap32 (pws[gid].i[ 4]); - w1[1] = swap32 (pws[gid].i[ 5]); - w1[2] = swap32 (pws[gid].i[ 6]); - w1[3] = swap32 (pws[gid].i[ 7]); + w1[0] = swap32_S (pws[gid].i[ 4]); + w1[1] = swap32_S (pws[gid].i[ 5]); + w1[2] = swap32_S (pws[gid].i[ 6]); + w1[3] = swap32_S (pws[gid].i[ 7]); u32 w2[4]; - w2[0] = swap32 (pws[gid].i[ 8]); - w2[1] = swap32 (pws[gid].i[ 9]); - w2[2] = swap32 (pws[gid].i[10]); - w2[3] = swap32 (pws[gid].i[11]); + w2[0] = swap32_S (pws[gid].i[ 8]); + w2[1] = swap32_S (pws[gid].i[ 9]); + w2[2] = swap32_S (pws[gid].i[10]); + w2[3] = swap32_S (pws[gid].i[11]); u32 w3[4]; - w3[0] = swap32 (pws[gid].i[12]); - w3[1] = swap32 (pws[gid].i[13]); - w3[2] = swap32 (pws[gid].i[14]); - w3[3] = swap32 (pws[gid].i[15]); + w3[0] = swap32_S (pws[gid].i[12]); + w3[1] = swap32_S (pws[gid].i[13]); + w3[2] = swap32_S (pws[gid].i[14]); + w3[3] = swap32_S (pws[gid].i[15]); /** * salt @@ -279,33 +522,33 @@ __kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf u32 salt_len = salt_bufs[salt_pos].salt_len; - esalt_buf[ 0] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[ 0]), swap32 (esalt_bufs[salt_pos].salt_buf[ 1])); - esalt_buf[ 1] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[ 2]), swap32 (esalt_bufs[salt_pos].salt_buf[ 3])); - esalt_buf[ 2] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[ 4]), swap32 (esalt_bufs[salt_pos].salt_buf[ 5])); - esalt_buf[ 3] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[ 6]), swap32 (esalt_bufs[salt_pos].salt_buf[ 7])); - esalt_buf[ 4] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[ 8]), swap32 (esalt_bufs[salt_pos].salt_buf[ 9])); - esalt_buf[ 5] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[10]), swap32 (esalt_bufs[salt_pos].salt_buf[11])); - esalt_buf[ 6] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[12]), swap32 (esalt_bufs[salt_pos].salt_buf[13])); - esalt_buf[ 7] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[14]), swap32 (esalt_bufs[salt_pos].salt_buf[15])); - esalt_buf[ 8] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[16]), swap32 (esalt_bufs[salt_pos].salt_buf[17])); - esalt_buf[ 9] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[18]), swap32 (esalt_bufs[salt_pos].salt_buf[19])); - esalt_buf[10] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[20]), swap32 (esalt_bufs[salt_pos].salt_buf[21])); - esalt_buf[11] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[22]), swap32 (esalt_bufs[salt_pos].salt_buf[23])); - esalt_buf[12] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[24]), swap32 (esalt_bufs[salt_pos].salt_buf[25])); - esalt_buf[13] = hl32_to_64 (swap32 (esalt_bufs[salt_pos].salt_buf[26]), swap32 (esalt_bufs[salt_pos].salt_buf[27])); + esalt_buf[ 0] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[ 0]), swap32_S (esalt_bufs[salt_pos].salt_buf[ 1])); + esalt_buf[ 1] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[ 2]), swap32_S (esalt_bufs[salt_pos].salt_buf[ 3])); + esalt_buf[ 2] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[ 4]), swap32_S (esalt_bufs[salt_pos].salt_buf[ 5])); + esalt_buf[ 3] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[ 6]), swap32_S (esalt_bufs[salt_pos].salt_buf[ 7])); + esalt_buf[ 4] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[ 8]), swap32_S (esalt_bufs[salt_pos].salt_buf[ 9])); + esalt_buf[ 5] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[10]), swap32_S (esalt_bufs[salt_pos].salt_buf[11])); + esalt_buf[ 6] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[12]), swap32_S (esalt_bufs[salt_pos].salt_buf[13])); + esalt_buf[ 7] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[14]), swap32_S (esalt_bufs[salt_pos].salt_buf[15])); + esalt_buf[ 8] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[16]), swap32_S (esalt_bufs[salt_pos].salt_buf[17])); + esalt_buf[ 9] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[18]), swap32_S (esalt_bufs[salt_pos].salt_buf[19])); + esalt_buf[10] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[20]), swap32_S (esalt_bufs[salt_pos].salt_buf[21])); + esalt_buf[11] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[22]), swap32_S (esalt_bufs[salt_pos].salt_buf[23])); + esalt_buf[12] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[24]), swap32_S (esalt_bufs[salt_pos].salt_buf[25])); + esalt_buf[13] = hl32_to_64_S (swap32_S (esalt_bufs[salt_pos].salt_buf[26]), swap32_S (esalt_bufs[salt_pos].salt_buf[27])); esalt_buf[14] = 0; esalt_buf[15] = (128 + salt_len + 4) * 8; u64 w[16]; - w[ 0] = hl32_to_64 (w0[0], w0[1]); - w[ 1] = hl32_to_64 (w0[2], w0[3]); - w[ 2] = hl32_to_64 (w1[0], w1[1]); - w[ 3] = hl32_to_64 (w1[2], w1[3]); - w[ 4] = hl32_to_64 (w2[0], w2[1]); - w[ 5] = hl32_to_64 (w2[2], w2[3]); - w[ 6] = hl32_to_64 (w3[0], w3[1]); - w[ 7] = hl32_to_64 (w3[2], w3[3]); + w[ 0] = hl32_to_64_S (w0[0], w0[1]); + w[ 1] = hl32_to_64_S (w0[2], w0[3]); + w[ 2] = hl32_to_64_S (w1[0], w1[1]); + w[ 3] = hl32_to_64_S (w1[2], w1[3]); + w[ 4] = hl32_to_64_S (w2[0], w2[1]); + w[ 5] = hl32_to_64_S (w2[2], w2[3]); + w[ 6] = hl32_to_64_S (w3[0], w3[1]); + w[ 7] = hl32_to_64_S (w3[2], w3[3]); w[ 8] = 0; w[ 9] = 0; w[10] = 0; @@ -318,7 +561,7 @@ __kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf u64 ipad[8]; u64 opad[8]; - hmac_init (w, ipad, opad); + hmac_sha512_init_S (w, ipad, opad); tmps[gid].ipad[0] = ipad[0]; tmps[gid].ipad[1] = ipad[1]; @@ -342,7 +585,7 @@ __kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf { u64 dgst[8]; - hmac_run (esalt_buf, ipad, opad, dgst); + hmac_sha512_run_S (esalt_buf, ipad, opad, dgst); tmps[gid].dgst[i + 0] = dgst[0]; tmps[gid].dgst[i + 1] = dgst[1]; @@ -364,112 +607,72 @@ __kernel void m07100_init (__global pw_t *pws, __global kernel_rule_t *rules_buf } } -__kernel void m07100_loop (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *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 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m07100_loop (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { const u32 gid = get_global_id (0); if (gid >= gid_max) return; - u64 ipad[8]; - - ipad[0] = tmps[gid].ipad[0]; - ipad[1] = tmps[gid].ipad[1]; - ipad[2] = tmps[gid].ipad[2]; - ipad[3] = tmps[gid].ipad[3]; - ipad[4] = tmps[gid].ipad[4]; - ipad[5] = tmps[gid].ipad[5]; - ipad[6] = tmps[gid].ipad[6]; - ipad[7] = tmps[gid].ipad[7]; - - u64 opad[8]; - - opad[0] = tmps[gid].opad[0]; - opad[1] = tmps[gid].opad[1]; - opad[2] = tmps[gid].opad[2]; - opad[3] = tmps[gid].opad[3]; - opad[4] = tmps[gid].opad[4]; - opad[5] = tmps[gid].opad[5]; - opad[6] = tmps[gid].opad[6]; - opad[7] = tmps[gid].opad[7]; + u64x ipad[8]; + u64x opad[8]; + + ipad[0] = pack64v (tmps, ipad, gid, 0); + ipad[1] = pack64v (tmps, ipad, gid, 1); + ipad[2] = pack64v (tmps, ipad, gid, 2); + ipad[3] = pack64v (tmps, ipad, gid, 3); + ipad[4] = pack64v (tmps, ipad, gid, 4); + ipad[5] = pack64v (tmps, ipad, gid, 5); + ipad[6] = pack64v (tmps, ipad, gid, 6); + ipad[7] = pack64v (tmps, ipad, gid, 7); + + opad[0] = pack64v (tmps, opad, gid, 0); + opad[1] = pack64v (tmps, opad, gid, 1); + opad[2] = pack64v (tmps, opad, gid, 2); + opad[3] = pack64v (tmps, opad, gid, 3); + opad[4] = pack64v (tmps, opad, gid, 4); + opad[5] = pack64v (tmps, opad, gid, 5); + opad[6] = pack64v (tmps, opad, gid, 6); + opad[7] = pack64v (tmps, opad, gid, 7); for (u32 i = 0; i < 8; i += 8) { - u64 dgst[8]; + u64x dgst[8]; - dgst[0] = tmps[gid].dgst[i + 0]; - dgst[1] = tmps[gid].dgst[i + 1]; - dgst[2] = tmps[gid].dgst[i + 2]; - dgst[3] = tmps[gid].dgst[i + 3]; - dgst[4] = tmps[gid].dgst[i + 4]; - dgst[5] = tmps[gid].dgst[i + 5]; - dgst[6] = tmps[gid].dgst[i + 6]; - dgst[7] = tmps[gid].dgst[i + 7]; - - u64 out[8]; - - out[0] = tmps[gid].out[i + 0]; - out[1] = tmps[gid].out[i + 1]; - out[2] = tmps[gid].out[i + 2]; - out[3] = tmps[gid].out[i + 3]; - out[4] = tmps[gid].out[i + 4]; - out[5] = tmps[gid].out[i + 5]; - out[6] = tmps[gid].out[i + 6]; - out[7] = tmps[gid].out[i + 7]; + dgst[0] = pack64v (tmps, dgst, gid, 0); + dgst[1] = pack64v (tmps, dgst, gid, 1); + dgst[2] = pack64v (tmps, dgst, gid, 2); + dgst[3] = pack64v (tmps, dgst, gid, 3); + dgst[4] = pack64v (tmps, dgst, gid, 4); + dgst[5] = pack64v (tmps, dgst, gid, 5); + dgst[6] = pack64v (tmps, dgst, gid, 6); + dgst[7] = pack64v (tmps, dgst, gid, 7); for (u32 j = 0; j < loop_cnt; j++) { - u64 w[16]; - - w[ 0] = dgst[0]; - w[ 1] = dgst[1]; - w[ 2] = dgst[2]; - w[ 3] = dgst[3]; - w[ 4] = dgst[4]; - w[ 5] = dgst[5]; - w[ 6] = dgst[6]; - w[ 7] = dgst[7]; - w[ 8] = 0x8000000000000000; - w[ 9] = 0; - w[10] = 0; - w[11] = 0; - w[12] = 0; - w[13] = 0; - w[14] = 0; - w[15] = (128 + 64) * 8; - - hmac_run (w, ipad, opad, dgst); - - out[0] ^= dgst[0]; - out[1] ^= dgst[1]; - out[2] ^= dgst[2]; - out[3] ^= dgst[3]; - out[4] ^= dgst[4]; - out[5] ^= dgst[5]; - out[6] ^= dgst[6]; - out[7] ^= dgst[7]; + hmac_sha512_run_V_x (ipad, opad, dgst); + + unpackv_xor (tmps, out, gid, 0, dgst[0]); + unpackv_xor (tmps, out, gid, 1, dgst[1]); + unpackv_xor (tmps, out, gid, 2, dgst[2]); + unpackv_xor (tmps, out, gid, 3, dgst[3]); + unpackv_xor (tmps, out, gid, 4, dgst[4]); + unpackv_xor (tmps, out, gid, 5, dgst[5]); + unpackv_xor (tmps, out, gid, 6, dgst[6]); + unpackv_xor (tmps, out, gid, 7, dgst[7]); } - tmps[gid].dgst[i + 0] = dgst[0]; - tmps[gid].dgst[i + 1] = dgst[1]; - tmps[gid].dgst[i + 2] = dgst[2]; - tmps[gid].dgst[i + 3] = dgst[3]; - tmps[gid].dgst[i + 4] = dgst[4]; - tmps[gid].dgst[i + 5] = dgst[5]; - tmps[gid].dgst[i + 6] = dgst[6]; - tmps[gid].dgst[i + 7] = dgst[7]; - - tmps[gid].out[i + 0] = out[0]; - tmps[gid].out[i + 1] = out[1]; - tmps[gid].out[i + 2] = out[2]; - tmps[gid].out[i + 3] = out[3]; - tmps[gid].out[i + 4] = out[4]; - tmps[gid].out[i + 5] = out[5]; - tmps[gid].out[i + 6] = out[6]; - tmps[gid].out[i + 7] = out[7]; + unpackv (tmps, dgst, gid, 0, dgst[0]); + unpackv (tmps, dgst, gid, 1, dgst[1]); + unpackv (tmps, dgst, gid, 2, dgst[2]); + unpackv (tmps, dgst, gid, 3, dgst[3]); + unpackv (tmps, dgst, gid, 4, dgst[4]); + unpackv (tmps, dgst, gid, 5, dgst[5]); + unpackv (tmps, dgst, gid, 6, dgst[6]); + unpackv (tmps, dgst, gid, 7, dgst[7]); } } -__kernel void m07100_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *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 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m07100_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global pbkdf2_sha512_tmp_t *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 pbkdf2_sha512_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { /** * base @@ -484,10 +687,10 @@ __kernel void m07100_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf const u64 a = tmps[gid].out[0]; const u64 b = tmps[gid].out[1]; - const u32 r0 = l32_from_64 (a); - const u32 r1 = h32_from_64 (a); - const u32 r2 = l32_from_64 (b); - const u32 r3 = h32_from_64 (b); + const u32 r0 = l32_from_64_S (a); + const u32 r1 = h32_from_64_S (a); + const u32 r2 = l32_from_64_S (b); + const u32 r3 = h32_from_64_S (b); #define il_pos 0