projects
/
hashcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e492e34
)
Extend mangle throughout m 60 a 3
author
David Llewellyn-Jones
<david@flypig.co.uk>
Fri, 26 Aug 2016 17:33:15 +0000
(18:33 +0100)
committer
David Llewellyn-Jones
<david@flypig.co.uk>
Fri, 26 Aug 2016 17:33:15 +0000
(18:33 +0100)
OpenCL/m00060_a3_m.cl
patch
|
blob
|
history
diff --git
a/OpenCL/m00060_a3_m.cl
b/OpenCL/m00060_a3_m.cl
index
f1ced96
..
0a4c2f2
100644
(file)
--- a/
OpenCL/m00060_a3_m.cl
+++ b/
OpenCL/m00060_a3_m.cl
@@
-284,7
+284,6
@@
void m00060m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
append_0x80_2x4_VV (w0, w1, out_len);
append_0x80_2x4_VV (w0, w1, out_len);
-
w0_t[0] = w0[0];
w0_t[1] = w0[1];
w0_t[2] = w0[2];
w0_t[0] = w0[0];
w0_t[1] = w0[1];
w0_t[2] = w0[2];
@@
-402,7
+401,13
@@
void m00060s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
const u32x w0lr = w0l | w0r;
const u32x w0lr = w0l | w0r;
- w0_t[0] = w0lr;
+ w0[0] = w0lr;
+
+ u32x out_len = mangle(w0, w1, pw_len);
+
+ append_0x80_2x4_VV (w0, w1, out_len);
+
+ w0_t[0] = w0[0];
w0_t[1] = w0[1];
w0_t[2] = w0[2];
w0_t[3] = w0[3];
w0_t[1] = w0[1];
w0_t[2] = w0[2];
w0_t[3] = w0[3];
@@
-410,13
+415,13
@@
void m00060s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
w1_t[1] = w1[1];
w1_t[2] = w1[2];
w1_t[3] = w1[3];
w1_t[1] = w1[1];
w1_t[2] = w1[2];
w1_t[3] = w1[3];
- w2_t[0] = w2[0];
- w2_t[1] = w2[1];
- w2_t[2] = w2[2];
- w2_t[3] = w2[3];
- w3_t[0] = w3[0];
- w3_t[1] = w3[1];
- w3_t[2] = (64 + pw_len) * 8;
+ w2_t[0] = 0;
+ w2_t[1] = 0;
+ w2_t[2] = 0;
+ w2_t[3] = 0;
+ w3_t[0] = 0;
+ w3_t[1] = 0;
+ w3_t[2] = (64 + out_len) * 8;
w3_t[3] = 0;
u32x digest[4];
w3_t[3] = 0;
u32x digest[4];