mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-24 23:48:39 +00:00
Merge branch 'fix_m08600_a3' of https://github.com/matrix/hashcat into matrix-fix_m08600_a3
This commit is contained in:
commit
c8f4409ee6
@ -62,7 +62,7 @@ __constant u32 lotus_magic_table[256] =
|
|||||||
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf])
|
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf])
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table)
|
static void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table)
|
||||||
{
|
{
|
||||||
u32x p = 0;
|
u32x p = 0;
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_magic_table)
|
static void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_magic_table)
|
||||||
{
|
{
|
||||||
u32x t = out[3] >> 24;
|
u32x t = out[3] >> 24;
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void pad (u32 w[4], const u32 len)
|
static void pad (u32 w[4], const u32 len)
|
||||||
{
|
{
|
||||||
const u32 val = 16 - len;
|
const u32 val = 16 - len;
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ void pad (u32 w[4], const u32 len)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void mdtransform_norecalc (u32x state[4], u32x block[4], __local u32 *s_lotus_magic_table)
|
static void mdtransform_norecalc (u32x state[4], u32x block[4], __local u32 *s_lotus_magic_table)
|
||||||
{
|
{
|
||||||
u32x x[12];
|
u32x x[12];
|
||||||
|
|
||||||
@ -207,14 +207,14 @@ void mdtransform_norecalc (u32x state[4], u32x block[4], __local u32 *s_lotus_ma
|
|||||||
state[3] = x[3];
|
state[3] = x[3];
|
||||||
}
|
}
|
||||||
|
|
||||||
void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s_lotus_magic_table)
|
static void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s_lotus_magic_table)
|
||||||
{
|
{
|
||||||
mdtransform_norecalc (state, block, s_lotus_magic_table);
|
mdtransform_norecalc (state, block, s_lotus_magic_table);
|
||||||
|
|
||||||
lotus_transform_password (block, checksum, s_lotus_magic_table);
|
lotus_transform_password (block, checksum, s_lotus_magic_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table)
|
static void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table)
|
||||||
{
|
{
|
||||||
u32x checksum[4];
|
u32x checksum[4];
|
||||||
|
|
||||||
@ -228,7 +228,7 @@ void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __lo
|
|||||||
mdtransform_norecalc (state, checksum, s_lotus_magic_table);
|
mdtransform_norecalc (state, checksum, s_lotus_magic_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
void m08600m (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __constant u32x * words_buf_r, __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 const void *esalt_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 m08600m (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __constant u32x * words_buf_r, __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 const void *esalt_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
|
||||||
@ -275,7 +275,7 @@ void m08600m (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __g
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void m08600s (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __constant u32x * words_buf_r, __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 const void *esalt_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 m08600s (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const comb_t *combs_buf, __constant u32x * words_buf_r, __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 const void *esalt_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
|
||||||
|
Loading…
Reference in New Issue
Block a user