mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-26 01:50:10 +00:00
Vectorized MS Office 2007 and added support for long passwords
This commit is contained in:
jsteube
parent
a1e3b20902
commit
61f39b37d2
435
OpenCL/m09400.cl
435
OpenCL/m09400.cl
@ -3,11 +3,15 @@
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#define NEW_SIMD_CODE
|
||||
|
||||
#include "inc_vendor.cl"
|
||||
#include "inc_hash_constants.h"
|
||||
#include "inc_hash_functions.cl"
|
||||
#include "inc_types.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
#include "inc_hash_sha1.cl"
|
||||
|
||||
#define COMPARE_S "inc_comp_single.cl"
|
||||
#define COMPARE_M "inc_comp_multi.cl"
|
||||
@ -1183,134 +1187,6 @@ void AES256_encrypt (const u32 *in, u32 *out, const u32 *rek, __local u32 *s_te0
|
||||
^ rek[59];
|
||||
}
|
||||
|
||||
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 m09400_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 office2007_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 office2007_t *office2007_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)
|
||||
{
|
||||
/**
|
||||
@ -1321,132 +1197,46 @@ __kernel void m09400_init (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
u32 w0[4];
|
||||
sha1_ctx_t ctx;
|
||||
|
||||
w0[0] = pws[gid].i[ 0];
|
||||
w0[1] = pws[gid].i[ 1];
|
||||
w0[2] = pws[gid].i[ 2];
|
||||
w0[3] = pws[gid].i[ 3];
|
||||
sha1_init (&ctx);
|
||||
|
||||
u32 w1[4];
|
||||
sha1_update_global (&ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len);
|
||||
|
||||
w1[0] = pws[gid].i[ 4];
|
||||
w1[1] = pws[gid].i[ 5];
|
||||
w1[2] = pws[gid].i[ 6];
|
||||
w1[3] = pws[gid].i[ 7];
|
||||
sha1_update_global_utf16le_swap (&ctx, pws[gid].i, pws[gid].pw_len);
|
||||
|
||||
u32 w2[4];
|
||||
sha1_final (&ctx);
|
||||
|
||||
w2[0] = pws[gid].i[ 8];
|
||||
w2[1] = pws[gid].i[ 9];
|
||||
w2[2] = pws[gid].i[10];
|
||||
w2[3] = pws[gid].i[11];
|
||||
|
||||
u32 w3[4];
|
||||
|
||||
w3[0] = pws[gid].i[12];
|
||||
w3[1] = pws[gid].i[13];
|
||||
w3[2] = pws[gid].i[14];
|
||||
w3[3] = pws[gid].i[15];
|
||||
|
||||
u32 pw_len = pws[gid].pw_len;
|
||||
|
||||
append_0x80_4x4 (w0, w1, w2, w3, pw_len);
|
||||
|
||||
make_utf16le (w1, w2, w3);
|
||||
make_utf16le (w0, w0, w1);
|
||||
|
||||
/**
|
||||
* 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 t0[4];
|
||||
|
||||
t0[0] = salt_buf[0];
|
||||
t0[1] = salt_buf[1];
|
||||
t0[2] = salt_buf[2];
|
||||
t0[3] = salt_buf[3];
|
||||
|
||||
u32 t1[4];
|
||||
|
||||
t1[0] = swap32 (w0[0]);
|
||||
t1[1] = swap32 (w0[1]);
|
||||
t1[2] = swap32 (w0[2]);
|
||||
t1[3] = swap32 (w0[3]);
|
||||
|
||||
u32 t2[4];
|
||||
|
||||
t2[0] = swap32 (w1[0]);
|
||||
t2[1] = swap32 (w1[1]);
|
||||
t2[2] = swap32 (w1[2]);
|
||||
t2[3] = swap32 (w1[3]);
|
||||
|
||||
u32 t3[4];
|
||||
|
||||
t3[0] = swap32 (w2[0]);
|
||||
t3[1] = swap32 (w2[1]);
|
||||
t3[2] = 0;
|
||||
t3[3] = (salt_len + (pw_len * 2)) * 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 (t0, t1, t2, t3, digest);
|
||||
|
||||
tmps[gid].out[0] = digest[0];
|
||||
tmps[gid].out[1] = digest[1];
|
||||
tmps[gid].out[2] = digest[2];
|
||||
tmps[gid].out[3] = digest[3];
|
||||
tmps[gid].out[4] = digest[4];
|
||||
tmps[gid].out[0] = ctx.h[0];
|
||||
tmps[gid].out[1] = ctx.h[1];
|
||||
tmps[gid].out[2] = ctx.h[2];
|
||||
tmps[gid].out[3] = ctx.h[3];
|
||||
tmps[gid].out[4] = ctx.h[4];
|
||||
}
|
||||
|
||||
__kernel void m09400_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 office2007_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 office2007_t *office2007_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)
|
||||
{
|
||||
const u32 gid = get_global_id (0);
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
if ((gid * VECT_SIZE) >= gid_max) return;
|
||||
|
||||
u32 w0[4];
|
||||
u32x w0[4];
|
||||
u32x w1[4];
|
||||
u32x w2[4];
|
||||
u32x w3[4];
|
||||
|
||||
w0[0] = 0;
|
||||
w0[1] = tmps[gid].out[0];
|
||||
w0[2] = tmps[gid].out[1];
|
||||
w0[3] = tmps[gid].out[2];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = tmps[gid].out[3];
|
||||
w1[1] = tmps[gid].out[4];
|
||||
w0[1] = packv (tmps, out, gid, 0);
|
||||
w0[2] = packv (tmps, out, gid, 1);
|
||||
w0[3] = packv (tmps, out, gid, 2);
|
||||
w1[0] = packv (tmps, out, gid, 3);
|
||||
w1[1] = packv (tmps, out, gid, 4);
|
||||
w1[2] = 0x80000000;
|
||||
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;
|
||||
@ -1456,7 +1246,7 @@ __kernel void m09400_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
{
|
||||
w0[0] = swap32 (j);
|
||||
|
||||
u32 digest[5];
|
||||
u32x digest[5];
|
||||
|
||||
digest[0] = SHA1M_A;
|
||||
digest[1] = SHA1M_B;
|
||||
@ -1464,7 +1254,7 @@ __kernel void m09400_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
digest[3] = SHA1M_D;
|
||||
digest[4] = SHA1M_E;
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
sha1_transform_vector (w0, w1, w2, w3, digest);
|
||||
|
||||
w0[1] = digest[0];
|
||||
w0[2] = digest[1];
|
||||
@ -1473,11 +1263,11 @@ __kernel void m09400_loop (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w1[1] = digest[4];
|
||||
}
|
||||
|
||||
tmps[gid].out[0] = w0[1];
|
||||
tmps[gid].out[1] = w0[2];
|
||||
tmps[gid].out[2] = w0[3];
|
||||
tmps[gid].out[3] = w1[0];
|
||||
tmps[gid].out[4] = w1[1];
|
||||
unpackv (tmps, out, gid, 0, w0[1]);
|
||||
unpackv (tmps, out, gid, 1, w0[2]);
|
||||
unpackv (tmps, out, gid, 2, w0[3]);
|
||||
unpackv (tmps, out, gid, 3, w1[0]);
|
||||
unpackv (tmps, out, gid, 4, w1[1]);
|
||||
}
|
||||
|
||||
__kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global office2007_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 office2007_t *office2007_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)
|
||||
@ -1530,42 +1320,42 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
*/
|
||||
|
||||
u32 w0[4];
|
||||
u32 w1[4];
|
||||
u32 w2[4];
|
||||
u32 w3[4];
|
||||
|
||||
w0[0] = tmps[gid].out[0];
|
||||
w0[1] = tmps[gid].out[1];
|
||||
w0[2] = tmps[gid].out[2];
|
||||
w0[3] = tmps[gid].out[3];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = tmps[gid].out[4];
|
||||
w1[1] = 0;
|
||||
w1[2] = 0x80000000;
|
||||
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] = (20 + 4) * 8;
|
||||
w3[3] = 0;
|
||||
|
||||
sha1_ctx_t ctx;
|
||||
|
||||
sha1_init (&ctx);
|
||||
|
||||
sha1_update_64 (&ctx, w0, w1, w2, w3, 20 + 4);
|
||||
|
||||
sha1_final (&ctx);
|
||||
|
||||
u32 digest_common[5];
|
||||
|
||||
digest_common[0] = SHA1M_A;
|
||||
digest_common[1] = SHA1M_B;
|
||||
digest_common[2] = SHA1M_C;
|
||||
digest_common[3] = SHA1M_D;
|
||||
digest_common[4] = SHA1M_E;
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest_common);
|
||||
digest_common[0] = ctx.h[0];
|
||||
digest_common[1] = ctx.h[1];
|
||||
digest_common[2] = ctx.h[2];
|
||||
digest_common[3] = ctx.h[3];
|
||||
digest_common[4] = ctx.h[4];
|
||||
|
||||
w0[0] = 0x36363636 ^ digest_common[0];
|
||||
w0[1] = 0x36363636 ^ digest_common[1];
|
||||
@ -1584,44 +1374,19 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w3[2] = 0x36363636;
|
||||
w3[3] = 0x36363636;
|
||||
|
||||
u32 digest[5];
|
||||
sha1_init (&ctx);
|
||||
|
||||
digest[0] = SHA1M_A;
|
||||
digest[1] = SHA1M_B;
|
||||
digest[2] = SHA1M_C;
|
||||
digest[3] = SHA1M_D;
|
||||
digest[4] = SHA1M_E;
|
||||
sha1_update_64 (&ctx, w0, w1, w2, w3, 64);
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
|
||||
w0[0] = 0x80000000;
|
||||
w0[1] = 0;
|
||||
w0[2] = 0;
|
||||
w0[3] = 0;
|
||||
w1[0] = 0;
|
||||
w1[1] = 0;
|
||||
w1[2] = 0;
|
||||
w1[3] = 0;
|
||||
w2[0] = 0;
|
||||
w2[1] = 0;
|
||||
w2[2] = 0;
|
||||
w2[3] = 0;
|
||||
w3[0] = 0;
|
||||
w3[1] = 0;
|
||||
w3[2] = 0;
|
||||
w3[3] = 64 * 8;
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
|
||||
// save digest for the AES-256 variant
|
||||
sha1_final (&ctx);
|
||||
|
||||
u32 digest_saved[5];
|
||||
|
||||
digest_saved[0] = digest[0];
|
||||
digest_saved[1] = digest[1];
|
||||
digest_saved[2] = digest[2];
|
||||
digest_saved[3] = digest[3];
|
||||
digest_saved[4] = digest[4];
|
||||
digest_saved[0] = ctx.h[0];
|
||||
digest_saved[1] = ctx.h[1];
|
||||
digest_saved[2] = ctx.h[2];
|
||||
digest_saved[3] = ctx.h[3];
|
||||
digest_saved[4] = ctx.h[4];
|
||||
|
||||
// now we got the AES key, decrypt the verifier
|
||||
|
||||
@ -1641,7 +1406,6 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
data[1] = verifier[1];
|
||||
data[2] = verifier[2];
|
||||
data[3] = verifier[3];
|
||||
|
||||
data[4] = 0;
|
||||
data[5] = 0;
|
||||
data[6] = 0;
|
||||
@ -1649,10 +1413,10 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
|
||||
u32 ukeyx[8];
|
||||
|
||||
ukeyx[0] = digest[0];
|
||||
ukeyx[1] = digest[1];
|
||||
ukeyx[2] = digest[2];
|
||||
ukeyx[3] = digest[3];
|
||||
ukeyx[0] = digest_saved[0];
|
||||
ukeyx[1] = digest_saved[1];
|
||||
ukeyx[2] = digest_saved[2];
|
||||
ukeyx[3] = digest_saved[3];
|
||||
|
||||
AES128_ExpandKey (ukeyx, rek, s_te0, s_te1, s_te2, s_te3, s_te4);
|
||||
|
||||
@ -1670,7 +1434,7 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w0[1] = out[1];
|
||||
w0[2] = out[2];
|
||||
w0[3] = out[3];
|
||||
w1[0] = 0x80000000;
|
||||
w1[0] = 0;
|
||||
w1[1] = 0;
|
||||
w1[2] = 0;
|
||||
w1[3] = 0;
|
||||
@ -1681,22 +1445,20 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w3[0] = 0;
|
||||
w3[1] = 0;
|
||||
w3[2] = 0;
|
||||
w3[3] = 16 * 8;
|
||||
w3[3] = 0;
|
||||
|
||||
digest[0] = SHA1M_A;
|
||||
digest[1] = SHA1M_B;
|
||||
digest[2] = SHA1M_C;
|
||||
digest[3] = SHA1M_D;
|
||||
digest[4] = SHA1M_E;
|
||||
sha1_init (&ctx);
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
sha1_update_64 (&ctx, w0, w1, w2, w3, 16);
|
||||
|
||||
sha1_final (&ctx);
|
||||
|
||||
// encrypt it again for verify
|
||||
|
||||
data[0] = digest[0];
|
||||
data[1] = digest[1];
|
||||
data[2] = digest[2];
|
||||
data[3] = digest[3];
|
||||
data[0] = ctx.h[0];
|
||||
data[1] = ctx.h[1];
|
||||
data[2] = ctx.h[2];
|
||||
data[3] = ctx.h[3];
|
||||
|
||||
AES128_encrypt (data, out, rek, s_te0, s_te1, s_te2, s_te3, s_te4);
|
||||
|
||||
@ -1734,32 +1496,11 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w3[2] = 0x5c5c5c5c;
|
||||
w3[3] = 0x5c5c5c5c;
|
||||
|
||||
digest[0] = SHA1M_A;
|
||||
digest[1] = SHA1M_B;
|
||||
digest[2] = SHA1M_C;
|
||||
digest[3] = SHA1M_D;
|
||||
digest[4] = SHA1M_E;
|
||||
sha1_init (&ctx);
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
sha1_update_64 (&ctx, w0, w1, w2, w3, 64);
|
||||
|
||||
w0[0] = 0x80000000;
|
||||
w0[1] = 0;
|
||||
w0[2] = 0;
|
||||
w0[3] = 0;
|
||||
w1[0] = 0;
|
||||
w1[1] = 0;
|
||||
w1[2] = 0;
|
||||
w1[3] = 0;
|
||||
w2[0] = 0;
|
||||
w2[1] = 0;
|
||||
w2[2] = 0;
|
||||
w2[3] = 0;
|
||||
w3[0] = 0;
|
||||
w3[1] = 0;
|
||||
w3[2] = 0;
|
||||
w3[3] = 64 * 8;
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
sha1_final (&ctx);
|
||||
|
||||
// now we got the AES key, decrypt the verifier
|
||||
|
||||
@ -1768,9 +1509,9 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
ukeyx[2] = digest_saved[2];
|
||||
ukeyx[3] = digest_saved[3];
|
||||
ukeyx[4] = digest_saved[4];
|
||||
ukeyx[5] = digest[0];
|
||||
ukeyx[6] = digest[1];
|
||||
ukeyx[7] = digest[2];
|
||||
ukeyx[5] = ctx.h[0];
|
||||
ukeyx[6] = ctx.h[1];
|
||||
ukeyx[7] = ctx.h[2];
|
||||
|
||||
AES256_ExpandKey (ukeyx, rek, s_te0, s_te1, s_te2, s_te3, s_te4);
|
||||
|
||||
@ -1791,7 +1532,7 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w0[1] = out[1];
|
||||
w0[2] = out[2];
|
||||
w0[3] = out[3];
|
||||
w1[0] = 0x80000000;
|
||||
w1[0] = 0;
|
||||
w1[1] = 0;
|
||||
w1[2] = 0;
|
||||
w1[3] = 0;
|
||||
@ -1802,22 +1543,20 @@ __kernel void m09400_comp (__global pw_t *pws, __global const kernel_rule_t *rul
|
||||
w3[0] = 0;
|
||||
w3[1] = 0;
|
||||
w3[2] = 0;
|
||||
w3[3] = 16 * 8;
|
||||
w3[3] = 0;
|
||||
|
||||
digest[0] = SHA1M_A;
|
||||
digest[1] = SHA1M_B;
|
||||
digest[2] = SHA1M_C;
|
||||
digest[3] = SHA1M_D;
|
||||
digest[4] = SHA1M_E;
|
||||
sha1_init (&ctx);
|
||||
|
||||
sha1_transform (w0, w1, w2, w3, digest);
|
||||
sha1_update_64 (&ctx, w0, w1, w2, w3, 16);
|
||||
|
||||
sha1_final (&ctx);
|
||||
|
||||
// encrypt it again for verify
|
||||
|
||||
data[0] = digest[0];
|
||||
data[1] = digest[1];
|
||||
data[2] = digest[2];
|
||||
data[3] = digest[3];
|
||||
data[0] = ctx.h[0];
|
||||
data[1] = ctx.h[1];
|
||||
data[2] = ctx.h[2];
|
||||
data[3] = ctx.h[3];
|
||||
|
||||
AES256_encrypt (data, out, rek, s_te0, s_te1, s_te2, s_te3, s_te4);
|
||||
|
||||
|
||||
@ -22732,7 +22732,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig->kern_type = KERN_TYPE_OFFICE2007;
|
||||
hashconfig->dgst_size = DGST_SIZE_4_4;
|
||||
hashconfig->parse_func = office2007_parse_hash;
|
||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE;
|
||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
hashconfig->dgst_pos0 = 0;
|
||||
hashconfig->dgst_pos1 = 1;
|
||||
hashconfig->dgst_pos2 = 2;
|
||||
@ -24651,6 +24652,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
break;
|
||||
case 7900: hashconfig->pw_max = PW_MAX;
|
||||
break;
|
||||
case 9400: hashconfig->pw_max = PW_MAX;
|
||||
break;
|
||||
}
|
||||
|
||||
// pw_max : algo specific hard max length
|
||||
|
||||
Loading…
Reference in New Issue
Block a user