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

Fix variable declaration block level in -m 19600 and -m 19700

Browse Source
This commit is contained in:
Jens Steube 2021-07-13 22:22:53 +02:00
parent 74fca7bac1
commit 4e773f32b2
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenCL/m19600-pure.cl
View File

@ -800,13 +800,15 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
*/ */
u32 shift = last_block_size % 4; u32 shift = last_block_size % 4;
u32 mask;
switch (remaining_blocks) switch (remaining_blocks)
{ {
case 0: case 0:
last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0];
u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); mask = (0xffffffff >> ((4 - last_block_size) * 8));
last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask);
last_plaintext[0] = hc_swap32_S (last_plaintext[0]); last_plaintext[0] = hc_swap32_S (last_plaintext[0]);
@ -835,7 +837,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
{ {
last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask);
@ -872,7 +874,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
{ {
last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ decrypted_block[1]; last_plaintext[1] = last_block[1] ^ decrypted_block[1];
@ -914,7 +916,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
{ {
last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ decrypted_block[1]; last_plaintext[1] = last_block[1] ^ decrypted_block[1];

10
OpenCL/m19700-pure.cl
View File

@ -863,13 +863,15 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
*/ */
u32 shift = last_block_size % 4; u32 shift = last_block_size % 4;
u32 mask;
switch (remaining_blocks) switch (remaining_blocks)
{ {
case 0: case 0:
last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0];
u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); mask = (0xffffffff >> ((4 - last_block_size) * 8));
last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask);
last_plaintext[0] = hc_swap32_S (last_plaintext[0]); last_plaintext[0] = hc_swap32_S (last_plaintext[0]);
@ -898,7 +900,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
{ {
last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask);
@ -935,7 +937,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
{ {
last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ decrypted_block[1]; last_plaintext[1] = last_block[1] ^ decrypted_block[1];
@ -977,7 +979,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
{ {
last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3];
u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8));
last_plaintext[0] = last_block[0] ^ decrypted_block[0]; last_plaintext[0] = last_block[0] ^ decrypted_block[0];
last_plaintext[1] = last_block[1] ^ decrypted_block[1]; last_plaintext[1] = last_block[1] ^ decrypted_block[1];