mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-28 02:49:18 +00:00
Merge branch 'matrix-fix_m10420_a3'
This commit is contained in:
commit
986910518f
@ -26,7 +26,7 @@ __constant u32 padding[8] =
|
|||||||
0x7a695364
|
0x7a695364
|
||||||
};
|
};
|
||||||
|
|
||||||
void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
|
static void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
|
||||||
{
|
{
|
||||||
u32 a = digest[0];
|
u32 a = digest[0];
|
||||||
u32 b = digest[1];
|
u32 b = digest[1];
|
||||||
@ -124,105 +124,7 @@ void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u
|
|||||||
digest[3] += d;
|
digest[3] += d;
|
||||||
}
|
}
|
||||||
|
|
||||||
void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4])
|
static void m10420m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset)
|
||||||
{
|
|
||||||
u32x a = digest[0];
|
|
||||||
u32x b = digest[1];
|
|
||||||
u32x c = digest[2];
|
|
||||||
u32x d = digest[3];
|
|
||||||
|
|
||||||
u32x w0_t = w0[0];
|
|
||||||
u32x w1_t = w0[1];
|
|
||||||
u32x w2_t = w0[2];
|
|
||||||
u32x w3_t = w0[3];
|
|
||||||
u32x w4_t = w1[0];
|
|
||||||
u32x w5_t = w1[1];
|
|
||||||
u32x w6_t = w1[2];
|
|
||||||
u32x w7_t = w1[3];
|
|
||||||
u32x w8_t = w2[0];
|
|
||||||
u32x w9_t = w2[1];
|
|
||||||
u32x wa_t = w2[2];
|
|
||||||
u32x wb_t = w2[3];
|
|
||||||
u32x wc_t = w3[0];
|
|
||||||
u32x wd_t = w3[1];
|
|
||||||
u32x we_t = w3[2];
|
|
||||||
u32x wf_t = w3[3];
|
|
||||||
|
|
||||||
MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
|
|
||||||
MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
|
|
||||||
MD5_STEP (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
|
|
||||||
MD5_STEP (MD5_Fo, b, c, d, a, w3_t, MD5C03, MD5S03);
|
|
||||||
MD5_STEP (MD5_Fo, a, b, c, d, w4_t, MD5C04, MD5S00);
|
|
||||||
MD5_STEP (MD5_Fo, d, a, b, c, w5_t, MD5C05, MD5S01);
|
|
||||||
MD5_STEP (MD5_Fo, c, d, a, b, w6_t, MD5C06, MD5S02);
|
|
||||||
MD5_STEP (MD5_Fo, b, c, d, a, w7_t, MD5C07, MD5S03);
|
|
||||||
MD5_STEP (MD5_Fo, a, b, c, d, w8_t, MD5C08, MD5S00);
|
|
||||||
MD5_STEP (MD5_Fo, d, a, b, c, w9_t, MD5C09, MD5S01);
|
|
||||||
MD5_STEP (MD5_Fo, c, d, a, b, wa_t, MD5C0a, MD5S02);
|
|
||||||
MD5_STEP (MD5_Fo, b, c, d, a, wb_t, MD5C0b, MD5S03);
|
|
||||||
MD5_STEP (MD5_Fo, a, b, c, d, wc_t, MD5C0c, MD5S00);
|
|
||||||
MD5_STEP (MD5_Fo, d, a, b, c, wd_t, MD5C0d, MD5S01);
|
|
||||||
MD5_STEP (MD5_Fo, c, d, a, b, we_t, MD5C0e, MD5S02);
|
|
||||||
MD5_STEP (MD5_Fo, b, c, d, a, wf_t, MD5C0f, MD5S03);
|
|
||||||
|
|
||||||
MD5_STEP (MD5_Go, a, b, c, d, w1_t, MD5C10, MD5S10);
|
|
||||||
MD5_STEP (MD5_Go, d, a, b, c, w6_t, MD5C11, MD5S11);
|
|
||||||
MD5_STEP (MD5_Go, c, d, a, b, wb_t, MD5C12, MD5S12);
|
|
||||||
MD5_STEP (MD5_Go, b, c, d, a, w0_t, MD5C13, MD5S13);
|
|
||||||
MD5_STEP (MD5_Go, a, b, c, d, w5_t, MD5C14, MD5S10);
|
|
||||||
MD5_STEP (MD5_Go, d, a, b, c, wa_t, MD5C15, MD5S11);
|
|
||||||
MD5_STEP (MD5_Go, c, d, a, b, wf_t, MD5C16, MD5S12);
|
|
||||||
MD5_STEP (MD5_Go, b, c, d, a, w4_t, MD5C17, MD5S13);
|
|
||||||
MD5_STEP (MD5_Go, a, b, c, d, w9_t, MD5C18, MD5S10);
|
|
||||||
MD5_STEP (MD5_Go, d, a, b, c, we_t, MD5C19, MD5S11);
|
|
||||||
MD5_STEP (MD5_Go, c, d, a, b, w3_t, MD5C1a, MD5S12);
|
|
||||||
MD5_STEP (MD5_Go, b, c, d, a, w8_t, MD5C1b, MD5S13);
|
|
||||||
MD5_STEP (MD5_Go, a, b, c, d, wd_t, MD5C1c, MD5S10);
|
|
||||||
MD5_STEP (MD5_Go, d, a, b, c, w2_t, MD5C1d, MD5S11);
|
|
||||||
MD5_STEP (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
|
|
||||||
MD5_STEP (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
|
|
||||||
|
|
||||||
MD5_STEP (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
|
|
||||||
MD5_STEP (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
|
|
||||||
MD5_STEP (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
|
|
||||||
MD5_STEP (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
|
|
||||||
MD5_STEP (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
|
|
||||||
MD5_STEP (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
|
|
||||||
MD5_STEP (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
|
|
||||||
MD5_STEP (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
|
|
||||||
MD5_STEP (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
|
|
||||||
MD5_STEP (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
|
|
||||||
MD5_STEP (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
|
|
||||||
MD5_STEP (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
|
|
||||||
MD5_STEP (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
|
|
||||||
MD5_STEP (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
|
|
||||||
MD5_STEP (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
|
|
||||||
MD5_STEP (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
|
|
||||||
|
|
||||||
MD5_STEP (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
|
|
||||||
MD5_STEP (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
|
|
||||||
MD5_STEP (MD5_I , c, d, a, b, we_t, MD5C32, MD5S32);
|
|
||||||
MD5_STEP (MD5_I , b, c, d, a, w5_t, MD5C33, MD5S33);
|
|
||||||
MD5_STEP (MD5_I , a, b, c, d, wc_t, MD5C34, MD5S30);
|
|
||||||
MD5_STEP (MD5_I , d, a, b, c, w3_t, MD5C35, MD5S31);
|
|
||||||
MD5_STEP (MD5_I , c, d, a, b, wa_t, MD5C36, MD5S32);
|
|
||||||
MD5_STEP (MD5_I , b, c, d, a, w1_t, MD5C37, MD5S33);
|
|
||||||
MD5_STEP (MD5_I , a, b, c, d, w8_t, MD5C38, MD5S30);
|
|
||||||
MD5_STEP (MD5_I , d, a, b, c, wf_t, MD5C39, MD5S31);
|
|
||||||
MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
|
|
||||||
MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
|
|
||||||
MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
|
|
||||||
MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
|
|
||||||
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
|
|
||||||
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
|
|
||||||
|
|
||||||
digest[0] += a;
|
|
||||||
digest[1] += b;
|
|
||||||
digest[2] += c;
|
|
||||||
digest[3] += d;
|
|
||||||
}
|
|
||||||
|
|
||||||
void m10420m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset)
|
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* modifier
|
* modifier
|
||||||
@ -375,7 +277,7 @@ void m10420m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void m10420s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset)
|
static void m10420s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset)
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* modifier
|
* modifier
|
||||||
@ -510,7 +412,7 @@ void m10420s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
|
|||||||
digest[2] = MD5M_C;
|
digest[2] = MD5M_C;
|
||||||
digest[3] = MD5M_D;
|
digest[3] = MD5M_D;
|
||||||
|
|
||||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
md5_transform_S (w0_t, w1_t, w2_t, w3_t, digest);
|
||||||
|
|
||||||
w0_t[0] = P;
|
w0_t[0] = P;
|
||||||
w0_t[1] = id_buf[0];
|
w0_t[1] = id_buf[0];
|
||||||
@ -529,7 +431,7 @@ void m10420s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __gl
|
|||||||
w3_t[2] = 84 * 8;
|
w3_t[2] = 84 * 8;
|
||||||
w3_t[3] = 0;
|
w3_t[3] = 0;
|
||||||
|
|
||||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
md5_transform_S (w0_t, w1_t, w2_t, w3_t, digest);
|
||||||
|
|
||||||
u32x a = digest[0];
|
u32x a = digest[0];
|
||||||
u32x b = digest[1] & 0xff;
|
u32x b = digest[1] & 0xff;
|
||||||
|
Loading…
Reference in New Issue
Block a user