X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm00060_a3_m.cl;h=2f1f558284d857358b8a88bb6db6de1a440f2e70;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=f1ced969b12722fc88fbb368861d32e9acfe228b;hpb=e492e34db1dfb509ebb804364735e97ca93acdaf;p=hashcat.git diff --git a/OpenCL/m00060_a3_m.cl b/OpenCL/m00060_a3_m.cl index f1ced96..2f1f558 100644 --- a/OpenCL/m00060_a3_m.cl +++ b/OpenCL/m00060_a3_m.cl @@ -278,14 +278,7 @@ void m00060m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl const u32x w0lr = w0l | w0r; - 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[0] = w0lr; w0_t[1] = w0[1]; w0_t[2] = w0[2]; w0_t[3] = w0[3]; @@ -293,6 +286,11 @@ void m00060m (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]; + + u32x out_len = mangle(w0_t, w1_t, pw_len); + + append_0x80_2x4_VV (w0_t, w1_t, out_len); + w2_t[0] = 0; w2_t[1] = 0; w2_t[2] = 0; @@ -410,13 +408,18 @@ 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]; - 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; + + u32x out_len = mangle(w0_t, w1_t, pw_len); + + append_0x80_2x4_VV (w0_t, w1_t, out_len); + + 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];