arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-24 07:28:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1829 from Naufragous/office-bug

Browse Source 
Allow cracking non-unique salts for Office 2013
This commit is contained in:
Jens Steube 2018-12-18 14:39:08 +01:00 committed by GitHub
commit 1493bc01cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenCL/m09600-pure.cl
View File

@ -354,12 +354,14 @@ __kernel void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)
AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4);
const u32 digest_cur = digests_offset + loop_pos;
u32 data[4];
data[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
data[1] = esalt_bufs[digests_offset].encryptedVerifier[1];
data[2] = esalt_bufs[digests_offset].encryptedVerifier[2];
data[3] = esalt_bufs[digests_offset].encryptedVerifier[3];
data[0] = esalt_bufs[digest_cur].encryptedVerifier[0];
data[1] = esalt_bufs[digest_cur].encryptedVerifier[1];
data[2] = esalt_bufs[digest_cur].encryptedVerifier[2];
data[3] = esalt_bufs[digest_cur].encryptedVerifier[3];
u32 out[4];

16
src/opencl.c
View File

@ -1481,6 +1481,22 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
if (status_ctx->run_thread_level2 == false) break;
}
}
else if (hashconfig->hash_mode == 9600)
{
const u32 loops_cnt = hashes->salts_buf[salt_pos].digests_cnt;
for (u32 loops_pos = 0; loops_pos < loops_cnt; loops_pos++)
{
device_param->kernel_params_buf32[28] = loops_pos;
device_param->kernel_params_buf32[29] = loops_cnt;
CL_rc = run_kernel (hashcat_ctx, device_param, KERN_RUN_3, pws_cnt, false, 0);
if (CL_rc == -1) return -1;
if (status_ctx->run_thread_level2 == false) break;
}
}
else if ((hashconfig->hash_mode == 16800) || (hashconfig->hash_mode == 16801))
{
const u32 loops_cnt = hashes->salts_buf[salt_pos].digests_cnt;