arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-12 01:28:17 +00:00
Code Issues Releases Wiki Activity

Respect combs_mode in -a 1/6/7 attack in -m 18700

Browse Source
This commit is contained in:
jsteube 2019-02-22 12:43:22 +01:00
parent a0fba5fb11
commit 3dd0a7140d
2 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenCL/m18700_a1-optimized.cl
View File

@ -54,15 +54,24 @@ __kernel void m18700_m04 (KERN_ATTR_BASIC ())
if (gid >= gid_max) return; if (gid >= gid_max) return;
const u32 base = hashCode_g (0, pws[gid].i, pws[gid].pw_len);
/** /**
* loop * loop
*/ */
for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
{ {
const u32 hash = hashCode_g (base, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); u32 hash = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
}
else
{
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
}
const u32x r0 = hash; const u32x r0 = hash;
const u32x r1 = 0; const u32x r1 = 0;
@ -97,8 +106,6 @@ __kernel void m18700_s04 (KERN_ATTR_BASIC ())
if (gid >= gid_max) return; if (gid >= gid_max) return;
const u32 base = hashCode_g (0, pws[gid].i, pws[gid].pw_len);
/** /**
* digest * digest
*/ */
@ -117,7 +124,18 @@ __kernel void m18700_s04 (KERN_ATTR_BASIC ())
for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
{ {
const u32 hash = hashCode_g (base, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); u32 hash = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
}
else
{
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
}
const u32x r0 = hash; const u32x r0 = hash;
const u32x r1 = 0; const u32x r1 = 0;

38
OpenCL/m18700_a1-pure.cl
View File

@ -48,19 +48,24 @@ __kernel void m18700_mxx (KERN_ATTR_BASIC ())
if (gid >= gid_max) return; if (gid >= gid_max) return;
/**
* base
*/
const u32 base = hashCode_g (0, pws[gid].i, pws[gid].pw_len);
/** /**
* loop * loop
*/ */
for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
{ {
const u32 hash = hashCode_g (base, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); u32 hash = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
}
else
{
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
}
const u32x r0 = hash; const u32x r0 = hash;
const u32x r1 = 0; const u32x r1 = 0;
@ -94,19 +99,24 @@ __kernel void m18700_sxx (KERN_ATTR_BASIC ())
0 0
}; };
/**
* base
*/
const u32 base = hashCode_g (0, pws[gid].i, pws[gid].pw_len);
/** /**
* loop * loop
*/ */
for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
{ {
const u32 hash = hashCode_g (base, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); u32 hash = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
{
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
}
else
{
hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len);
}
const u32x r0 = hash; const u32x r0 = hash;
const u32x r1 = 0; const u32x r1 = 0;