github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-24 14:27:14 +01:00
Code Releases Activity

Fix -m 31000 some formatting and missing cracks in optimized mode -a 1 and -a 3 if password length > 32

Browse Source
This commit is contained in:
jsteube 2023-02-19 21:41:15 +00:00
parent 1ac3091492
commit 4fe37f5445
3 changed files with 192 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenCL/m31000_a1-optimized.cl
View File

@ -91,6 +91,8 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
u32x w0[4]; u32x w0[4];
u32x w1[4]; u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
@ -100,6 +102,14 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
w1[1] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3];
w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3];
u32x m[16]; u32x m[16];
@ -111,14 +121,14 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
m[ 5] = w1[1]; m[ 5] = w1[1];
m[ 6] = w1[2]; m[ 6] = w1[2];
m[ 7] = w1[3]; m[ 7] = w1[3];
m[ 8] = 0; m[ 8] = w2[0];
m[ 9] = 0; m[ 9] = w2[1];
m[10] = 0; m[10] = w2[2];
m[11] = 0; m[11] = w2[3];
m[12] = 0; m[12] = w3[0];
m[13] = 0; m[13] = w3[1];
m[14] = 0; m[14] = w3[2];
m[15] = 0; m[15] = w3[3];
u32x h[8]; u32x h[8];
@ -239,6 +249,8 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
u32x w0[4]; u32x w0[4];
u32x w1[4]; u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
@ -248,6 +260,14 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
w1[1] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3];
w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3];
u32x m[16]; u32x m[16];
@ -259,14 +279,15 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
m[ 5] = w1[1]; m[ 5] = w1[1];
m[ 6] = w1[2]; m[ 6] = w1[2];
m[ 7] = w1[3]; m[ 7] = w1[3];
m[ 8] = 0; m[ 8] = w2[0];
m[ 9] = 0; m[ 9] = w2[1];
m[10] = 0; m[10] = w2[2];
m[11] = 0; m[11] = w2[3];
m[12] = 0; m[12] = w3[0];
m[13] = 0; m[13] = w3[1];
m[14] = 0; m[14] = w3[2];
m[15] = 0; m[15] = w3[3];
u32x h[8]; u32x h[8];

88
OpenCL/m31000_a3-optimized.cl
View File

@ -31,36 +31,24 @@ DECLSPEC void m31000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO
const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
const u32x w0x = w0l | w0r; const u32x w0x = w0l | w0r;
u32x w0[4];
u32x w1[4];
w0[0] = w0x;
w0[1] = w[ 1];
w0[2] = w[ 2];
w0[3] = w[ 3];
w1[0] = w[ 4];
w1[1] = w[ 5];
w1[2] = w[ 6];
w1[3] = w[ 7];
u32x m[16]; u32x m[16];
m[ 0] = w0[0]; m[ 0] = w0x;
m[ 1] = w0[1]; m[ 1] = w[ 1];
m[ 2] = w0[2]; m[ 2] = w[ 2];
m[ 3] = w0[3]; m[ 3] = w[ 3];
m[ 4] = w1[0]; m[ 4] = w[ 4];
m[ 5] = w1[1]; m[ 5] = w[ 5];
m[ 6] = w1[2]; m[ 6] = w[ 6];
m[ 7] = w1[3]; m[ 7] = w[ 7];
m[ 8] = 0; m[ 8] = w[ 8];
m[ 9] = 0; m[ 9] = w[ 9];
m[10] = 0; m[10] = w[10];
m[11] = 0; m[11] = w[11];
m[12] = 0; m[12] = w[12];
m[13] = 0; m[13] = w[13];
m[14] = 0; m[14] = w[14];
m[15] = 0; m[15] = w[15];
u32x h[8]; u32x h[8];
@ -113,36 +101,24 @@ DECLSPEC void m31000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO
const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
const u32x w0x = w0l | w0r; const u32x w0x = w0l | w0r;
u32x w0[4];
u32x w1[4];
w0[0] = w0x;
w0[1] = w[ 1];
w0[2] = w[ 2];
w0[3] = w[ 3];
w1[0] = w[ 4];
w1[1] = w[ 5];
w1[2] = w[ 6];
w1[3] = w[ 7];
u32x m[16]; u32x m[16];
m[ 0] = w0[0]; m[ 0] = w0x;
m[ 1] = w0[1]; m[ 1] = w[ 1];
m[ 2] = w0[2]; m[ 2] = w[ 2];
m[ 3] = w0[3]; m[ 3] = w[ 3];
m[ 4] = w1[0]; m[ 4] = w[ 4];
m[ 5] = w1[1]; m[ 5] = w[ 5];
m[ 6] = w1[2]; m[ 6] = w[ 6];
m[ 7] = w1[3]; m[ 7] = w[ 7];
m[ 8] = 0; m[ 8] = w[ 8];
m[ 9] = 0; m[ 9] = w[ 9];
m[10] = 0; m[10] = w[10];
m[11] = 0; m[11] = w[11];
m[12] = 0; m[12] = w[12];
m[13] = 0; m[13] = w[13];
m[14] = 0; m[14] = w[14];
m[15] = 0; m[15] = w[15];
u32x h[8]; u32x h[8];

123
src/modules/module_31000.c
View File

@ -19,81 +19,29 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH;
static const char *HASH_NAME = "BLAKE2s-256"; static const char *HASH_NAME = "BLAKE2s-256";
static const u64 KERN_TYPE = 31000; static const u64 KERN_TYPE = 31000;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_32 | OPTI_TYPE_RAW_HASH; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE | OPTS_TYPE_PT_GENERATE_LE; | OPTI_TYPE_USES_BITS_32
| OPTI_TYPE_RAW_HASH;
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE
| OPTS_TYPE_PT_GENERATE_LE;
static const u32 SALT_TYPE = SALT_TYPE_NONE; static const u32 SALT_TYPE = SALT_TYPE_NONE;
static const char *ST_PASS = "hashcat"; static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "$BLAKE2$2c719b484789ad5f6fc1739012182169b25484af156adc91d4f64f72400e574a"; static const char *ST_HASH = "$BLAKE2$2c719b484789ad5f6fc1739012182169b25484af156adc91d4f64f72400e574a";
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra) u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
{ u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
return ATTACK_EXEC; u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; }
} u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra) u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
{ u32 module_hash_category (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_CATEGORY; }
return DGST_POS0; const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; }
} u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; }
u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; }
u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra) u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; }
{ u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; }
return DGST_POS1; const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; }
} const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; }
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return DGST_POS2;
}
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return DGST_POS3;
}
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return DGST_SIZE;
}
u32 module_hash_category (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return HASH_CATEGORY;
}
const char *module_hash_name (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return HASH_NAME;
}
u64 module_kern_type (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return KERN_TYPE;
}
u32 module_opti_type (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return OPTI_TYPE;
}
u64 module_opts_type (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return OPTS_TYPE;
}
u32 module_salt_type (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return SALT_TYPE;
}
const char *module_st_hash (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return ST_HASH;
}
const char *module_st_pass (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUSED const user_options_t * user_options, MAYBE_UNUSED const user_options_extra_t * user_options_extra)
{
return ST_PASS;
}
static const char *SIGNATURE_BLAKE2S = "$BLAKE2$"; static const char *SIGNATURE_BLAKE2S = "$BLAKE2$";
@ -109,15 +57,16 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUS
token.signatures_buf[0] = SIGNATURE_BLAKE2S; token.signatures_buf[0] = SIGNATURE_BLAKE2S;
token.len[0] = 8; token.len[0] = 8;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE; token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
token.len[1] = 64; token.len[1] = 64;
token.attr[1] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_HEX; token.attr[1] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token); const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK) if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
return (rc_tokenizer);
const u8 *hash_pos = token.buf[1]; const u8 *hash_pos = token.buf[1];
@ -146,22 +95,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUS
memcpy (out_buf, SIGNATURE_BLAKE2S, out_len); memcpy (out_buf, SIGNATURE_BLAKE2S, out_len);
u32_to_hex (digest[0], out_buf + out_len); u32_to_hex (digest[0], out_buf + out_len); out_len += 8;
out_len += 8; u32_to_hex (digest[1], out_buf + out_len); out_len += 8;
u32_to_hex (digest[1], out_buf + out_len); u32_to_hex (digest[2], out_buf + out_len); out_len += 8;
out_len += 8; u32_to_hex (digest[3], out_buf + out_len); out_len += 8;
u32_to_hex (digest[2], out_buf + out_len); u32_to_hex (digest[4], out_buf + out_len); out_len += 8;
out_len += 8; u32_to_hex (digest[5], out_buf + out_len); out_len += 8;
u32_to_hex (digest[3], out_buf + out_len); u32_to_hex (digest[6], out_buf + out_len); out_len += 8;
out_len += 8; u32_to_hex (digest[7], out_buf + out_len); out_len += 8;
u32_to_hex (digest[4], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[5], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[6], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[7], out_buf + out_len);
out_len += 8;
return out_len; return out_len;
} }