1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 19:38:18 +00:00

A bit optimized -m 500 pure kernel

This commit is contained in:
Jens Steube 2018-02-14 19:13:23 +01:00
parent b626e7f61b
commit f6f16f56af
3 changed files with 189 additions and 36 deletions

View File

@ -159,7 +159,7 @@ __kernel void m00500_loop (__global pw_t *pws, __global const kernel_rule_t *rul
* digest * digest
*/ */
u32 digest[16] = { 0 }; u32 digest[16] = { 0 }; // has to be 16 because of update()
digest[0] = tmps[gid].digest_buf[0]; digest[0] = tmps[gid].digest_buf[0];
digest[1] = tmps[gid].digest_buf[1]; digest[1] = tmps[gid].digest_buf[1];
@ -172,36 +172,87 @@ __kernel void m00500_loop (__global pw_t *pws, __global const kernel_rule_t *rul
for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++)
{ {
const u32 j1 = (j & 1) ? 1 : 0;
const u32 j3 = (j % 3) ? 2 : 0;
const u32 j7 = (j % 7) ? 4 : 0;
const u32 pc = j1 + j3 + j7;
md5_ctx_t md5_ctx; md5_ctx_t md5_ctx;
md5_init (&md5_ctx); md5_init (&md5_ctx);
if (j & 1) if (pc == 0)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else else if (pc == 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else if (pc == 2)
if (j % 3)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len); md5_update (&md5_ctx, s, salt_len);
}
if (j % 7)
{
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else if (pc == 3)
if (j & 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else else if (pc == 4)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 5)
{ {
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
}
else if (pc == 6)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 7)
{
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
} }
md5_final (&md5_ctx); md5_final (&md5_ctx);

View File

@ -161,7 +161,7 @@ __kernel void m01600_loop (__global pw_t *pws, __global const kernel_rule_t *rul
* digest * digest
*/ */
u32 digest[16] = { 0 }; u32 digest[16] = { 0 }; // has to be 16 because of update()
digest[0] = tmps[gid].digest_buf[0]; digest[0] = tmps[gid].digest_buf[0];
digest[1] = tmps[gid].digest_buf[1]; digest[1] = tmps[gid].digest_buf[1];
@ -174,36 +174,87 @@ __kernel void m01600_loop (__global pw_t *pws, __global const kernel_rule_t *rul
for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++)
{ {
const u32 j1 = (j & 1) ? 1 : 0;
const u32 j3 = (j % 3) ? 2 : 0;
const u32 j7 = (j % 7) ? 4 : 0;
const u32 pc = j1 + j3 + j7;
md5_ctx_t md5_ctx; md5_ctx_t md5_ctx;
md5_init (&md5_ctx); md5_init (&md5_ctx);
if (j & 1) if (pc == 0)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else else if (pc == 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else if (pc == 2)
if (j % 3)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len); md5_update (&md5_ctx, s, salt_len);
}
if (j % 7)
{
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else if (pc == 3)
if (j & 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else else if (pc == 4)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 5)
{ {
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
}
else if (pc == 6)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 7)
{
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
} }
md5_final (&md5_ctx); md5_final (&md5_ctx);

View File

@ -151,7 +151,7 @@ __kernel void m06300_loop (__global pw_t *pws, __global const kernel_rule_t *rul
* digest * digest
*/ */
u32 digest[16] = { 0 }; u32 digest[16] = { 0 }; // has to be 16 because of update()
digest[0] = tmps[gid].digest_buf[0]; digest[0] = tmps[gid].digest_buf[0];
digest[1] = tmps[gid].digest_buf[1]; digest[1] = tmps[gid].digest_buf[1];
@ -164,36 +164,87 @@ __kernel void m06300_loop (__global pw_t *pws, __global const kernel_rule_t *rul
for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++)
{ {
const u32 j1 = (j & 1) ? 1 : 0;
const u32 j3 = (j % 3) ? 2 : 0;
const u32 j7 = (j % 7) ? 4 : 0;
const u32 pc = j1 + j3 + j7;
md5_ctx_t md5_ctx; md5_ctx_t md5_ctx;
md5_init (&md5_ctx); md5_init (&md5_ctx);
if (j & 1) if (pc == 0)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else else if (pc == 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else if (pc == 2)
if (j % 3)
{ {
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len); md5_update (&md5_ctx, s, salt_len);
}
if (j % 7)
{
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
} }
else if (pc == 3)
if (j & 1)
{ {
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, digest, 16); md5_update (&md5_ctx, digest, 16);
} }
else else if (pc == 4)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 5)
{ {
md5_update (&md5_ctx, w, pw_len); md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
}
else if (pc == 6)
{
md5_ctx.w0[0] = digest[0];
md5_ctx.w0[1] = digest[1];
md5_ctx.w0[2] = digest[2];
md5_ctx.w0[3] = digest[3];
md5_ctx.len = 16;
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, w, pw_len);
}
else if (pc == 7)
{
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, s, salt_len);
md5_update (&md5_ctx, w, pw_len);
md5_update (&md5_ctx, digest, 16);
} }
md5_final (&md5_ctx); md5_final (&md5_ctx);