mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-26 01:50:10 +00:00
Added long passwords support for SAP CODVN H (PWDSALTEDHASH) iSSHA-1
This commit is contained in:
jsteube
parent
f4301c9c22
commit
bedc481390
313
OpenCL/m10300.cl
313
OpenCL/m10300.cl
@ -8,138 +8,11 @@
|
|||||||
#include "inc_hash_functions.cl"
|
#include "inc_hash_functions.cl"
|
||||||
#include "inc_types.cl"
|
#include "inc_types.cl"
|
||||||
#include "inc_common.cl"
|
#include "inc_common.cl"
|
||||||
|
#include "inc_hash_sha1.cl"
|
||||||
|
|
||||||
#define COMPARE_S "inc_comp_single.cl"
|
#define COMPARE_S "inc_comp_single.cl"
|
||||||
#define COMPARE_M "inc_comp_multi.cl"
|
#define COMPARE_M "inc_comp_multi.cl"
|
||||||
|
|
||||||
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];
|
|
||||||
u32 B = digest[1];
|
|
||||||
u32 C = digest[2];
|
|
||||||
u32 D = digest[3];
|
|
||||||
u32 E = digest[4];
|
|
||||||
|
|
||||||
u32 w0_t = w0[0];
|
|
||||||
u32 w1_t = w0[1];
|
|
||||||
u32 w2_t = w0[2];
|
|
||||||
u32 w3_t = w0[3];
|
|
||||||
u32 w4_t = w1[0];
|
|
||||||
u32 w5_t = w1[1];
|
|
||||||
u32 w6_t = w1[2];
|
|
||||||
u32 w7_t = w1[3];
|
|
||||||
u32 w8_t = w2[0];
|
|
||||||
u32 w9_t = w2[1];
|
|
||||||
u32 wa_t = w2[2];
|
|
||||||
u32 wb_t = w2[3];
|
|
||||||
u32 wc_t = w3[0];
|
|
||||||
u32 wd_t = w3[1];
|
|
||||||
u32 we_t = w3[2];
|
|
||||||
u32 wf_t = w3[3];
|
|
||||||
|
|
||||||
#undef K
|
|
||||||
#define K SHA1C00
|
|
||||||
|
|
||||||
SHA1_STEP (SHA1_F0o, A, B, C, D, E, w0_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, E, A, B, C, D, w1_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, D, E, A, B, C, w2_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, C, D, E, A, B, w3_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, B, C, D, E, A, w4_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, A, B, C, D, E, w5_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, E, A, B, C, D, w6_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, D, E, A, B, C, w7_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, C, D, E, A, B, w8_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, B, C, D, E, A, w9_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, A, B, C, D, E, wa_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, E, A, B, C, D, wb_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, D, E, A, B, C, wc_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, C, D, E, A, B, wd_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, B, C, D, E, A, we_t);
|
|
||||||
SHA1_STEP (SHA1_F0o, A, B, C, D, E, wf_t);
|
|
||||||
w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F0o, E, A, B, C, D, w0_t);
|
|
||||||
w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F0o, D, E, A, B, C, w1_t);
|
|
||||||
w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F0o, C, D, E, A, B, w2_t);
|
|
||||||
w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F0o, B, C, D, E, A, w3_t);
|
|
||||||
|
|
||||||
#undef K
|
|
||||||
#define K SHA1C01
|
|
||||||
|
|
||||||
w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, w4_t);
|
|
||||||
w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, w5_t);
|
|
||||||
w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, w6_t);
|
|
||||||
w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, w7_t);
|
|
||||||
w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, w8_t);
|
|
||||||
w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, w9_t);
|
|
||||||
wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, wa_t);
|
|
||||||
wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, wb_t);
|
|
||||||
wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, wc_t);
|
|
||||||
wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, wd_t);
|
|
||||||
we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, we_t);
|
|
||||||
wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, wf_t);
|
|
||||||
w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, w0_t);
|
|
||||||
w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, w1_t);
|
|
||||||
w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, w2_t);
|
|
||||||
w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, w3_t);
|
|
||||||
w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, w4_t);
|
|
||||||
w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, w5_t);
|
|
||||||
w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, w6_t);
|
|
||||||
w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, w7_t);
|
|
||||||
|
|
||||||
#undef K
|
|
||||||
#define K SHA1C02
|
|
||||||
|
|
||||||
w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F2o, A, B, C, D, E, w8_t);
|
|
||||||
w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F2o, E, A, B, C, D, w9_t);
|
|
||||||
wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F2o, D, E, A, B, C, wa_t);
|
|
||||||
wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F2o, C, D, E, A, B, wb_t);
|
|
||||||
wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F2o, B, C, D, E, A, wc_t);
|
|
||||||
wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F2o, A, B, C, D, E, wd_t);
|
|
||||||
we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F2o, E, A, B, C, D, we_t);
|
|
||||||
wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F2o, D, E, A, B, C, wf_t);
|
|
||||||
w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F2o, C, D, E, A, B, w0_t);
|
|
||||||
w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F2o, B, C, D, E, A, w1_t);
|
|
||||||
w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F2o, A, B, C, D, E, w2_t);
|
|
||||||
w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F2o, E, A, B, C, D, w3_t);
|
|
||||||
w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F2o, D, E, A, B, C, w4_t);
|
|
||||||
w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F2o, C, D, E, A, B, w5_t);
|
|
||||||
w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F2o, B, C, D, E, A, w6_t);
|
|
||||||
w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F2o, A, B, C, D, E, w7_t);
|
|
||||||
w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F2o, E, A, B, C, D, w8_t);
|
|
||||||
w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F2o, D, E, A, B, C, w9_t);
|
|
||||||
wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F2o, C, D, E, A, B, wa_t);
|
|
||||||
wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F2o, B, C, D, E, A, wb_t);
|
|
||||||
|
|
||||||
#undef K
|
|
||||||
#define K SHA1C03
|
|
||||||
|
|
||||||
wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, wc_t);
|
|
||||||
wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, wd_t);
|
|
||||||
we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, we_t);
|
|
||||||
wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, wf_t);
|
|
||||||
w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, w0_t);
|
|
||||||
w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, w1_t);
|
|
||||||
w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, w2_t);
|
|
||||||
w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, w3_t);
|
|
||||||
w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, w4_t);
|
|
||||||
w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, w5_t);
|
|
||||||
w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, w6_t);
|
|
||||||
w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, w7_t);
|
|
||||||
w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, w8_t);
|
|
||||||
w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, w9_t);
|
|
||||||
wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, wa_t);
|
|
||||||
wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F1, A, B, C, D, E, wb_t);
|
|
||||||
wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, E, A, B, C, D, wc_t);
|
|
||||||
wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, D, E, A, B, C, wd_t);
|
|
||||||
we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, C, D, E, A, B, we_t);
|
|
||||||
wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, B, C, D, E, A, wf_t);
|
|
||||||
|
|
||||||
digest[0] += A;
|
|
||||||
digest[1] += B;
|
|
||||||
digest[2] += C;
|
|
||||||
digest[3] += D;
|
|
||||||
digest[4] += E;
|
|
||||||
}
|
|
||||||
|
|
||||||
__kernel void m10300_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global saph_sha1_tmp_t *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 m10300_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global saph_sha1_tmp_t *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)
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -150,128 +23,21 @@ __kernel void m10300_init (__global pw_t *pws, __global const kernel_rule_t *rul
|
|||||||
|
|
||||||
if (gid >= gid_max) return;
|
if (gid >= gid_max) return;
|
||||||
|
|
||||||
u32 word_buf0[4];
|
sha1_ctx_t ctx;
|
||||||
|
|
||||||
word_buf0[0] = pws[gid].i[0];
|
sha1_init (&ctx);
|
||||||
word_buf0[1] = pws[gid].i[1];
|
|
||||||
word_buf0[2] = pws[gid].i[2];
|
|
||||||
word_buf0[3] = pws[gid].i[3];
|
|
||||||
|
|
||||||
u32 word_buf1[4];
|
sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
|
||||||
|
|
||||||
word_buf1[0] = pws[gid].i[4];
|
sha1_update_global_swap (&ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len);
|
||||||
word_buf1[1] = pws[gid].i[5];
|
|
||||||
word_buf1[2] = pws[gid].i[6];
|
|
||||||
word_buf1[3] = pws[gid].i[7];
|
|
||||||
|
|
||||||
u32 word_buf2[2];
|
sha1_final (&ctx);
|
||||||
|
|
||||||
word_buf2[0] = pws[gid].i[8];
|
tmps[gid].digest_buf[0] = ctx.h[0];
|
||||||
word_buf2[1] = pws[gid].i[9];
|
tmps[gid].digest_buf[1] = ctx.h[1];
|
||||||
|
tmps[gid].digest_buf[2] = ctx.h[2];
|
||||||
const u32 pw_len = pws[gid].pw_len;
|
tmps[gid].digest_buf[3] = ctx.h[3];
|
||||||
|
tmps[gid].digest_buf[4] = ctx.h[4];
|
||||||
/**
|
|
||||||
* salt
|
|
||||||
*/
|
|
||||||
|
|
||||||
u32 salt_len = salt_bufs[salt_pos].salt_len;
|
|
||||||
|
|
||||||
u32 salt_buf[4];
|
|
||||||
|
|
||||||
salt_buf[0] = salt_bufs[salt_pos].salt_buf[0];
|
|
||||||
salt_buf[1] = salt_bufs[salt_pos].salt_buf[1];
|
|
||||||
salt_buf[2] = salt_bufs[salt_pos].salt_buf[2];
|
|
||||||
salt_buf[3] = salt_bufs[salt_pos].salt_buf[3];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* init
|
|
||||||
*/
|
|
||||||
|
|
||||||
u32 w0[4];
|
|
||||||
|
|
||||||
w0[0] = salt_buf[0];
|
|
||||||
w0[1] = salt_buf[1];
|
|
||||||
w0[2] = salt_buf[2];
|
|
||||||
w0[3] = salt_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;
|
|
||||||
|
|
||||||
switch_buffer_by_offset_le (w0, w1, w2, w3, pw_len);
|
|
||||||
|
|
||||||
w0[0] |= word_buf0[0];
|
|
||||||
w0[1] |= word_buf0[1];
|
|
||||||
w0[2] |= word_buf0[2];
|
|
||||||
w0[3] |= word_buf0[3];
|
|
||||||
|
|
||||||
w1[0] |= word_buf1[0];
|
|
||||||
w1[1] |= word_buf1[1];
|
|
||||||
w1[2] |= word_buf1[2];
|
|
||||||
w1[3] |= word_buf1[3];
|
|
||||||
|
|
||||||
w2[0] |= word_buf2[0];
|
|
||||||
w2[1] |= word_buf2[1];
|
|
||||||
|
|
||||||
const u32 pw_salt_len = pw_len + salt_len;
|
|
||||||
|
|
||||||
append_0x80_4x4 (w0, w1, w2, w3, pw_salt_len);
|
|
||||||
|
|
||||||
// swaps needed
|
|
||||||
|
|
||||||
w0[0] = swap32 (w0[0]);
|
|
||||||
w0[1] = swap32 (w0[1]);
|
|
||||||
w0[2] = swap32 (w0[2]);
|
|
||||||
w0[3] = swap32 (w0[3]);
|
|
||||||
|
|
||||||
w1[0] = swap32 (w1[0]);
|
|
||||||
w1[1] = swap32 (w1[1]);
|
|
||||||
w1[2] = swap32 (w1[2]);
|
|
||||||
w1[3] = swap32 (w1[3]);
|
|
||||||
|
|
||||||
w2[0] = swap32 (w2[0]);
|
|
||||||
w2[1] = swap32 (w2[1]);
|
|
||||||
w2[2] = swap32 (w2[2]);
|
|
||||||
w2[3] = swap32 (w2[3]);
|
|
||||||
|
|
||||||
w3[0] = swap32 (w3[0]);
|
|
||||||
w3[1] = swap32 (w3[1]);
|
|
||||||
w3[2] = swap32 (w3[2]);
|
|
||||||
w3[3] = pw_salt_len * 8;
|
|
||||||
|
|
||||||
u32 digest[5];
|
|
||||||
|
|
||||||
digest[0] = SHA1M_A;
|
|
||||||
digest[1] = SHA1M_B;
|
|
||||||
digest[2] = SHA1M_C;
|
|
||||||
digest[3] = SHA1M_D;
|
|
||||||
digest[4] = SHA1M_E;
|
|
||||||
|
|
||||||
sha1_transform (w0, w1, w2, w3, digest);
|
|
||||||
|
|
||||||
tmps[gid].digest_buf[0] = digest[0];
|
|
||||||
tmps[gid].digest_buf[1] = digest[1];
|
|
||||||
tmps[gid].digest_buf[2] = digest[2];
|
|
||||||
tmps[gid].digest_buf[3] = digest[3];
|
|
||||||
tmps[gid].digest_buf[4] = digest[4];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__kernel void m10300_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global saph_sha1_tmp_t *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 m10300_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global saph_sha1_tmp_t *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)
|
||||||
@ -282,26 +48,21 @@ __kernel void m10300_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
|||||||
|
|
||||||
const u32 gid = get_global_id (0);
|
const u32 gid = get_global_id (0);
|
||||||
|
|
||||||
u32 word_buf0[4];
|
if (gid >= gid_max) return;
|
||||||
|
|
||||||
word_buf0[0] = swap32 (pws[gid].i[0]);
|
/**
|
||||||
word_buf0[1] = swap32 (pws[gid].i[1]);
|
* init
|
||||||
word_buf0[2] = swap32 (pws[gid].i[2]);
|
*/
|
||||||
word_buf0[3] = swap32 (pws[gid].i[3]);
|
|
||||||
|
|
||||||
u32 word_buf1[4];
|
sha1_ctx_t ctx;
|
||||||
|
|
||||||
word_buf1[0] = swap32 (pws[gid].i[4]);
|
sha1_init (&ctx);
|
||||||
word_buf1[1] = swap32 (pws[gid].i[5]);
|
|
||||||
word_buf1[2] = swap32 (pws[gid].i[6]);
|
|
||||||
word_buf1[3] = swap32 (pws[gid].i[7]);
|
|
||||||
|
|
||||||
u32 word_buf2[2];
|
sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
|
||||||
|
|
||||||
word_buf2[0] = swap32 (pws[gid].i[8]);
|
/**
|
||||||
word_buf2[1] = swap32 (pws[gid].i[9]);
|
* load
|
||||||
|
*/
|
||||||
const u32 pw_len = pws[gid].pw_len;
|
|
||||||
|
|
||||||
u32 digest[5];
|
u32 digest[5];
|
||||||
|
|
||||||
@ -327,7 +88,7 @@ __kernel void m10300_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
|||||||
w0[2] = digest[2];
|
w0[2] = digest[2];
|
||||||
w0[3] = digest[3];
|
w0[3] = digest[3];
|
||||||
w1[0] = digest[4];
|
w1[0] = digest[4];
|
||||||
w1[1] = 0x80000000;
|
w1[1] = 0;
|
||||||
w1[2] = 0;
|
w1[2] = 0;
|
||||||
w1[3] = 0;
|
w1[3] = 0;
|
||||||
w2[0] = 0;
|
w2[0] = 0;
|
||||||
@ -339,31 +100,17 @@ __kernel void m10300_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
|||||||
w3[2] = 0;
|
w3[2] = 0;
|
||||||
w3[3] = 0;
|
w3[3] = 0;
|
||||||
|
|
||||||
switch_buffer_by_offset_be (w0, w1, w2, w3, pw_len);
|
sha1_ctx_t ctx_inner = ctx;
|
||||||
|
|
||||||
w0[0] |= word_buf0[0];
|
sha1_update_64 (&ctx_inner, w0, w1, w2, w3, 20);
|
||||||
w0[1] |= word_buf0[1];
|
|
||||||
w0[2] |= word_buf0[2];
|
|
||||||
w0[3] |= word_buf0[3];
|
|
||||||
w1[0] |= word_buf1[0];
|
|
||||||
w1[1] |= word_buf1[1];
|
|
||||||
w1[2] |= word_buf1[2];
|
|
||||||
w1[3] |= word_buf1[3];
|
|
||||||
w2[0] |= word_buf2[0];
|
|
||||||
w2[1] |= word_buf2[1];
|
|
||||||
|
|
||||||
// not needed
|
sha1_final (&ctx_inner);
|
||||||
|
|
||||||
w3[2] = 0;
|
digest[0] = ctx_inner.h[0];
|
||||||
w3[3] = (pw_len + 20) * 8;
|
digest[1] = ctx_inner.h[1];
|
||||||
|
digest[2] = ctx_inner.h[2];
|
||||||
digest[0] = SHA1M_A;
|
digest[3] = ctx_inner.h[3];
|
||||||
digest[1] = SHA1M_B;
|
digest[4] = ctx_inner.h[4];
|
||||||
digest[2] = SHA1M_C;
|
|
||||||
digest[3] = SHA1M_D;
|
|
||||||
digest[4] = SHA1M_E;
|
|
||||||
|
|
||||||
sha1_transform (w0, w1, w2, w3, digest);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tmps[gid].digest_buf[0] = digest[0];
|
tmps[gid].digest_buf[0] = digest[0];
|
||||||
|
|||||||
@ -24623,8 +24623,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
|||||||
break;
|
break;
|
||||||
case 8600: hashconfig->pw_max = 16;
|
case 8600: hashconfig->pw_max = 16;
|
||||||
break;
|
break;
|
||||||
case 10300: hashconfig->pw_max = 40;
|
|
||||||
break;
|
|
||||||
case 10500: hashconfig->pw_max = 40;
|
case 10500: hashconfig->pw_max = 40;
|
||||||
break;
|
break;
|
||||||
case 10700: hashconfig->pw_max = 16;
|
case 10700: hashconfig->pw_max = 16;
|
||||||
@ -24660,6 +24658,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
|||||||
break;
|
break;
|
||||||
case 9600: hashconfig->pw_max = PW_MAX;
|
case 9600: hashconfig->pw_max = PW_MAX;
|
||||||
break;
|
break;
|
||||||
|
case 10300: hashconfig->pw_max = PW_MAX;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// pw_max : algo specific hard max length
|
// pw_max : algo specific hard max length
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user