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

Converted to new SIMD: -m 8500 -a 0

Browse Source
This commit is contained in:
Jens Steube 2016-02-06 11:03:25 +01:00
parent 60d43ed064
commit 65274b0404
1 changed files with 98 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
OpenCL/m08500_a0.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"
@ -20,9 +22,7 @@
#include "OpenCL/common.c" #include "OpenCL/common.c"
#include "include/rp_kernel.h" #include "include/rp_kernel.h"
#include "OpenCL/rp.c" #include "OpenCL/rp.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) \
{ \ { \
@ -400,18 +400,16 @@ __constant u32 c_skb[8][64] =
#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]) #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])
#endif #endif
static void _des_crypt_encrypt (u32 iv[2], u32 data[2], u32 Kc[16], u32 Kd[16], __local u32 (*s_SPtrans)[64]) 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);
@ -442,9 +440,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);
@ -477,13 +475,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)
@ -492,12 +490,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)
@ -512,17 +510,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 rules_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 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
@ -571,12 +569,19 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
* base * base
*/ */
u32 pw_buf[4]; u32 pw_buf0[4];
pw_buf[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf[2] = 0; pw_buf0[2] = 0;
pw_buf[3] = 0; pw_buf0[3] = 0;
u32 pw_buf1[4];
pw_buf1[0] = 0;
pw_buf1[1] = 0;
pw_buf1[2] = 0;
pw_buf1[3] = 0;
const u32 pw_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
@ -593,67 +598,42 @@ __kernel void m08500_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
* main * main
*/ */
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) for (u32 il_pos = 0; il_pos < rules_cnt; il_pos += VECT_SIZE)
{ {
u32 w0[4]; u32x w0[4] = { 0 };
u32x w1[4] = { 0 };
u32x w2[4] = { 0 };
u32x w3[4] = { 0 };
w0[0] = pw_buf[0]; u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
w0[1] = pw_buf[1];
w0[2] = pw_buf[2];
w0[3] = pw_buf[3];
u32 w1[4];
w1[0] = 0;
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 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
out_len = (out_len >= 8) ? 8 : out_len; out_len = (out_len >= 8) ? 8 : out_len;
u32 key[2]; u32x 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];
u32 iv[2]; 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);
} }
} }
@ -711,12 +691,19 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
* base * base
*/ */
u32 pw_buf[4]; u32 pw_buf0[4];
pw_buf[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf[2] = 0; pw_buf0[2] = 0;
pw_buf[3] = 0; pw_buf0[3] = 0;
u32 pw_buf1[4];
pw_buf1[0] = 0;
pw_buf1[1] = 0;
pw_buf1[2] = 0;
pw_buf1[3] = 0;
const u32 pw_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
@ -745,67 +732,42 @@ __kernel void m08500_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu
* main * main
*/ */
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) for (u32 il_pos = 0; il_pos < rules_cnt; il_pos += VECT_SIZE)
{ {
u32 w0[4]; u32x w0[4] = { 0 };
u32x w1[4] = { 0 };
u32x w2[4] = { 0 };
u32x w3[4] = { 0 };
w0[0] = pw_buf[0]; u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
w0[1] = pw_buf[1];
w0[2] = pw_buf[2];
w0[3] = pw_buf[3];
u32 w1[4];
w1[0] = 0;
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 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
out_len = (out_len >= 8) ? 8 : out_len; out_len = (out_len >= 8) ? 8 : out_len;
u32 key[2]; u32x 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];
u32 iv[2]; 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);
} }
} }