mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-26 09:58:16 +00:00
Add missing kernel in -m m00150_a1-pure.cl and m00160_a1-pure.cl
This commit is contained in:
parent
4833d6c4d7
commit
e2371540e0
@ -15,6 +15,88 @@
|
|||||||
|
|
||||||
__kernel void m00150_mxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 m00150_mxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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)
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* modifier
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u32 lid = get_local_id (0);
|
||||||
|
const u32 gid = get_global_id (0);
|
||||||
|
|
||||||
|
if (gid >= gid_max) return;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* base
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u32 pw_len = pws[gid].pw_len;
|
||||||
|
|
||||||
|
const u32 pw_lenv = ceil ((float) pw_len / 4);
|
||||||
|
|
||||||
|
u32 w[64] = { 0 };
|
||||||
|
|
||||||
|
for (int idx = 0; idx < pw_lenv; idx++)
|
||||||
|
{
|
||||||
|
w[idx] = swap32_S (pws[gid].i[idx]);
|
||||||
|
|
||||||
|
barrier (CLK_GLOBAL_MEM_FENCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
const u32 salt_len = salt_bufs[salt_pos].salt_len;
|
||||||
|
|
||||||
|
const u32 salt_lenv = ceil ((float) salt_len / 4);
|
||||||
|
|
||||||
|
u32 s[64] = { 0 };
|
||||||
|
|
||||||
|
for (int idx = 0; idx < salt_lenv; idx++)
|
||||||
|
{
|
||||||
|
s[idx] = swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
|
||||||
|
|
||||||
|
barrier (CLK_GLOBAL_MEM_FENCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* loop
|
||||||
|
*/
|
||||||
|
|
||||||
|
for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
|
||||||
|
{
|
||||||
|
const u32 comb_len = combs_buf[il_pos].pw_len;
|
||||||
|
|
||||||
|
u32 c[64];
|
||||||
|
|
||||||
|
#ifdef _unroll
|
||||||
|
#pragma unroll
|
||||||
|
#endif
|
||||||
|
for (int idx = 0; idx < 64; idx++)
|
||||||
|
{
|
||||||
|
c[idx] = swap32_S (combs_buf[il_pos].i[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch_buffer_by_offset_1x64_be_S (c, pw_len);
|
||||||
|
|
||||||
|
#ifdef _unroll
|
||||||
|
#pragma unroll
|
||||||
|
#endif
|
||||||
|
for (int i = 0; i < 64; i++)
|
||||||
|
{
|
||||||
|
c[i] |= w[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
sha1_hmac_ctx_vector_t ctx;
|
||||||
|
|
||||||
|
sha1_hmac_init_vector (&ctx, c, pw_len + comb_len);
|
||||||
|
|
||||||
|
sha1_hmac_update_vector (&ctx, s, salt_len);
|
||||||
|
|
||||||
|
sha1_hmac_final_vector (&ctx);
|
||||||
|
|
||||||
|
const u32x r0 = ctx.opad.h[DGST_R0];
|
||||||
|
const u32x r1 = ctx.opad.h[DGST_R1];
|
||||||
|
const u32x r2 = ctx.opad.h[DGST_R2];
|
||||||
|
const u32x r3 = ctx.opad.h[DGST_R3];
|
||||||
|
|
||||||
|
COMPARE_M_SCALAR (r0, r1, r2, r3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
__kernel void m00150_sxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 m00150_sxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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)
|
||||||
|
@ -15,6 +15,90 @@
|
|||||||
|
|
||||||
__kernel void m00160_mxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 m00160_mxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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)
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* modifier
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u32 lid = get_local_id (0);
|
||||||
|
const u32 gid = get_global_id (0);
|
||||||
|
|
||||||
|
if (gid >= gid_max) return;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* base
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u32 pw_len = pws[gid].pw_len;
|
||||||
|
|
||||||
|
const u32 pw_lenv = ceil ((float) pw_len / 4);
|
||||||
|
|
||||||
|
u32 w[64] = { 0 };
|
||||||
|
|
||||||
|
for (int idx = 0; idx < pw_lenv; idx++)
|
||||||
|
{
|
||||||
|
w[idx] = swap32_S (pws[gid].i[idx]);
|
||||||
|
|
||||||
|
barrier (CLK_GLOBAL_MEM_FENCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
const u32 salt_len = salt_bufs[salt_pos].salt_len;
|
||||||
|
|
||||||
|
const u32 salt_lenv = ceil ((float) salt_len / 4);
|
||||||
|
|
||||||
|
u32 s[64] = { 0 };
|
||||||
|
|
||||||
|
for (int idx = 0; idx < salt_lenv; idx++)
|
||||||
|
{
|
||||||
|
s[idx] = swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
|
||||||
|
|
||||||
|
barrier (CLK_GLOBAL_MEM_FENCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
sha1_hmac_ctx_t ctx0;
|
||||||
|
|
||||||
|
sha1_hmac_init (&ctx0, s, salt_len);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* loop
|
||||||
|
*/
|
||||||
|
|
||||||
|
for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
|
||||||
|
{
|
||||||
|
const u32 comb_len = combs_buf[il_pos].pw_len;
|
||||||
|
|
||||||
|
u32 c[64];
|
||||||
|
|
||||||
|
#ifdef _unroll
|
||||||
|
#pragma unroll
|
||||||
|
#endif
|
||||||
|
for (int idx = 0; idx < 64; idx++)
|
||||||
|
{
|
||||||
|
c[idx] = swap32_S (combs_buf[il_pos].i[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch_buffer_by_offset_1x64_be_S (c, pw_len);
|
||||||
|
|
||||||
|
#ifdef _unroll
|
||||||
|
#pragma unroll
|
||||||
|
#endif
|
||||||
|
for (int i = 0; i < 64; i++)
|
||||||
|
{
|
||||||
|
c[i] |= w[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
sha1_hmac_ctx_t ctx = ctx0;
|
||||||
|
|
||||||
|
sha1_hmac_update (&ctx, c, pw_len + comb_len);
|
||||||
|
|
||||||
|
sha1_hmac_final (&ctx);
|
||||||
|
|
||||||
|
const u32x r0 = ctx.opad.h[DGST_R0];
|
||||||
|
const u32x r1 = ctx.opad.h[DGST_R1];
|
||||||
|
const u32x r2 = ctx.opad.h[DGST_R2];
|
||||||
|
const u32x r3 = ctx.opad.h[DGST_R3];
|
||||||
|
|
||||||
|
COMPARE_M_SCALAR (r0, r1, r2, r3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
__kernel void m00160_sxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 m00160_sxx (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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)
|
||||||
|
Loading…
Reference in New Issue
Block a user