arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-03 20:31:08 +00:00
Code Issues Releases Wiki Activity

Cleanup -m 1700 kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-03-04 14:09:34 +01:00
parent 180f71f291
commit 2bb1116be7
2 changed files with 166 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenCL/m01700_a0.cl
View File

@ -160,18 +160,16 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 pw_buf0[4]; 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]; u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf0[0] = pws[gid].i[0];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf0[1] = pws[gid].i[1];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf0[2] = pws[gid].i[2];
pw_buf1[3] = pws[gid].i[ 7]; 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; const u32 pw_len = pws[gid].pw_len;
@ -191,7 +189,7 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
append_0x80_2x4_VV (w0, w1, out_len); append_0x80_2x4_VV (w0, w1, out_len);
/** /**
* SHA512 * sha512
*/ */
u32x w0_t[4]; u32x w0_t[4];
@ -263,18 +261,16 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 pw_buf0[4]; 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]; u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf0[0] = pws[gid].i[0];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf0[1] = pws[gid].i[1];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf0[2] = pws[gid].i[2];
pw_buf1[3] = pws[gid].i[ 7]; 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; const u32 pw_len = pws[gid].pw_len;
@ -306,7 +302,7 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
append_0x80_2x4_VV (w0, w1, out_len); append_0x80_2x4_VV (w0, w1, out_len);
/** /**
* SHA512 * sha512
*/ */
u32x w0_t[4]; u32x w0_t[4];

332
OpenCL/m01700_a1.cl
View File

@ -5,6 +5,8 @@
#define _SHA512_ #define _SHA512_
#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -16,9 +18,7 @@
#include "include/kernel_functions.c" #include "include/kernel_functions.c"
#include "OpenCL/types_ocl.c" #include "OpenCL/types_ocl.c"
#include "OpenCL/common.c" #include "OpenCL/common.c"
#include "OpenCL/simd.c"
#define COMPARE_S "OpenCL/check_single_comp4.c"
#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] = __constant u64 k_sha512[80] =
{ {
@ -44,33 +44,33 @@ __constant u64 k_sha512[80] =
SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f, SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
}; };
static void sha512_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u64 digest[8]) static void sha512_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u64x digest[8])
{ {
u64 w0_t = hl32_to_64 (w0[0], w0[1]); u64x w0_t = hl32_to_64 (w0[0], w0[1]);
u64 w1_t = hl32_to_64 (w0[2], w0[3]); u64x w1_t = hl32_to_64 (w0[2], w0[3]);
u64 w2_t = hl32_to_64 (w1[0], w1[1]); u64x w2_t = hl32_to_64 (w1[0], w1[1]);
u64 w3_t = hl32_to_64 (w1[2], w1[3]); u64x w3_t = hl32_to_64 (w1[2], w1[3]);
u64 w4_t = hl32_to_64 (w2[0], w2[1]); u64x w4_t = hl32_to_64 (w2[0], w2[1]);
u64 w5_t = hl32_to_64 (w2[2], w2[3]); u64x w5_t = hl32_to_64 (w2[2], w2[3]);
u64 w6_t = hl32_to_64 (w3[0], w3[1]); u64x w6_t = hl32_to_64 (w3[0], w3[1]);
u64 w7_t = 0; u64x w7_t = 0;
u64 w8_t = 0; u64x w8_t = 0;
u64 w9_t = 0; u64x w9_t = 0;
u64 wa_t = 0; u64x wa_t = 0;
u64 wb_t = 0; u64x wb_t = 0;
u64 wc_t = 0; u64x wc_t = 0;
u64 wd_t = 0; u64x wd_t = 0;
u64 we_t = 0; u64x we_t = 0;
u64 wf_t = hl32_to_64 (w3[2], w3[3]); u64x wf_t = hl32_to_64 (w3[2], w3[3]);
u64 a = digest[0]; u64x a = digest[0];
u64 b = digest[1]; u64x b = digest[1];
u64 c = digest[2]; u64x c = digest[2];
u64 d = digest[3]; u64x d = digest[3];
u64 e = digest[4]; u64x e = digest[4];
u64 f = digest[5]; u64x f = digest[5];
u64 g = digest[6]; u64x g = digest[6];
u64 h = digest[7]; u64x h = digest[7];
#define ROUND_EXPAND() \ #define ROUND_EXPAND() \
{ \ { \
@ -157,92 +157,75 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 wordl0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
wordl0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[0];
wordl0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[1];
wordl0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[2];
wordl0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[3];
pw_buf1[0] = pws[gid].i[4];
u32 wordl1[4]; pw_buf1[1] = pws[gid].i[5];
pw_buf1[2] = pws[gid].i[6];
wordl1[0] = pws[gid].i[ 4]; pw_buf1[3] = pws[gid].i[7];
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 wordl3[4];
wordl3[0] = 0;
wordl3[1] = 0;
wordl3[2] = 0;
wordl3[3] = 0;
const u32 pw_l_len = pws[gid].pw_len; const u32 pw_l_len = pws[gid].pw_len;
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
{
append_0x80_2x4 (wordl0, wordl1, pw_l_len);
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* loop * 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;
u32 wordr0[4]; /**
* concat password candidate
*/
wordr0[0] = combs_buf[il_pos].i[0]; u32x wordl0[4] = { 0 };
wordr0[1] = combs_buf[il_pos].i[1]; u32x wordl1[4] = { 0 };
wordr0[2] = combs_buf[il_pos].i[2]; u32x wordl2[4] = { 0 };
wordr0[3] = combs_buf[il_pos].i[3]; u32x wordl3[4] = { 0 };
u32 wordr1[4]; 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];
wordr1[0] = combs_buf[il_pos].i[4]; u32x wordr0[4] = { 0 };
wordr1[1] = combs_buf[il_pos].i[5]; u32x wordr1[4] = { 0 };
wordr1[2] = combs_buf[il_pos].i[6]; u32x wordr2[4] = { 0 };
wordr1[3] = combs_buf[il_pos].i[7]; u32x wordr3[4] = { 0 };
u32 wordr2[4]; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[0] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[1] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr2[2] = 0; wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
wordr2[3] = 0; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
u32 wordr3[4]; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr3[0] = 0;
wordr3[1] = 0;
wordr3[2] = 0;
wordr3[3] = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT) if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{ {
append_0x80_2x4 (wordr0, wordr1, pw_r_len); switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
}
switch_buffer_by_offset_le (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];
u32 w1[4]; u32x w1[4];
u32 w2[4]; u32x w2[4];
u32 w3[4]; u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
@ -262,13 +245,13 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
/** /**
* SHA512 * sha512
*/ */
u32 w0_t[4]; u32x w0_t[4];
u32 w1_t[4]; u32x w1_t[4];
u32 w2_t[4]; u32x w2_t[4];
u32 w3_t[4]; u32x w3_t[4];
w0_t[0] = swap32 (w0[0]); w0_t[0] = swap32 (w0[0]);
w0_t[1] = swap32 (w0[1]); w0_t[1] = swap32 (w0[1]);
@ -287,7 +270,7 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3_t[2] = 0; w3_t[2] = 0;
w3_t[3] = pw_len * 8; w3_t[3] = pw_len * 8;
u64 digest[8]; u64x digest[8];
digest[0] = SHA512M_A; digest[0] = SHA512M_A;
digest[1] = SHA512M_B; digest[1] = SHA512M_B;
@ -300,13 +283,12 @@ __kernel void m01700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
sha512_transform (w0_t, w1_t, w2_t, w3_t, digest); sha512_transform (w0_t, w1_t, w2_t, w3_t, digest);
const u32x r0 = l32_from_64 (digest[7]);
const u32x r1 = h32_from_64 (digest[7]);
const u32x r2 = l32_from_64 (digest[3]);
const u32x r3 = h32_from_64 (digest[3]);
const u32 r0 = l32_from_64 (digest[7]); COMPARE_M_SIMD (r0, r1, r2, r3);
const u32 r1 = h32_from_64 (digest[7]);
const u32 r2 = l32_from_64 (digest[3]);
const u32 r3 = h32_from_64 (digest[3]);
#include COMPARE_M
} }
} }
@ -334,43 +316,20 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 wordl0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
wordl0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[0];
wordl0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[1];
wordl0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[2];
wordl0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[3];
pw_buf1[0] = pws[gid].i[4];
u32 wordl1[4]; pw_buf1[1] = pws[gid].i[5];
pw_buf1[2] = pws[gid].i[6];
wordl1[0] = pws[gid].i[ 4]; pw_buf1[3] = pws[gid].i[7];
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 wordl3[4];
wordl3[0] = 0;
wordl3[1] = 0;
wordl3[2] = 0;
wordl3[3] = 0;
const u32 pw_l_len = pws[gid].pw_len; const u32 pw_l_len = pws[gid].pw_len;
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
{
append_0x80_2x4 (wordl0, wordl1, pw_l_len);
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* digest * digest
*/ */
@ -387,51 +346,57 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* loop * 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;
u32 wordr0[4]; /**
* concat password candidate
*/
wordr0[0] = combs_buf[il_pos].i[0]; u32x wordl0[4] = { 0 };
wordr0[1] = combs_buf[il_pos].i[1]; u32x wordl1[4] = { 0 };
wordr0[2] = combs_buf[il_pos].i[2]; u32x wordl2[4] = { 0 };
wordr0[3] = combs_buf[il_pos].i[3]; u32x wordl3[4] = { 0 };
u32 wordr1[4]; 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];
wordr1[0] = combs_buf[il_pos].i[4]; u32x wordr0[4] = { 0 };
wordr1[1] = combs_buf[il_pos].i[5]; u32x wordr1[4] = { 0 };
wordr1[2] = combs_buf[il_pos].i[6]; u32x wordr2[4] = { 0 };
wordr1[3] = combs_buf[il_pos].i[7]; u32x wordr3[4] = { 0 };
u32 wordr2[4]; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[0] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[1] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr2[2] = 0; wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
wordr2[3] = 0; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
u32 wordr3[4]; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr3[0] = 0;
wordr3[1] = 0;
wordr3[2] = 0;
wordr3[3] = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT) if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{ {
append_0x80_2x4 (wordr0, wordr1, pw_r_len); switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
}
switch_buffer_by_offset_le (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];
u32 w1[4]; u32x w1[4];
u32 w2[4]; u32x w2[4];
u32 w3[4]; u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
@ -451,13 +416,13 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
/** /**
* SHA512 * sha512
*/ */
u32 w0_t[4]; u32x w0_t[4];
u32 w1_t[4]; u32x w1_t[4];
u32 w2_t[4]; u32x w2_t[4];
u32 w3_t[4]; u32x w3_t[4];
w0_t[0] = swap32 (w0[0]); w0_t[0] = swap32 (w0[0]);
w0_t[1] = swap32 (w0[1]); w0_t[1] = swap32 (w0[1]);
@ -476,7 +441,7 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3_t[2] = 0; w3_t[2] = 0;
w3_t[3] = pw_len * 8; w3_t[3] = pw_len * 8;
u64 digest[8]; u64x digest[8];
digest[0] = SHA512M_A; digest[0] = SHA512M_A;
digest[1] = SHA512M_B; digest[1] = SHA512M_B;
@ -489,13 +454,12 @@ __kernel void m01700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
sha512_transform (w0_t, w1_t, w2_t, w3_t, digest); sha512_transform (w0_t, w1_t, w2_t, w3_t, digest);
const u32x r0 = l32_from_64 (digest[7]);
const u32x r1 = h32_from_64 (digest[7]);
const u32x r2 = l32_from_64 (digest[3]);
const u32x r3 = h32_from_64 (digest[3]);
const u32 r0 = l32_from_64 (digest[7]); COMPARE_S_SIMD (r0, r1, r2, r3);
const u32 r1 = h32_from_64 (digest[7]);
const u32 r2 = l32_from_64 (digest[3]);
const u32 r3 = h32_from_64 (digest[3]);
#include COMPARE_S
} }
} }