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

remove debug printfs, added changes.txt

Browse Source
This commit is contained in:
Your Name 2023-03-07 23:50:49 +01:00
parent 45b803988c
commit 6bc86d06b1
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
OpenCL/m25400-pure.cl
View File

@ -296,25 +296,21 @@ KERNEL_FQ void m25400_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
rc4_init_128 (S, o_rc4_decryption_key, lid); rc4_init_128 (S, o_rc4_decryption_key, lid);
j = rc4_next_16 (S, 0, 0, out, out, lid); // output of the rc4 decrypt of the o-value should be the padded user-password j = rc4_next_16 (S, 0, 0, out, out, lid); // output of the rc4 decrypt of the o-value should be the padded user-password
tmps[gid].out[0] = out[0];
tmps[gid].out[1] = out[1];
tmps[gid].out[2] = out[2];
tmps[gid].out[3] = out[3];
rc4_next_16 (S, 16, j, out2, out2, lid); // decrypt a second block of rc4 to improve plaintext check and limit false positives
tmps[gid].out[4] = out2[0];
tmps[gid].out[5] = out2[1];
tmps[gid].out[6] = out2[2];
tmps[gid].out[7] = out2[3];
tmps[gid].digest[0] = digest[0]; tmps[gid].digest[0] = digest[0];
tmps[gid].digest[1] = digest[1]; tmps[gid].digest[1] = digest[1];
tmps[gid].digest[2] = digest[2]; tmps[gid].digest[2] = digest[2];
tmps[gid].digest[3] = digest[3]; tmps[gid].digest[3] = digest[3];
tmps[gid].out[0] = out[0];
tmps[gid].out[1] = out[1];
tmps[gid].out[2] = out[2];
tmps[gid].out[3] = out[3];
if ((gid == 0) && (lid == 0)) printf ("out[3]=%08x\n", out[3]);
rc4_next_16 (S, 16, j, out2, out2, lid); // decrypt a second block of rc4 to improve plaintext check and limit false positives
if ((gid == 0) && (lid == 0)) printf ("out2[0]=%08x\n", out2[0]);
tmps[gid].out[4] = out2[0];
if ((gid == 0) && (lid == 0)) printf ("tmps[gid].out[4]=%08x\n", tmps[gid].out[4]);
tmps[gid].out[5] = out2[1];
tmps[gid].out[6] = out2[2];
tmps[gid].out[7] = out2[3];
} }
KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
@ -391,34 +387,34 @@ KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
{ {
if (u8OutBufPtr[i] == u8OutPadPtr[i_padding]) if (u8OutBufPtr[i] == u8OutPadPtr[i_padding])
{ {
if ((gid == 0) && (lid == 0)) printf("correct padding byte[%d]=0x%02x==0x%02x\n", i, u8OutBufPtr[i], u8OutPadPtr[i_padding]); //if ((gid == 0) && (lid == 0)) printf("correct padding byte[%d]=0x%02x==0x%02x\n", i, u8OutBufPtr[i], u8OutPadPtr[i_padding]);
i_padding = i_padding + 1; i_padding = i_padding + 1;
} }
else else
{ {
if (u8OutBufPtr[i] >= 0x20 && u8OutBufPtr[i] <= 0x7e) if (u8OutBufPtr[i] >= 0x20 && u8OutBufPtr[i] <= 0x7e)
{ {
if ((gid == 0) && (lid == 0)) printf("correct ASCII byte[%d]=0x%02x\n", i, u8OutBufPtr[i]); //if ((gid == 0) && (lid == 0)) printf("correct ASCII byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
} }
} }
} }
else else
{ {
if ((gid == 0) && (lid == 0)) { //if ((gid == 0) && (lid == 0)) {
printf("wrong byte[%d]=0x%02x\n", i, u8OutBufPtr[i]); // printf("wrong byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
//
printf("u8OutBufPtr=0x"); // printf("u8OutBufPtr=0x");
for(int j=0;j<32;j++) { // for(int j=0;j<32;j++) {
printf("%02x", u8OutBufPtr[j]); // printf("%02x", u8OutBufPtr[j]);
} // }
printf("\n"); // printf("\n");
//
printf("u8OutPadPtr=0x"); // printf("u8OutPadPtr=0x");
for(int j=0;j<32;j++) { // for(int j=0;j<32;j++) {
printf("%02x", u8OutPadPtr[j]); // printf("%02x", u8OutPadPtr[j]);
} // }
printf("\n"); // printf("\n");
} //}
correct = false; correct = false;
break; break;
} }

1
docs/changes.txt
View File

@ -40,6 +40,7 @@
- Prevent Hashcat from hanging by checking during startup that the output file is a named pipe - Prevent Hashcat from hanging by checking during startup that the output file is a named pipe
- Fixed debug mode 5 by adding the missing colon between original-word and finding-rule - Fixed debug mode 5 by adding the missing colon between original-word and finding-rule
- Skip generated rule that was the result of chaining rule operation and caused this generated rule to exceed the maximum number of function calls - Skip generated rule that was the result of chaining rule operation and caused this generated rule to exceed the maximum number of function calls
- Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes for 25400 to prevent false positives.
## ##
## Technical ## Technical