arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00
Code Issues Releases Wiki Activity

Cleanup -m 83xx kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-04-16 11:28:15 +02:00
parent 0e52f9567f
commit 99524ce27f
3 changed files with 757 additions and 873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

460
OpenCL/m08300_a0.cl
View File

@ -167,18 +167,16 @@ __kernel void m08300_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;
@ -189,14 +187,12 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -205,14 +201,12 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -233,29 +227,27 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
/**
* salt
*/
u32x w0_t[4]; u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0[0]; w0_t[0] = w0[0];
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32x w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32x w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32x w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -265,33 +257,60 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0_t[0] |= out_len & 0xff; w0_t[0] |= out_len & 0xff;
/**
* salt
*/
u32x s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len);
w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
s0[0] = salt_buf0[0]; s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1]; s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2]; s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3]; s0[3] = salt_buf0[3];
u32x s1[4];
s1[0] = salt_buf1[0]; s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1]; s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2]; s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3]; s1[3] = salt_buf1[3];
u32x s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32x s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
@ -299,67 +318,43 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
u32x d0[4]; w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
d0[0] = domain_buf0[0]; w0_t[2] |= s0[2];
d0[1] = domain_buf0[1]; w0_t[3] |= s0[3];
d0[2] = domain_buf0[2]; w1_t[0] |= s1[0];
d0[3] = domain_buf0[3]; w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
u32x d1[4]; w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
d1[0] = domain_buf1[0]; w2_t[1] |= s2[1];
d1[1] = domain_buf1[1]; w2_t[2] |= s2[2];
d1[2] = domain_buf1[2]; w2_t[3] |= s2[3];
d1[3] = 0; w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
u32x d2[4]; w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
d2[0] = 0;
d2[1] = 0;
d2[2] = 0;
d2[3] = 0;
u32x d3[4];
d3[0] = 0;
d3[1] = 0;
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le_VV (d0, d1, d2, d3, 1 + out_len);
/** /**
* sha1 * sha1
*/ */
u32x w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); w0_t[2] = swap32 (w0_t[2]);
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]); w0_t[3] = swap32 (w0_t[3]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]); w1_t[0] = swap32 (w1_t[0]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]); w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
u32x w1_t2[4]; w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]); w2_t[1] = swap32 (w2_t[1]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]); w2_t[2] = swap32 (w2_t[2]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]); w2_t[3] = swap32 (w2_t[3]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]); w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
u32x w2_t2[4]; w3_t[2] = 0;
w3_t[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32x w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
u32x digest[5]; u32x digest[5];
@ -369,39 +364,28 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32x w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32x w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32x w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32x w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -409,7 +393,7 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]); COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]);
@ -441,18 +425,16 @@ __kernel void m08300_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;
@ -463,14 +445,12 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -479,14 +459,12 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -519,29 +497,27 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
/**
* salt
*/
u32x w0_t[4]; u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0[0]; w0_t[0] = w0[0];
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32x w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32x w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32x w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -551,33 +527,60 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0_t[0] |= out_len & 0xff; w0_t[0] |= out_len & 0xff;
/**
* salt
*/
u32x s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len);
w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
s0[0] = salt_buf0[0]; s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1]; s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2]; s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3]; s0[3] = salt_buf0[3];
u32x s1[4];
s1[0] = salt_buf1[0]; s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1]; s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2]; s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3]; s1[3] = salt_buf1[3];
u32x s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32x s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
@ -585,67 +588,43 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
u32x d0[4]; w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
d0[0] = domain_buf0[0]; w0_t[2] |= s0[2];
d0[1] = domain_buf0[1]; w0_t[3] |= s0[3];
d0[2] = domain_buf0[2]; w1_t[0] |= s1[0];
d0[3] = domain_buf0[3]; w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
u32x d1[4]; w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
d1[0] = domain_buf1[0]; w2_t[1] |= s2[1];
d1[1] = domain_buf1[1]; w2_t[2] |= s2[2];
d1[2] = domain_buf1[2]; w2_t[3] |= s2[3];
d1[3] = 0; w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
u32x d2[4]; w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
d2[0] = 0;
d2[1] = 0;
d2[2] = 0;
d2[3] = 0;
u32x d3[4];
d3[0] = 0;
d3[1] = 0;
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le_VV (d0, d1, d2, d3, 1 + out_len);
/** /**
* sha1 * sha1
*/ */
u32x w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); w0_t[2] = swap32 (w0_t[2]);
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]); w0_t[3] = swap32 (w0_t[3]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]); w1_t[0] = swap32 (w1_t[0]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]); w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
u32x w1_t2[4]; w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]); w2_t[1] = swap32 (w2_t[1]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]); w2_t[2] = swap32 (w2_t[2]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]); w2_t[3] = swap32 (w2_t[3]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]); w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
u32x w2_t2[4]; w3_t[2] = 0;
w3_t[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32x w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
u32x digest[5]; u32x digest[5];
@ -655,39 +634,28 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32x w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32x w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32x w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32x w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -695,7 +663,7 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]); COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]);

744
OpenCL/m08300_a1.cl
View File

@ -5,6 +5,8 @@
#define _SHA1_ #define _SHA1_
#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -16,34 +18,32 @@
#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" static void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5])
#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{ {
u32 A = digest[0]; u32x A = digest[0];
u32 B = digest[1]; u32x B = digest[1];
u32 C = digest[2]; u32x C = digest[2];
u32 D = digest[3]; u32x D = digest[3];
u32 E = digest[4]; u32x E = digest[4];
u32 w0_t = w0[0]; u32x w0_t = w0[0];
u32 w1_t = w0[1]; u32x w1_t = w0[1];
u32 w2_t = w0[2]; u32x w2_t = w0[2];
u32 w3_t = w0[3]; u32x w3_t = w0[3];
u32 w4_t = w1[0]; u32x w4_t = w1[0];
u32 w5_t = w1[1]; u32x w5_t = w1[1];
u32 w6_t = w1[2]; u32x w6_t = w1[2];
u32 w7_t = w1[3]; u32x w7_t = w1[3];
u32 w8_t = w2[0]; u32x w8_t = w2[0];
u32 w9_t = w2[1]; u32x w9_t = w2[1];
u32 wa_t = w2[2]; u32x wa_t = w2[2];
u32 wb_t = w2[3]; u32x wb_t = w2[3];
u32 wc_t = w3[0]; u32x wc_t = w3[0];
u32 wd_t = w3[1]; u32x wd_t = w3[1];
u32 we_t = w3[2]; u32x we_t = w3[2];
u32 wf_t = w3[3]; u32x wf_t = w3[3];
#undef K #undef K
#define K SHA1C00 #define K SHA1C00
@ -164,41 +164,20 @@ __kernel void m08300_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)
{
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* salt * salt
*/ */
@ -206,14 +185,12 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -222,14 +199,12 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -241,43 +216,57 @@ __kernel void m08300_m04 (__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]; /**
u32 wordr1[4]; * concat password candidate
u32 wordr2[4]; */
u32 wordr3[4];
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 };
wordr1[0] = combs_buf[il_pos].i[4];
wordr1[1] = combs_buf[il_pos].i[5]; wordl0[0] = pw_buf0[0];
wordr1[2] = combs_buf[il_pos].i[6]; wordl0[1] = pw_buf0[1];
wordr1[3] = combs_buf[il_pos].i[7]; wordl0[2] = pw_buf0[2];
wordr2[0] = 0; wordl0[3] = pw_buf0[3];
wordr2[1] = 0; wordl1[0] = pw_buf1[0];
wordr2[2] = 0; wordl1[1] = pw_buf1[1];
wordr2[3] = 0; wordl1[2] = pw_buf1[2];
wordr3[0] = 0; wordl1[3] = pw_buf1[3];
wordr3[1] = 0;
wordr3[2] = 0; u32x wordr0[4] = { 0 };
wordr3[3] = 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) 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];
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];
@ -296,29 +285,27 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3[2] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
u32 w0_t[4]; /**
* salt
*/
u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0[0]; w0_t[0] = w0[0];
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32 w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32 w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32 w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -328,103 +315,105 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0_t[0] |= pw_len & 0xff; w0_t[0] |= pw_len & 0xff;
/** u32x s0[4];
* salt u32x s1[4];
*/ u32x s2[4];
u32x s3[4];
u32 s0[4];
s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3];
u32 s1[4];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
u32 s2[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le (s0, s1, s2, s3, 1 + pw_len + domain_len + 1); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + pw_len);
u32 d0[4]; w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
d0[0] = domain_buf0[0]; s0[0] = salt_buf0[0];
d0[1] = domain_buf0[1]; s0[1] = salt_buf0[1];
d0[2] = domain_buf0[2]; s0[2] = salt_buf0[2];
d0[3] = domain_buf0[3]; s0[3] = salt_buf0[3];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
u32 d1[4]; switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + pw_len + domain_len + 1);
d1[0] = domain_buf1[0]; w0_t[0] |= s0[0];
d1[1] = domain_buf1[1]; w0_t[1] |= s0[1];
d1[2] = domain_buf1[2]; w0_t[2] |= s0[2];
d1[3] = 0; w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
u32 d2[4]; w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
d2[0] = 0; w1_t[3] |= s1[3];
d2[1] = 0; w2_t[0] |= s2[0];
d2[2] = 0; w2_t[1] |= s2[1];
d2[3] = 0; w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
u32 d3[4]; w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
d3[0] = 0; w3_t[2] |= s3[2];
d3[1] = 0; w3_t[3] |= s3[3];
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le (d0, d1, d2, d3, 1 + pw_len);
/** /**
* sha1 * sha1
*/ */
u32 w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t[2] = swap32 (w0_t[2]);
w0_t[3] = swap32 (w0_t[3]);
w1_t[0] = swap32 (w1_t[0]);
w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w2_t[1] = swap32 (w2_t[1]);
w2_t[2] = swap32 (w2_t[2]);
w2_t[3] = swap32 (w2_t[3]);
w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
w3_t[2] = 0;
w3_t[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); u32x digest[5];
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]);
u32 w1_t2[4];
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]);
u32 w2_t2[4];
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32 w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
u32 digest[5];
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -432,39 +421,28 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32 w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32 w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32 w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32 w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -472,15 +450,10 @@ __kernel void m08300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
const u32 r0 = digest[3]; COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]);
const u32 r1 = digest[4];
const u32 r2 = digest[2];
const u32 r3 = digest[1];
#include COMPARE_M
} }
} }
@ -508,41 +481,20 @@ __kernel void m08300_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)
{
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* salt * salt
*/ */
@ -550,14 +502,12 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -566,14 +516,12 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -597,43 +545,57 @@ __kernel void m08300_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]; /**
u32 wordr1[4]; * concat password candidate
u32 wordr2[4]; */
u32 wordr3[4];
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 };
wordr1[0] = combs_buf[il_pos].i[4];
wordr1[1] = combs_buf[il_pos].i[5]; wordl0[0] = pw_buf0[0];
wordr1[2] = combs_buf[il_pos].i[6]; wordl0[1] = pw_buf0[1];
wordr1[3] = combs_buf[il_pos].i[7]; wordl0[2] = pw_buf0[2];
wordr2[0] = 0; wordl0[3] = pw_buf0[3];
wordr2[1] = 0; wordl1[0] = pw_buf1[0];
wordr2[2] = 0; wordl1[1] = pw_buf1[1];
wordr2[3] = 0; wordl1[2] = pw_buf1[2];
wordr3[0] = 0; wordl1[3] = pw_buf1[3];
wordr3[1] = 0;
wordr3[2] = 0; u32x wordr0[4] = { 0 };
wordr3[3] = 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) 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];
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];
@ -652,29 +614,27 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w3[2] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
u32 w0_t[4]; /**
* salt
*/
u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0[0]; w0_t[0] = w0[0];
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32 w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32 w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32 w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -684,103 +644,105 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0_t[0] |= pw_len & 0xff; w0_t[0] |= pw_len & 0xff;
/** u32x s0[4];
* salt u32x s1[4];
*/ u32x s2[4];
u32x s3[4];
u32 s0[4];
s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3];
u32 s1[4];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
u32 s2[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le (s0, s1, s2, s3, 1 + pw_len + domain_len + 1); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + pw_len);
u32 d0[4]; w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] |= s3[2];
w3_t[3] |= s3[3];
d0[0] = domain_buf0[0]; s0[0] = salt_buf0[0];
d0[1] = domain_buf0[1]; s0[1] = salt_buf0[1];
d0[2] = domain_buf0[2]; s0[2] = salt_buf0[2];
d0[3] = domain_buf0[3]; s0[3] = salt_buf0[3];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
u32 d1[4]; switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + pw_len + domain_len + 1);
d1[0] = domain_buf1[0]; w0_t[0] |= s0[0];
d1[1] = domain_buf1[1]; w0_t[1] |= s0[1];
d1[2] = domain_buf1[2]; w0_t[2] |= s0[2];
d1[3] = 0; w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
u32 d2[4]; w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
d2[0] = 0; w1_t[3] |= s1[3];
d2[1] = 0; w2_t[0] |= s2[0];
d2[2] = 0; w2_t[1] |= s2[1];
d2[3] = 0; w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
u32 d3[4]; w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
d3[0] = 0; w3_t[2] |= s3[2];
d3[1] = 0; w3_t[3] |= s3[3];
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le (d0, d1, d2, d3, 1 + pw_len);
/** /**
* sha1 * sha1
*/ */
u32 w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t[2] = swap32 (w0_t[2]);
w0_t[3] = swap32 (w0_t[3]);
w1_t[0] = swap32 (w1_t[0]);
w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w2_t[1] = swap32 (w2_t[1]);
w2_t[2] = swap32 (w2_t[2]);
w2_t[3] = swap32 (w2_t[3]);
w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
w3_t[2] = 0;
w3_t[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); u32x digest[5];
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]);
u32 w1_t2[4];
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]);
u32 w2_t2[4];
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32 w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
u32 digest[5];
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -788,39 +750,28 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32 w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32 w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32 w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32 w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -828,15 +779,10 @@ __kernel void m08300_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
const u32 r0 = digest[3]; COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]);
const u32 r1 = digest[4];
const u32 r2 = digest[2];
const u32 r3 = digest[1];
#include COMPARE_S
} }
} }

426
OpenCL/m08300_a3.cl
View File

@ -164,14 +164,12 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -180,14 +178,12 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -196,68 +192,85 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 domain_len = salt_bufs[salt_pos].salt_buf_pc[ 7]; const u32 domain_len = salt_bufs[salt_pos].salt_buf_pc[ 7];
/** /**
* base * salt
*/ */
u32 s0[4]; u32 s0[4];
s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3];
u32 s1[4]; u32 s1[4];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
u32 s2[4]; u32 s2[4];
u32 s3[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le_S (s0, s1, s2, s3, 1 + pw_len + domain_len + 1); switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len);
u32 d0[4]; w0[0] |= s0[0];
w0[1] |= s0[1];
w0[2] |= s0[2];
w0[3] |= s0[3];
w1[0] |= s1[0];
w1[1] |= s1[1];
w1[2] |= s1[2];
w1[3] |= s1[3];
w2[0] |= s2[0];
w2[1] |= s2[1];
w2[2] |= s2[2];
w2[3] |= s2[3];
w3[0] |= s3[0];
w3[1] |= s3[1];
w3[2] |= s3[2];
w3[3] |= s3[3];
d0[0] = domain_buf0[0]; s0[0] = salt_buf0[0];
d0[1] = domain_buf0[1]; s0[1] = salt_buf0[1];
d0[2] = domain_buf0[2]; s0[2] = salt_buf0[2];
d0[3] = domain_buf0[3]; s0[3] = salt_buf0[3];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
u32 d1[4]; switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len + domain_len + 1);
d1[0] = domain_buf1[0]; w0[0] |= s0[0];
d1[1] = domain_buf1[1]; w0[1] |= s0[1];
d1[2] = domain_buf1[2]; w0[2] |= s0[2];
d1[3] = 0; w0[3] |= s0[3];
w1[0] |= s1[0];
u32 d2[4]; w1[1] |= s1[1];
w1[2] |= s1[2];
d2[0] = 0; w1[3] |= s1[3];
d2[1] = 0; w2[0] |= s2[0];
d2[2] = 0; w2[1] |= s2[1];
d2[3] = 0; w2[2] |= s2[2];
w2[3] |= s2[3];
u32 d3[4]; w3[0] |= s3[0];
w3[1] |= s3[1];
d3[0] = 0; w3[2] |= s3[2];
d3[1] = 0; w3[3] |= s3[3];
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le_S (d0, d1, d2, d3, 1 + pw_len);
/** /**
* loop * loop
@ -272,28 +285,22 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32x w0lr = w0l | w0r; const u32x w0lr = w0l | w0r;
u32x w0_t[4]; u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0lr; w0_t[0] = w0lr;
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32x w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32x w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32x w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -307,33 +314,22 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
* sha1 * sha1
*/ */
u32x w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); w0_t[2] = swap32 (w0_t[2]);
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]); w0_t[3] = swap32 (w0_t[3]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]); w1_t[0] = swap32 (w1_t[0]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]); w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
u32x w1_t2[4]; w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]); w2_t[1] = swap32 (w2_t[1]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]); w2_t[2] = swap32 (w2_t[2]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]); w2_t[3] = swap32 (w2_t[3]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]); w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
u32x w2_t2[4]; w3_t[2] = 0;
w3_t[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32x w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
u32x digest[5]; u32x digest[5];
@ -343,39 +339,28 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32x w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32x w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32x w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32x w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -383,7 +368,7 @@ static void m08300m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]); COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]);
@ -418,14 +403,12 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 salt_iter = salt_bufs[salt_pos].salt_iter; const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
u32 salt_buf0[4]; u32 salt_buf0[4];
u32 salt_buf1[4];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0]; salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2]; salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3]; 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[0] = salt_bufs[salt_pos].salt_buf[ 4];
salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5]; salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6]; salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@ -434,14 +417,12 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 salt_len = salt_bufs[salt_pos].salt_len; const u32 salt_len = salt_bufs[salt_pos].salt_len;
u32 domain_buf0[4]; u32 domain_buf0[4];
u32 domain_buf1[4];
domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0]; domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1]; domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2]; domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3]; domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
u32 domain_buf1[4];
domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4]; domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5]; domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6]; domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@ -450,68 +431,85 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 domain_len = salt_bufs[salt_pos].salt_buf_pc[ 7]; const u32 domain_len = salt_bufs[salt_pos].salt_buf_pc[ 7];
/** /**
* base * salt
*/ */
u32 s0[4]; u32 s0[4];
s0[0] = salt_buf0[0];
s0[1] = salt_buf0[1];
s0[2] = salt_buf0[2];
s0[3] = salt_buf0[3];
u32 s1[4]; u32 s1[4];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
u32 s2[4]; u32 s2[4];
u32 s3[4];
s0[0] = domain_buf0[0];
s0[1] = domain_buf0[1];
s0[2] = domain_buf0[2];
s0[3] = domain_buf0[3];
s1[0] = domain_buf1[0];
s1[1] = domain_buf1[1];
s1[2] = domain_buf1[2];
s1[3] = domain_buf1[3];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le_S (s0, s1, s2, s3, 1 + pw_len + domain_len + 1); switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len);
u32 d0[4]; w0[0] |= s0[0];
w0[1] |= s0[1];
w0[2] |= s0[2];
w0[3] |= s0[3];
w1[0] |= s1[0];
w1[1] |= s1[1];
w1[2] |= s1[2];
w1[3] |= s1[3];
w2[0] |= s2[0];
w2[1] |= s2[1];
w2[2] |= s2[2];
w2[3] |= s2[3];
w3[0] |= s3[0];
w3[1] |= s3[1];
w3[2] |= s3[2];
w3[3] |= s3[3];
d0[0] = domain_buf0[0]; s0[0] = salt_buf0[0];
d0[1] = domain_buf0[1]; s0[1] = salt_buf0[1];
d0[2] = domain_buf0[2]; s0[2] = salt_buf0[2];
d0[3] = domain_buf0[3]; s0[3] = salt_buf0[3];
s1[0] = salt_buf1[0];
s1[1] = salt_buf1[1];
s1[2] = salt_buf1[2];
s1[3] = salt_buf1[3];
s2[0] = 0;
s2[1] = 0;
s2[2] = 0;
s2[3] = 0;
s3[0] = 0;
s3[1] = 0;
s3[2] = 0;
s3[3] = 0;
u32 d1[4]; switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len + domain_len + 1);
d1[0] = domain_buf1[0]; w0[0] |= s0[0];
d1[1] = domain_buf1[1]; w0[1] |= s0[1];
d1[2] = domain_buf1[2]; w0[2] |= s0[2];
d1[3] = 0; w0[3] |= s0[3];
w1[0] |= s1[0];
u32 d2[4]; w1[1] |= s1[1];
w1[2] |= s1[2];
d2[0] = 0; w1[3] |= s1[3];
d2[1] = 0; w2[0] |= s2[0];
d2[2] = 0; w2[1] |= s2[1];
d2[3] = 0; w2[2] |= s2[2];
w2[3] |= s2[3];
u32 d3[4]; w3[0] |= s3[0];
w3[1] |= s3[1];
d3[0] = 0; w3[2] |= s3[2];
d3[1] = 0; w3[3] |= s3[3];
d3[2] = 0;
d3[3] = 0;
switch_buffer_by_offset_le_S (d0, d1, d2, d3, 1 + pw_len);
/** /**
* loop * loop
@ -526,28 +524,22 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32x w0lr = w0l | w0r; const u32x w0lr = w0l | w0r;
u32x w0_t[4]; u32x w0_t[4];
u32x w1_t[4];
u32x w2_t[4];
u32x w3_t[4];
w0_t[0] = w0lr; w0_t[0] = w0lr;
w0_t[1] = w0[1]; w0_t[1] = w0[1];
w0_t[2] = w0[2]; w0_t[2] = w0[2];
w0_t[3] = w0[3]; w0_t[3] = w0[3];
u32x w1_t[4];
w1_t[0] = w1[0]; w1_t[0] = w1[0];
w1_t[1] = w1[1]; w1_t[1] = w1[1];
w1_t[2] = w1[2]; w1_t[2] = w1[2];
w1_t[3] = w1[3]; w1_t[3] = w1[3];
u32x w2_t[4];
w2_t[0] = w2[0]; w2_t[0] = w2[0];
w2_t[1] = w2[1]; w2_t[1] = w2[1];
w2_t[2] = w2[2]; w2_t[2] = w2[2];
w2_t[3] = w2[3]; w2_t[3] = w2[3];
u32x w3_t[4];
w3_t[0] = w3[0]; w3_t[0] = w3[0];
w3_t[1] = w3[1]; w3_t[1] = w3[1];
w3_t[2] = w3[2]; w3_t[2] = w3[2];
@ -561,33 +553,22 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
* sha1 * sha1
*/ */
u32x w0_t2[4]; w0_t[0] = swap32 (w0_t[0]);
w0_t[1] = swap32 (w0_t[1]);
w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]); w0_t[2] = swap32 (w0_t[2]);
w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]); w0_t[3] = swap32 (w0_t[3]);
w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]); w1_t[0] = swap32 (w1_t[0]);
w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]); w1_t[1] = swap32 (w1_t[1]);
w1_t[2] = swap32 (w1_t[2]);
u32x w1_t2[4]; w1_t[3] = swap32 (w1_t[3]);
w2_t[0] = swap32 (w2_t[0]);
w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]); w2_t[1] = swap32 (w2_t[1]);
w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]); w2_t[2] = swap32 (w2_t[2]);
w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]); w2_t[3] = swap32 (w2_t[3]);
w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]); w3_t[0] = swap32 (w3_t[0]);
w3_t[1] = swap32 (w3_t[1]);
u32x w2_t2[4]; w3_t[2] = 0;
w3_t[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
u32x w3_t2[4];
w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
w3_t2[2] = 0;
w3_t2[3] = (1 + pw_len + domain_len + 1 + salt_len) * 8;
u32x digest[5]; u32x digest[5];
@ -597,39 +578,28 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
// iterations // iterations
for (u32 i = 0; i < salt_iter; i++) for (u32 i = 0; i < salt_iter; i++)
{ {
u32x w0_t3[4]; w0_t[0] = digest[0];
w0_t[1] = digest[1];
w0_t3[0] = digest[0]; w0_t[2] = digest[2];
w0_t3[1] = digest[1]; w0_t[3] = digest[3];
w0_t3[2] = digest[2]; w1_t[0] = digest[4];
w0_t3[3] = digest[3]; w1_t[1] = swap32 (salt_buf0[0]);
w1_t[2] = swap32 (salt_buf0[1]);
u32x w1_t3[4]; w1_t[3] = swap32 (salt_buf0[2]);
w2_t[0] = swap32 (salt_buf0[3]);
w1_t3[0] = digest[4]; w2_t[1] = swap32 (salt_buf1[0]);
w1_t3[1] = swap32 (salt_buf0[0]); w2_t[2] = swap32 (salt_buf1[1]);
w1_t3[2] = swap32 (salt_buf0[1]); w2_t[3] = swap32 (salt_buf1[2]);
w1_t3[3] = swap32 (salt_buf0[2]); w3_t[0] = swap32 (salt_buf1[3]);
w3_t[1] = 0;
u32x w2_t3[4]; w3_t[2] = 0;
w3_t[3] = (20 + salt_len) * 8;
w2_t3[0] = swap32 (salt_buf0[3]);
w2_t3[1] = swap32 (salt_buf1[0]);
w2_t3[2] = swap32 (salt_buf1[1]);
w2_t3[3] = swap32 (salt_buf1[2]);
u32x w3_t3[4];
w3_t3[0] = swap32 (salt_buf1[3]);
w3_t3[1] = 0;
w3_t3[2] = 0;
w3_t3[3] = (20 + salt_len) * 8;
digest[0] = SHA1M_A; digest[0] = SHA1M_A;
digest[1] = SHA1M_B; digest[1] = SHA1M_B;
@ -637,7 +607,7 @@ static void m08300s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
digest[3] = SHA1M_D; digest[3] = SHA1M_D;
digest[4] = SHA1M_E; digest[4] = SHA1M_E;
sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest); sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
} }
COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]); COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]);