mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 16:18:09 +00:00
Converted to new SIMD: -m 30 -a 0
This commit is contained in:
Jens Steube
parent
ad3aef39f5
commit
c3492115a1
@ -5,6 +5,8 @@
|
||||
|
||||
#define _MD5_
|
||||
|
||||
#define NEW_SIMD_CODE
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "include/kernel_vendor.h"
|
||||
|
||||
@ -18,9 +20,7 @@
|
||||
#include "OpenCL/common.c"
|
||||
#include "include/rp_kernel.h"
|
||||
#include "OpenCL/rp.c"
|
||||
|
||||
#define COMPARE_S "OpenCL/check_single_comp4.c"
|
||||
#define COMPARE_M "OpenCL/check_multi_comp4.c"
|
||||
#include "OpenCL/simd.c"
|
||||
|
||||
// no unicode yet
|
||||
|
||||
@ -80,64 +80,41 @@ __kernel void m00030_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* loop
|
||||
*/
|
||||
|
||||
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_buf0[0];
|
||||
w0[1] = pw_buf0[1];
|
||||
w0[2] = pw_buf0[2];
|
||||
w0[3] = pw_buf0[3];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = pw_buf1[0];
|
||||
w1[1] = pw_buf1[1];
|
||||
w1[2] = pw_buf1[2];
|
||||
w1[3] = pw_buf1[3];
|
||||
|
||||
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;
|
||||
|
||||
const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
|
||||
const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||
|
||||
/**
|
||||
* append salt
|
||||
*/
|
||||
|
||||
u32 s0[4];
|
||||
u32x 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];
|
||||
u32x 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];
|
||||
u32x s2[4];
|
||||
|
||||
s2[0] = 0;
|
||||
s2[1] = 0;
|
||||
s2[2] = 0;
|
||||
s2[3] = 0;
|
||||
|
||||
u32 s3[4];
|
||||
u32x s3[4];
|
||||
|
||||
s3[0] = 0;
|
||||
s3[1] = 0;
|
||||
@ -148,10 +125,10 @@ __kernel void m00030_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 out_salt_len = (out_len * 2) + salt_len;
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
u32 w3_t[4];
|
||||
u32x w0_t[4];
|
||||
u32x w1_t[4];
|
||||
u32x w2_t[4];
|
||||
u32x w3_t[4];
|
||||
|
||||
make_unicode (w0, w0_t, w1_t);
|
||||
make_unicode (w1, w2_t, w3_t);
|
||||
@ -181,10 +158,10 @@ __kernel void m00030_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* md5
|
||||
*/
|
||||
|
||||
u32 a = MD5M_A;
|
||||
u32 b = MD5M_B;
|
||||
u32 c = MD5M_C;
|
||||
u32 d = MD5M_D;
|
||||
u32x a = MD5M_A;
|
||||
u32x b = MD5M_B;
|
||||
u32x c = MD5M_C;
|
||||
u32x d = MD5M_D;
|
||||
|
||||
MD5_STEP (MD5_Fo, a, b, c, d, w0_t[0], MD5C00, MD5S00);
|
||||
MD5_STEP (MD5_Fo, d, a, b, c, w0_t[1], MD5C01, MD5S01);
|
||||
@ -254,13 +231,7 @@ __kernel void m00030_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
MD5_STEP (MD5_I , c, d, a, b, w0_t[2], MD5C3e, MD5S32);
|
||||
MD5_STEP (MD5_I , b, c, d, a, w2_t[1], MD5C3f, MD5S33);
|
||||
|
||||
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = d;
|
||||
const u32 r2 = c;
|
||||
const u32 r3 = b;
|
||||
|
||||
#include COMPARE_M
|
||||
COMPARE_M_SIMD (a, d, c, b);
|
||||
}
|
||||
}
|
||||
|
||||
@ -340,64 +311,41 @@ __kernel void m00030_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* loop
|
||||
*/
|
||||
|
||||
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_buf0[0];
|
||||
w0[1] = pw_buf0[1];
|
||||
w0[2] = pw_buf0[2];
|
||||
w0[3] = pw_buf0[3];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = pw_buf1[0];
|
||||
w1[1] = pw_buf1[1];
|
||||
w1[2] = pw_buf1[2];
|
||||
w1[3] = pw_buf1[3];
|
||||
|
||||
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;
|
||||
|
||||
const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
|
||||
const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||
|
||||
/**
|
||||
* append salt
|
||||
*/
|
||||
|
||||
u32 s0[4];
|
||||
u32x 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];
|
||||
u32x 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];
|
||||
u32x s2[4];
|
||||
|
||||
s2[0] = 0;
|
||||
s2[1] = 0;
|
||||
s2[2] = 0;
|
||||
s2[3] = 0;
|
||||
|
||||
u32 s3[4];
|
||||
u32x s3[4];
|
||||
|
||||
s3[0] = 0;
|
||||
s3[1] = 0;
|
||||
@ -408,10 +356,10 @@ __kernel void m00030_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 out_salt_len = (out_len * 2) + salt_len;
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
u32 w3_t[4];
|
||||
u32x w0_t[4];
|
||||
u32x w1_t[4];
|
||||
u32x w2_t[4];
|
||||
u32x w3_t[4];
|
||||
|
||||
make_unicode (w0, w0_t, w1_t);
|
||||
make_unicode (w1, w2_t, w3_t);
|
||||
@ -441,10 +389,10 @@ __kernel void m00030_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* md5
|
||||
*/
|
||||
|
||||
u32 a = MD5M_A;
|
||||
u32 b = MD5M_B;
|
||||
u32 c = MD5M_C;
|
||||
u32 d = MD5M_D;
|
||||
u32x a = MD5M_A;
|
||||
u32x b = MD5M_B;
|
||||
u32x c = MD5M_C;
|
||||
u32x d = MD5M_D;
|
||||
|
||||
MD5_STEP (MD5_Fo, a, b, c, d, w0_t[0], MD5C00, MD5S00);
|
||||
MD5_STEP (MD5_Fo, d, a, b, c, w0_t[1], MD5C01, MD5S01);
|
||||
@ -511,21 +459,13 @@ __kernel void m00030_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
MD5_STEP (MD5_I , b, c, d, a, w3_t[1], MD5C3b, MD5S33);
|
||||
MD5_STEP (MD5_I , a, b, c, d, w1_t[0], MD5C3c, MD5S30);
|
||||
|
||||
bool q_cond = allx (search[0] != a);
|
||||
|
||||
if (q_cond) continue;
|
||||
if (MATCHES_NONE_VS (a, search[0])) continue;
|
||||
|
||||
MD5_STEP (MD5_I , d, a, b, c, w2_t[3], MD5C3d, MD5S31);
|
||||
MD5_STEP (MD5_I , c, d, a, b, w0_t[2], MD5C3e, MD5S32);
|
||||
MD5_STEP (MD5_I , b, c, d, a, w2_t[1], MD5C3f, MD5S33);
|
||||
|
||||
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = d;
|
||||
const u32 r2 = c;
|
||||
const u32 r3 = b;
|
||||
|
||||
#include COMPARE_S
|
||||
COMPARE_S_SIMD (a, d, c, b);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user