arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-06 22:01:15 +00:00
Code Issues Releases Wiki Activity

Fix -a 3 for -m 31400 in vector datatype mode

Browse Source
This commit is contained in:
jsteube 2023-03-18 23:16:01 +00:00
parent d820cfa48e
commit 074411418f
5 changed files with 643 additions and 801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenCL/m31400_a0-pure.cl
View File

@ -114,8 +114,7 @@ const int offset_switch = offset / 4;
#endif #endif
} }
DECLSPEC void aes256_scrt_format (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32 *pw, const u32 pw_len, PRIVATE_AS u32 *hash, PRIVATE_AS u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4)
DECLSPEC void aes256_scrt_format (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32 *pw, const int pw_len, PRIVATE_AS u32 *hash, PRIVATE_AS u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4)
{ {
AES256_set_encrypt_key (aes_ks, hash, s_te0, s_te1, s_te2, s_te3); AES256_set_encrypt_key (aes_ks, hash, s_te0, s_te1, s_te2, s_te3);
@ -180,12 +179,12 @@ KERNEL_FQ void m31400_mxx (KERN_ATTR_RULES ())
COPY_PW (pws[gid]); COPY_PW (pws[gid]);
u32 ks[60];
/** /**
* loop * loop
*/ */
u32 ks[60];
for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
{ {
pw_t tmp = PASTE_PW; pw_t tmp = PASTE_PW;
@ -215,7 +214,6 @@ KERNEL_FQ void m31400_mxx (KERN_ATTR_RULES ())
KERNEL_FQ void m31400_sxx (KERN_ATTR_RULES ()) KERNEL_FQ void m31400_sxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier
*/ */

11
OpenCL/m31400_a1-pure.cl
View File

@ -114,8 +114,7 @@ const int offset_switch = offset / 4;
#endif #endif
} }
DECLSPEC void aes256_scrt_format (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32 *pw, const u32 pw_len, PRIVATE_AS u32 *hash, PRIVATE_AS u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4)
DECLSPEC void aes256_scrt_format (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32 *pw, const int pw_len, PRIVATE_AS u32 *hash, PRIVATE_AS u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4)
{ {
AES256_set_encrypt_key (aes_ks, hash, s_te0, s_te1, s_te2, s_te3); AES256_set_encrypt_key (aes_ks, hash, s_te0, s_te1, s_te2, s_te3);
@ -184,12 +183,12 @@ KERNEL_FQ void m31400_mxx (KERN_ATTR_BASIC ())
sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
u32 ks[60];
/** /**
* loop * loop
*/ */
u32 ks[60];
for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
{ {
sha256_ctx_t ctx = ctx0; sha256_ctx_t ctx = ctx0;
@ -197,9 +196,11 @@ KERNEL_FQ void m31400_mxx (KERN_ATTR_BASIC ())
sha256_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); sha256_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
u32 pw_candidate[3]; u32 pw_candidate[3];
pw_candidate[0] = hc_swap32_S (ctx.w0[0]); pw_candidate[0] = hc_swap32_S (ctx.w0[0]);
pw_candidate[1] = hc_swap32_S (ctx.w0[1]); pw_candidate[1] = hc_swap32_S (ctx.w0[1]);
pw_candidate[2] = hc_swap32_S (ctx.w0[2]); pw_candidate[2] = hc_swap32_S (ctx.w0[2]);
u32 pw_len=ctx.len; u32 pw_len=ctx.len;
sha256_final (&ctx); sha256_final (&ctx);
@ -297,9 +298,11 @@ KERNEL_FQ void m31400_sxx (KERN_ATTR_BASIC ())
sha256_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); sha256_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
u32 pw_candidate[3]; u32 pw_candidate[3];
pw_candidate[0] = hc_swap32_S (ctx.w0[0]); pw_candidate[0] = hc_swap32_S (ctx.w0[0]);
pw_candidate[1] = hc_swap32_S (ctx.w0[1]); pw_candidate[1] = hc_swap32_S (ctx.w0[1]);
pw_candidate[2] = hc_swap32_S (ctx.w0[2]); pw_candidate[2] = hc_swap32_S (ctx.w0[2]);
u32 pw_len=ctx.len; u32 pw_len=ctx.len;
sha256_final (&ctx); sha256_final (&ctx);

330
OpenCL/m31400_a3-pure.cl
View File

@ -128,335 +128,174 @@ DECLSPEC void aes256_scrt_format (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32 *pw, co
AES256_encrypt (aes_ks, hash, out, s_te0, s_te1, s_te2, s_te3, s_te4); AES256_encrypt (aes_ks, hash, out, s_te0, s_te1, s_te2, s_te3, s_te4);
} }
DECLSPEC void aes256_scrt_format_VV(PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32x *w, const u32 pw_len, PRIVATE_AS u32x *hash, PRIVATE_AS u32x *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) DECLSPEC void aes256_scrt_format_VV (PRIVATE_AS u32 *aes_ks, PRIVATE_AS u32x *w, const u32 pw_len, PRIVATE_AS u32x *h, PRIVATE_AS u32x *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4)
{ {
#if VECT_SIZE == 1 #if VECT_SIZE == 1
aes256_scrt_format(aes_ks, w, pw_len, hash, out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, w, pw_len, h, out, s_te0, s_te1, s_te2, s_te3, s_te4);
#endif #endif
#if VECT_SIZE >= 2 #if VECT_SIZE >= 2
u32 tmp_w[16];
u32 tmp_w[4]; u32 tmp_h[8];
u32 tmp_hash[4];
u32 tmp_out[4]; u32 tmp_out[4];
//s0 //s0
tmp_w[0] = w[0].s0;
tmp_w[1] = w[1].s0;
tmp_w[2] = w[2].s0;
tmp_w[3] = w[3].s0;
tmp_hash[0] = hash[0].s0; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s0;
tmp_hash[1] = hash[1].s0; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s0;
tmp_hash[2] = hash[2].s0;
tmp_hash[3] = hash[3].s0;
aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); for (u32 i = 0; i < 4; i++) out[i].s0 = tmp_out[i];
out[0].s0 = tmp_out[0];
out[1].s0 = tmp_out[1];
out[2].s0 = tmp_out[2];
out[3].s0 = tmp_out[3];
//s1 //s1
tmp_w[0] = w[0].s1;
tmp_w[1] = w[1].s1;
tmp_w[2] = w[2].s1;
tmp_w[3] = w[3].s1;
tmp_hash[0] = hash[0].s1; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s1;
tmp_hash[1] = hash[1].s1; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s1;
tmp_hash[2] = hash[2].s1;
tmp_hash[3] = hash[3].s1;
aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); for (u32 i = 0; i < 4; i++) out[i].s1 = tmp_out[i];
out[0].s1 = tmp_out[0];
out[1].s1 = tmp_out[1];
out[2].s1 = tmp_out[2];
out[3].s1 = tmp_out[3];
#endif #endif
#if VECT_SIZE >= 4 #if VECT_SIZE >= 4
//s2 //s2
tmp_w[0] = w[0].s2;
tmp_w[1] = w[1].s2;
tmp_w[2] = w[2].s2;
tmp_w[3] = w[3].s2;
tmp_hash[0] = hash[0].s2; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s2;
tmp_hash[1] = hash[1].s2; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s2;
tmp_hash[2] = hash[2].s2;
tmp_hash[3] = hash[3].s2;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s2 = tmp_out[0];
out[1].s2 = tmp_out[1];
out[2].s2 = tmp_out[2];
out[3].s2 = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].s2 = tmp_out[i];
//s3 //s3
tmp_w[0] = w[0].s3;
tmp_w[1] = w[1].s3;
tmp_w[2] = w[2].s3;
tmp_w[3] = w[3].s3;
tmp_hash[0] = hash[0].s3; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s3;
tmp_hash[1] = hash[1].s3; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s3;
tmp_hash[2] = hash[2].s3;
tmp_hash[3] = hash[3].s3;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s3 = tmp_out[0];
out[1].s3 = tmp_out[1];
out[2].s3 = tmp_out[2];
out[3].s3 = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].s3 = tmp_out[i];
#endif #endif
#if VECT_SIZE >= 8 #if VECT_SIZE >= 8
//s4 //s4
tmp_w[0] = w[0].s4;
tmp_w[1] = w[1].s4;
tmp_w[2] = w[2].s4;
tmp_w[3] = w[3].s4;
tmp_hash[0] = hash[0].s4; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s4;
tmp_hash[1] = hash[1].s4; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s4;
tmp_hash[2] = hash[2].s4;
tmp_hash[3] = hash[3].s4;
aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); for (u32 i = 0; i < 4; i++) out[i].s4 = tmp_out[i];
out[0].s4 = tmp_out[0];
out[1].s4 = tmp_out[1];
out[2].s4 = tmp_out[2];
out[3].s4 = tmp_out[3];
//s5 //s5
tmp_w[0] = w[0].s5;
tmp_w[1] = w[1].s5;
tmp_w[2] = w[2].s5;
tmp_w[3] = w[3].s5;
tmp_hash[0] = hash[0].s5; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s5;
tmp_hash[1] = hash[1].s5; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s5;
tmp_hash[2] = hash[2].s5;
tmp_hash[3] = hash[3].s5;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s5 = tmp_out[0];
out[1].s5 = tmp_out[1];
out[2].s5 = tmp_out[2];
out[3].s5 = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].s5 = tmp_out[i];
//s6 //s6
tmp_w[0] = w[0].s6;
tmp_w[1] = w[1].s6;
tmp_w[2] = w[2].s6;
tmp_w[3] = w[3].s6;
tmp_hash[0] = hash[0].s6; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s6;
tmp_hash[1] = hash[1].s6; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s6;
tmp_hash[2] = hash[2].s6;
tmp_hash[3] = hash[3].s6;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s6 = tmp_out[0];
out[1].s6 = tmp_out[1];
out[2].s6 = tmp_out[2];
out[3].s6 = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].s6 = tmp_out[i];
//s7 //s7
tmp_w[0] = w[0].s7;
tmp_w[1] = w[1].s7;
tmp_w[2] = w[2].s7;
tmp_w[3] = w[3].s7;
tmp_hash[0] = hash[0].s7; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s7;
tmp_hash[1] = hash[1].s7; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s7;
tmp_hash[2] = hash[2].s7;
tmp_hash[3] = hash[3].s7;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s7 = tmp_out[0]; for (u32 i = 0; i < 4; i++) out[i].s7 = tmp_out[i];
out[1].s7 = tmp_out[1];
out[2].s7 = tmp_out[2];
out[3].s7 = tmp_out[3];
#endif #endif
#if VECT_SIZE >= 16 #if VECT_SIZE >= 16
//s8 //s8
tmp_w[0] = w[0].s8;
tmp_w[1] = w[1].s8;
tmp_w[2] = w[2].s8;
tmp_w[3] = w[3].s8;
tmp_hash[0] = hash[0].s8; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s8;
tmp_hash[1] = hash[1].s8; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s8;
tmp_hash[2] = hash[2].s8;
tmp_hash[3] = hash[3].s8;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s8 = tmp_out[0];
out[1].s8 = tmp_out[1];
out[2].s8 = tmp_out[2];
out[3].s8 = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].s8 = tmp_out[i];
//s9 //s9
tmp_w[0] = w[0].s9;
tmp_w[1] = w[1].s9;
tmp_w[2] = w[2].s9;
tmp_w[3] = w[3].s9;
tmp_hash[0] = hash[0].s9; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].s9;
tmp_hash[1] = hash[1].s9; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].s9;
tmp_hash[2] = hash[2].s9;
tmp_hash[3] = hash[3].s9;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].s9 = tmp_out[0]; for (u32 i = 0; i < 4; i++) out[i].s9 = tmp_out[i];
out[1].s9 = tmp_out[1];
out[2].s9 = tmp_out[2];
out[3].s9 = tmp_out[3];
//sa
//s10 for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].sa;
tmp_w[0] = w[0].sa; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].sa;
tmp_w[1] = w[1].sa;
tmp_w[2] = w[2].sa;
tmp_w[3] = w[3].sa;
tmp_hash[0] = hash[0].sa; aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
tmp_hash[1] = hash[1].sa;
tmp_hash[2] = hash[2].sa;
tmp_hash[3] = hash[3].sa;
for (u32 i = 0; i < 4; i++) out[i].sa = tmp_out[i];
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); //sb
out[0].sa = tmp_out[0]; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].sb;
out[1].sa = tmp_out[1]; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].sb;
out[2].sa = tmp_out[2];
out[3].sa = tmp_out[3];
aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
//s11 for (u32 i = 0; i < 4; i++) out[i].sb = tmp_out[i];
tmp_w[0] = w[0].sb;
tmp_w[1] = w[1].sb;
tmp_w[2] = w[2].sb;
tmp_w[3] = w[3].sb;
tmp_hash[0] = hash[0].sb; //sc
tmp_hash[1] = hash[1].sb;
tmp_hash[2] = hash[2].sb;
tmp_hash[3] = hash[3].sb;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].sc;
for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].sc;
out[0].sb = tmp_out[0]; aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[1].sb = tmp_out[1];
out[2].sb = tmp_out[2];
out[3].sb = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].sc = tmp_out[i];
//s12 //sd
tmp_w[0] = w[0].sc;
tmp_w[1] = w[1].sc;
tmp_w[2] = w[2].sc;
tmp_w[3] = w[3].sc;
tmp_hash[0] = hash[0].sc; for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].sd;
tmp_hash[1] = hash[1].sc; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].sd;
tmp_hash[2] = hash[2].sc;
tmp_hash[3] = hash[3].sc;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].sc = tmp_out[0]; for (u32 i = 0; i < 4; i++) out[i].sd = tmp_out[i];
out[1].sc = tmp_out[1];
out[2].sc = tmp_out[2];
out[3].sc = tmp_out[3];
//se
//s13 for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].se;
tmp_w[0] = w[0].sd; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].se;
tmp_w[1] = w[1].sd;
tmp_w[2] = w[2].sd;
tmp_w[3] = w[3].sd;
tmp_hash[0] = hash[0].sd; aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
tmp_hash[1] = hash[1].sd;
tmp_hash[2] = hash[2].sd;
tmp_hash[3] = hash[3].sd;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4); for (u32 i = 0; i < 4; i++) out[i].se = tmp_out[i];
out[0].sd = tmp_out[0]; //sf
out[1].sd = tmp_out[1];
out[2].sd = tmp_out[2];
out[3].sd = tmp_out[3];
//s14 for (u32 i = 0; i < 64; i++) tmp_w[i] = w[i].sf;
tmp_w[0] = w[0].se; for (u32 i = 0; i < 8; i++) tmp_h[i] = h[i].sf;
tmp_w[1] = w[1].se;
tmp_w[2] = w[2].se;
tmp_w[3] = w[3].se;
tmp_hash[0] = hash[0].se; aes256_scrt_format (aes_ks, tmp_w, pw_len, tmp_h, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
tmp_hash[1] = hash[1].se;
tmp_hash[2] = hash[2].se;
tmp_hash[3] = hash[3].se;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].se = tmp_out[0];
out[1].se = tmp_out[1];
out[2].se = tmp_out[2];
out[3].se = tmp_out[3];
//s15
tmp_w[0] = w[0].sf;
tmp_w[1] = w[1].sf;
tmp_w[2] = w[2].sf;
tmp_w[3] = w[3].sf;
tmp_hash[0] = hash[0].sf;
tmp_hash[1] = hash[1].sf;
tmp_hash[2] = hash[2].sf;
tmp_hash[3] = hash[3].sf;
aes256_scrt_format(aes_ks, tmp_w, pw_len, tmp_hash, tmp_out, s_te0, s_te1, s_te2, s_te3, s_te4);
out[0].sf = tmp_out[0];
out[1].sf = tmp_out[1];
out[2].sf = tmp_out[2];
out[3].sf = tmp_out[3];
for (u32 i = 0; i < 4; i++) out[i].sf = tmp_out[i];
#endif #endif
} }
KERNEL_FQ void m31400_mxx (KERN_ATTR_VECTOR()) KERNEL_FQ void m31400_mxx (KERN_ATTR_VECTOR())
@ -502,8 +341,7 @@ KERNEL_FQ void m31400_mxx(KERN_ATTR_VECTOR())
#endif #endif
if (gid >= GID_CNT) if (gid >= GID_CNT) return;
return;
/** /**
* base * base
@ -518,8 +356,6 @@ KERNEL_FQ void m31400_mxx(KERN_ATTR_VECTOR())
w[idx] = pws[gid].i[idx]; w[idx] = pws[gid].i[idx];
} }
u32 aes_ks[60];
/** /**
* loop * loop
*/ */
@ -544,6 +380,8 @@ KERNEL_FQ void m31400_mxx(KERN_ATTR_VECTOR())
u32x out[4] = {0}; u32x out[4] = {0};
u32 aes_ks[60];
aes256_scrt_format_VV (aes_ks, w, pw_len, ctx.h, out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format_VV (aes_ks, w, pw_len, ctx.h, out, s_te0, s_te1, s_te2, s_te3, s_te4);
const u32x r0 = out[DGST_R0]; const u32x r0 = out[DGST_R0];
@ -598,8 +436,8 @@ KERNEL_FQ void m31400_sxx(KERN_ATTR_VECTOR())
#endif #endif
if (gid >= GID_CNT) if (gid >= GID_CNT) return;
return;
/** /**
* digest * digest
*/ */
@ -609,7 +447,8 @@ KERNEL_FQ void m31400_sxx(KERN_ATTR_VECTOR())
digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0],
digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1],
digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2],
digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3]}; digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3]
};
/** /**
* base * base
@ -628,7 +467,6 @@ KERNEL_FQ void m31400_sxx(KERN_ATTR_VECTOR())
* loop * loop
*/ */
u32 aes_ks[60];
u32x w0l = w[0]; u32x w0l = w[0];
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)
@ -649,6 +487,8 @@ KERNEL_FQ void m31400_sxx(KERN_ATTR_VECTOR())
u32x out[4] = {0}; u32x out[4] = {0};
u32 aes_ks[60];
aes256_scrt_format_VV (aes_ks, w, pw_len, ctx.h, out, s_te0, s_te1, s_te2, s_te3, s_te4); aes256_scrt_format_VV (aes_ks, w, pw_len, ctx.h, out, s_te0, s_te1, s_te2, s_te3, s_te4);
const u32x r0 = out[DGST_R0]; const u32x r0 = out[DGST_R0];

1
docs/changes.txt
View File

@ -20,6 +20,7 @@
- Added hash-mode: GPG (AES-128/AES-256 (SHA-256($pass))) - Added hash-mode: GPG (AES-128/AES-256 (SHA-256($pass)))
- Added hash-mode: GPG (AES-128/AES-256 (SHA-512($pass))) - Added hash-mode: GPG (AES-128/AES-256 (SHA-512($pass)))
- Added hash-mode: MetaMask Wallet (short hash, plaintext check) - Added hash-mode: MetaMask Wallet (short hash, plaintext check)
- Added hash-mode: SecureCRT MasterPassphrase v2
- Added hash-mode: Veeam VB - Added hash-mode: Veeam VB
- Added hash-mode: bcrypt(sha256($pass)) - Added hash-mode: bcrypt(sha256($pass))
- Added hash-mode: HMAC-RIPEMD160 (key = $pass) - Added hash-mode: HMAC-RIPEMD160 (key = $pass)

2
src/modules/module_31400.c
View File

@ -18,7 +18,7 @@ static const u32 DGST_POS0 = 0;
static const u32 DGST_POS1 = 1; static const u32 DGST_POS1 = 1;
static const u32 DGST_POS2 = 2; static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3; static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH;
static const char *HASH_NAME = "SecureCRT MasterPassphrase v2"; static const char *HASH_NAME = "SecureCRT MasterPassphrase v2";
static const u64 KERN_TYPE = 31400; static const u64 KERN_TYPE = 31400;