arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 18:08:20 +00:00
Code Issues Releases Wiki Activity

Cleanup -m 85xx kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-04-16 17:39:16 +02:00
parent 8df278fc20
commit 97ac22e5e1
3 changed files with 202 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenCL/m08500_a0.cl
View File

@ -575,14 +575,12 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
*/ */
u32 pw_buf0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = 0; pw_buf0[2] = 0;
pw_buf0[3] = 0; pw_buf0[3] = 0;
u32 pw_buf1[4];
pw_buf1[0] = 0; pw_buf1[0] = 0;
pw_buf1[1] = 0; pw_buf1[1] = 0;
pw_buf1[2] = 0; pw_buf1[2] = 0;
@ -610,9 +608,11 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
u32x w2[4] = { 0 }; u32x w2[4] = { 0 };
u32x w3[4] = { 0 }; u32x w3[4] = { 0 };
u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
out_len &= 7; /**
* RACF
*/
u32x key[2]; u32x key[2];
@ -697,14 +697,12 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
*/ */
u32 pw_buf0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = 0; pw_buf0[2] = 0;
pw_buf0[3] = 0; pw_buf0[3] = 0;
u32 pw_buf1[4];
pw_buf1[0] = 0; pw_buf1[0] = 0;
pw_buf1[1] = 0; pw_buf1[1] = 0;
pw_buf1[2] = 0; pw_buf1[2] = 0;
@ -744,9 +742,11 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
u32x w2[4] = { 0 }; u32x w2[4] = { 0 };
u32x w3[4] = { 0 }; u32x w3[4] = { 0 };
u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
out_len &= 7; /**
* RACF
*/
u32x key[2]; u32x key[2];

396
OpenCL/m08500_a1.cl
View File

@ -7,6 +7,8 @@
#define _DES_ #define _DES_
#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -18,9 +20,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"
#define PERM_OP(a,b,tt,n,m) \ #define PERM_OP(a,b,tt,n,m) \
{ \ { \
@ -378,20 +378,40 @@ __constant u32 c_skb[8][64] =
} }
}; };
#if VECT_SIZE == 1
#define BOX(i,n,S) (S)[(n)][(i)] #define BOX(i,n,S) (S)[(n)][(i)]
#elif VECT_SIZE == 2
#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1])
#elif VECT_SIZE == 4
#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3])
#elif VECT_SIZE == 8
#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7])
#elif VECT_SIZE == 16
#define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf])
#endif
static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16], __local u32 (*s_SPtrans)[64]) #if VECT_SIZE == 1
#define BOX1(i,S) (S)[(i)]
#elif VECT_SIZE == 2
#define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1])
#elif VECT_SIZE == 4
#define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3])
#elif VECT_SIZE == 8
#define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7])
#elif VECT_SIZE == 16
#define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf])
#endif
static void _des_crypt_encrypt (u32x iv[2], u32x data[2], u32x Kc[16], u32x Kd[16], __local u32 (*s_SPtrans)[64])
{ {
u32 tt; u32x r = data[0];
u32x l = data[1];
u32 r = data[0];
u32 l = data[1];
#pragma unroll 16 #pragma unroll 16
for (u32 i = 0; i < 16; i += 2) for (u32 i = 0; i < 16; i += 2)
{ {
u32 u; u32x u;
u32 t; u32x t;
u = Kc[i + 0] ^ r; u = Kc[i + 0] ^ r;
t = Kd[i + 0] ^ rotl32 (r, 28u); t = Kd[i + 0] ^ rotl32 (r, 28u);
@ -422,9 +442,9 @@ static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16],
iv[1] = r; iv[1] = r;
} }
static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u32 (*s_skb)[64]) static void _des_crypt_keysetup (u32x c, u32x d, u32x Kc[16], u32x Kd[16], __local u32 (*s_skb)[64])
{ {
u32 tt; u32x tt;
PERM_OP (d, c, tt, 4, 0x0f0f0f0f); PERM_OP (d, c, tt, 4, 0x0f0f0f0f);
HPERM_OP (c, tt, 2, 0xcccc0000); HPERM_OP (c, tt, 2, 0xcccc0000);
@ -457,13 +477,13 @@ static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u
c = c & 0x0fffffff; c = c & 0x0fffffff;
d = d & 0x0fffffff; d = d & 0x0fffffff;
const u32 c00 = (c >> 0) & 0x0000003f; const u32x c00 = (c >> 0) & 0x0000003f;
const u32 c06 = (c >> 6) & 0x00383003; const u32x c06 = (c >> 6) & 0x00383003;
const u32 c07 = (c >> 7) & 0x0000003c; const u32x c07 = (c >> 7) & 0x0000003c;
const u32 c13 = (c >> 13) & 0x0000060f; const u32x c13 = (c >> 13) & 0x0000060f;
const u32 c20 = (c >> 20) & 0x00000001; const u32x c20 = (c >> 20) & 0x00000001;
u32 s = BOX (((c00 >> 0) & 0xff), 0, s_skb) u32x s = BOX (((c00 >> 0) & 0xff), 0, s_skb)
| BOX (((c06 >> 0) & 0xff) | BOX (((c06 >> 0) & 0xff)
|((c07 >> 0) & 0xff), 1, s_skb) |((c07 >> 0) & 0xff), 1, s_skb)
| BOX (((c13 >> 0) & 0xff) | BOX (((c13 >> 0) & 0xff)
@ -472,12 +492,12 @@ static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u
|((c13 >> 8) & 0xff) |((c13 >> 8) & 0xff)
|((c06 >> 16) & 0xff), 3, s_skb); |((c06 >> 16) & 0xff), 3, s_skb);
const u32 d00 = (d >> 0) & 0x00003c3f; const u32x d00 = (d >> 0) & 0x00003c3f;
const u32 d07 = (d >> 7) & 0x00003f03; const u32x d07 = (d >> 7) & 0x00003f03;
const u32 d21 = (d >> 21) & 0x0000000f; const u32x d21 = (d >> 21) & 0x0000000f;
const u32 d22 = (d >> 22) & 0x00000030; const u32x d22 = (d >> 22) & 0x00000030;
u32 t = BOX (((d00 >> 0) & 0xff), 4, s_skb) u32x t = BOX (((d00 >> 0) & 0xff), 4, s_skb)
| BOX (((d07 >> 0) & 0xff) | BOX (((d07 >> 0) & 0xff)
|((d00 >> 8) & 0xff), 5, s_skb) |((d00 >> 8) & 0xff), 5, s_skb)
| BOX (((d07 >> 8) & 0xff), 6, s_skb) | BOX (((d07 >> 8) & 0xff), 6, s_skb)
@ -492,17 +512,17 @@ static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u
} }
} }
static void transform_racf_key (const u32 w0, const u32 w1, u32 key[2]) static void transform_racf_key (const u32x w0, const u32x w1, u32x key[2])
{ {
key[0] = (ascii_to_ebcdic_pc[(w0 >> 0) & 0xff]) << 0 key[0] = BOX1 (((w0 >> 0) & 0xff), ascii_to_ebcdic_pc) << 0
| (ascii_to_ebcdic_pc[(w0 >> 8) & 0xff]) << 8 | BOX1 (((w0 >> 8) & 0xff), ascii_to_ebcdic_pc) << 8
| (ascii_to_ebcdic_pc[(w0 >> 16) & 0xff]) << 16 | BOX1 (((w0 >> 16) & 0xff), ascii_to_ebcdic_pc) << 16
| (ascii_to_ebcdic_pc[(w0 >> 24) & 0xff]) << 24; | BOX1 (((w0 >> 24) & 0xff), ascii_to_ebcdic_pc) << 24;
key[1] = (ascii_to_ebcdic_pc[(w1 >> 0) & 0xff]) << 0 key[1] = BOX1 (((w1 >> 0) & 0xff), ascii_to_ebcdic_pc) << 0
| (ascii_to_ebcdic_pc[(w1 >> 8) & 0xff]) << 8 | BOX1 (((w1 >> 8) & 0xff), ascii_to_ebcdic_pc) << 8
| (ascii_to_ebcdic_pc[(w1 >> 16) & 0xff]) << 16 | BOX1 (((w1 >> 16) & 0xff), ascii_to_ebcdic_pc) << 16
| (ascii_to_ebcdic_pc[(w1 >> 24) & 0xff]) << 24; | BOX1 (((w1 >> 24) & 0xff), ascii_to_ebcdic_pc) << 24;
} }
__kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
@ -551,41 +571,20 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* base * base
*/ */
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] = 0; pw_buf0[2] = 0;
wordl0[3] = 0; pw_buf0[3] = 0;
pw_buf1[0] = 0;
u32 wordl1[4]; pw_buf1[1] = 0;
pw_buf1[2] = 0;
wordl1[0] = 0; pw_buf1[3] = 0;
wordl1[1] = 0;
wordl1[2] = 0;
wordl1[3] = 0;
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
*/ */
@ -596,105 +595,90 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
salt_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[1]; salt_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[1];
/** /**
* main * 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);
u32 pw_len = pw_l_len + pw_r_len; const u32x pw_len = pw_l_len + pw_r_len;
pw_len = (pw_len >= 8) ? 8 : pw_len; /**
* concat password candidate
*/
u32 wordr0[4]; u32x wordl0[4] = { 0 };
u32x wordl1[4] = { 0 };
u32x wordl2[4] = { 0 };
u32x wordl3[4] = { 0 };
wordr0[0] = combs_buf[il_pos].i[0]; wordl0[0] = pw_buf0[0];
wordr0[1] = combs_buf[il_pos].i[1]; wordl0[1] = pw_buf0[1];
wordr0[2] = 0; wordl0[2] = pw_buf0[2];
wordr0[3] = 0; 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];
u32 wordr1[4]; u32x wordr0[4] = { 0 };
u32x wordr1[4] = { 0 };
u32x wordr2[4] = { 0 };
u32x wordr3[4] = { 0 };
wordr1[0] = 0; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr1[1] = 0; wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr1[2] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr1[3] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
u32 wordr2[4]; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
wordr2[0] = 0; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr2[1] = 0;
wordr2[2] = 0;
wordr2[3] = 0;
u32 wordr3[4];
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)
{ {
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[2];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w0[2] = 0;
w0[3] = 0;
u32 w1[4]; /**
* RACF
*/
w1[0] = 0; u32x key[2];
w1[1] = 0;
w1[2] = 0;
w1[3] = 0;
u32 w2[4];
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
u32 w3[4];
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
u32 key[2];
transform_racf_key (w0[0], w0[1], key); transform_racf_key (w0[0], w0[1], key);
const u32 c = key[0]; const u32x c = key[0];
const u32 d = key[1]; const u32x d = key[1];
u32 Kc[16]; u32x Kc[16];
u32 Kd[16]; u32x Kd[16];
_des_crypt_keysetup (c, d, Kc, Kd, s_skb); _des_crypt_keysetup (c, d, Kc, Kd, s_skb);
u32 data[2]; u32x data[2];
data[0] = salt_buf0[0]; data[0] = salt_buf0[0];
data[1] = salt_buf0[1]; data[1] = salt_buf0[1];
volatile u32 iv[2]; volatile u32x iv[2];
_des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans); _des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans);
const u32 r0 = iv[0]; u32x iv2 = 0;
const u32 r1 = iv[1]; u32x iv3 = 0;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_M COMPARE_M_SIMD (iv[0], iv[1], iv2, iv3);
} }
} }
@ -752,41 +736,20 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* base * base
*/ */
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] = 0; pw_buf0[2] = 0;
wordl0[3] = 0; pw_buf0[3] = 0;
pw_buf1[0] = 0;
u32 wordl1[4]; pw_buf1[1] = 0;
pw_buf1[2] = 0;
wordl1[0] = 0; pw_buf1[3] = 0;
wordl1[1] = 0;
wordl1[2] = 0;
wordl1[3] = 0;
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
*/ */
@ -809,105 +772,90 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
}; };
/** /**
* main * 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);
u32 pw_len = pw_l_len + pw_r_len; const u32x pw_len = pw_l_len + pw_r_len;
pw_len = (pw_len >= 8) ? 8 : pw_len; /**
* concat password candidate
*/
u32 wordr0[4]; u32x wordl0[4] = { 0 };
u32x wordl1[4] = { 0 };
u32x wordl2[4] = { 0 };
u32x wordl3[4] = { 0 };
wordr0[0] = combs_buf[il_pos].i[0]; wordl0[0] = pw_buf0[0];
wordr0[1] = combs_buf[il_pos].i[1]; wordl0[1] = pw_buf0[1];
wordr0[2] = 0; wordl0[2] = pw_buf0[2];
wordr0[3] = 0; 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];
u32 wordr1[4]; u32x wordr0[4] = { 0 };
u32x wordr1[4] = { 0 };
u32x wordr2[4] = { 0 };
u32x wordr3[4] = { 0 };
wordr1[0] = 0; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr1[1] = 0; wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr1[2] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr1[3] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
u32 wordr2[4]; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
wordr2[0] = 0; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr2[1] = 0;
wordr2[2] = 0;
wordr2[3] = 0;
u32 wordr3[4];
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)
{ {
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[2];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w0[2] = 0;
w0[3] = 0;
u32 w1[4]; /**
* RACF
*/
w1[0] = 0; u32x key[2];
w1[1] = 0;
w1[2] = 0;
w1[3] = 0;
u32 w2[4];
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
u32 w3[4];
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
u32 key[2];
transform_racf_key (w0[0], w0[1], key); transform_racf_key (w0[0], w0[1], key);
const u32 c = key[0]; const u32x c = key[0];
const u32 d = key[1]; const u32x d = key[1];
u32 Kc[16]; u32x Kc[16];
u32 Kd[16]; u32x Kd[16];
_des_crypt_keysetup (c, d, Kc, Kd, s_skb); _des_crypt_keysetup (c, d, Kc, Kd, s_skb);
u32 data[2]; u32x data[2];
data[0] = salt_buf0[0]; data[0] = salt_buf0[0];
data[1] = salt_buf0[1]; data[1] = salt_buf0[1];
volatile u32 iv[2]; volatile u32x iv[2];
_des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans); _des_crypt_encrypt (iv, data, Kc, Kd, s_SPtrans);
const u32 r0 = iv[0]; u32x iv2 = 0;
const u32 r1 = iv[1]; u32x iv3 = 0;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_S COMPARE_S_SIMD (iv[0], iv[1], iv2, iv3);
} }
} }

8
OpenCL/m08500_a3.cl
View File

@ -558,6 +558,10 @@ static void m08500m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* RACF
*/
u32x key[2]; u32x key[2];
transform_racf_key (w0, w1, key); transform_racf_key (w0, w1, key);
@ -630,6 +634,10 @@ static void m08500s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* RACF
*/
u32x key[2]; u32x key[2];
transform_racf_key (w0, w1, key); transform_racf_key (w0, w1, key);