1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-27 00:48:13 +00:00

Update -m 23900 from PR to work with updated variable names caused from -a 9

This commit is contained in:
Jens Steube 2020-09-30 14:07:03 +02:00
parent 45ad7f9fe4
commit 0db82afa0e

View File

@ -39,8 +39,8 @@ KERNEL_FQ void m23900_init (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
u32 comb[16]; u32 comb[16];
comb[ 0] = salt_bufs[salt_pos].salt_buf[0]; comb[ 0] = salt_bufs[SALT_POS].salt_buf[0];
comb[ 1] = salt_bufs[salt_pos].salt_buf[1]; comb[ 1] = salt_bufs[SALT_POS].salt_buf[1];
comb[ 2] = hc_swap32_S (pws[gid].i[ 0]); // in theory BE is faster because it comb[ 2] = hc_swap32_S (pws[gid].i[ 0]); // in theory BE is faster because it
comb[ 3] = hc_swap32_S (pws[gid].i[ 1]); // avoids several other byte swaps later on comb[ 3] = hc_swap32_S (pws[gid].i[ 1]); // avoids several other byte swaps later on
@ -365,10 +365,10 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
{ {
u32 data[4]; u32 data[4];
data[0] = esalt_bufs[digests_offset].data[i + 0]; data[0] = esalt_bufs[DIGESTS_OFFSET].data[i + 0];
data[1] = esalt_bufs[digests_offset].data[i + 1]; data[1] = esalt_bufs[DIGESTS_OFFSET].data[i + 1];
data[2] = esalt_bufs[digests_offset].data[i + 2]; data[2] = esalt_bufs[DIGESTS_OFFSET].data[i + 2];
data[3] = esalt_bufs[digests_offset].data[i + 3]; data[3] = esalt_bufs[DIGESTS_OFFSET].data[i + 3];
u32 out[4]; u32 out[4];
@ -444,9 +444,9 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
(digest[2] == res[18]) && (digest[2] == res[18]) &&
(digest[3] == res[19])) (digest[3] == res[19]))
{ {
if (atomic_inc (&hashes_shown[digests_offset]) == 0) if (atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0)
{ {
mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, 0, 0, 0); mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0);
} }
return; return;