arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-08-03 04:18:10 +00:00
Code Issues Releases Wiki Activity

PR comments polish 2

Browse Source
This commit is contained in:
Dylan Evans 2024-06-08 16:53:45 -04:00
parent d0dc41f98d
commit b19101ed08
2 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenCL/m12150-pure.cl
View File

@ -31,7 +31,7 @@ typedef struct shiro1_sha512_tmp
u64 out[8]; // Final output hash u64 out[8]; // Final output hash
} shiro1_sha512_tmp_t; } shiro1_sha512_tmp_t;
KERNEL_FQ void m12150_init (KERN_ATTR_TMPS_ESALT (shiro1_sha512_tmp_t, shiro1_sha512_t)) KERNEL_FQ void m12150_init (KERN_ATTR_TMPS (shiro1_sha512_tmp_t))
{ {
const u32 gid = get_global_id (0); const u32 gid = get_global_id (0);
@ -53,7 +53,7 @@ KERNEL_FQ void m12150_init (KERN_ATTR_TMPS_ESALT (shiro1_sha512_tmp_t, shiro1_sh
} }
} }
KERNEL_FQ void m12150_loop(KERN_ATTR_TMPS_ESALT(shiro1_sha512_tmp_t, shiro1_sha512_t)) { KERNEL_FQ void m12150_loop(KERN_ATTR_TMPS (shiro1_sha512_tmp_t)) {
const u32 gid = get_global_id(0); const u32 gid = get_global_id(0);
if (gid >= GID_CNT) return; if (gid >= GID_CNT) return;
@ -115,7 +115,7 @@ KERNEL_FQ void m12150_loop(KERN_ATTR_TMPS_ESALT(shiro1_sha512_tmp_t, shiro1_sha5
} }
} }
KERNEL_FQ void m12150_comp (KERN_ATTR_TMPS_ESALT (shiro1_sha512_tmp_t, shiro1_sha512_t)) KERNEL_FQ void m12150_comp (KERN_ATTR_TMPS (shiro1_sha512_tmp_t))
{ {
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);

53
src/modules/module_12150.c
View File

@ -59,7 +59,7 @@ typedef struct shiro1_sha512_tmp
u64 out[8]; // Final output hash u64 out[8]; // Final output hash
} shiro1_sha512_tmp_t; } shiro1_sha512_tmp_t;
static const char *SIGNATURE_SHIRO1_SHA512 = "$shiro1$"; static const char *SIGNATURE_SHIRO1_SHA512 = "$shiro1$SHA-512$";
u64 module_esalt_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) u64 module_esalt_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)
{ {
@ -85,71 +85,62 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
{ {
u64 *digest = (u64 *) digest_buf; u64 *digest = (u64 *) digest_buf;
shiro1_sha512_t *shiro_sha512 = (shiro1_sha512_t *) esalt_buf;
hc_token_t token; hc_token_t token;
memset (&token, 0, sizeof (hc_token_t)); memset (&token, 0, sizeof (hc_token_t));
token.token_cnt = 5; token.token_cnt = 4;
token.signatures_cnt = 1; token.signatures_cnt = 1;
token.signatures_buf[0] = SIGNATURE_SHIRO1_SHA512; token.signatures_buf[0] = SIGNATURE_SHIRO1_SHA512;
token.len[0] = 8; token.len[0] = 16;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE; | TOKEN_ATTR_VERIFY_SIGNATURE;
token.sep[1] = '$'; token.sep[1] = '$';
token.len[1] = 7; token.len_min[1] = 1;
token.attr[1] = TOKEN_ATTR_FIXED_LENGTH; token.len_max[1] = 999999;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
token.sep[2] = '$';
token.len_min[2] = 1;
token.len_max[2] = 999999;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT; | TOKEN_ATTR_VERIFY_DIGIT;
token.sep[3] = '$'; token.sep[2] = '$';
token.len_min[3] = ((SALT_MIN * 8) / 6) + 0; token.len_min[2] = ((SALT_MIN * 8) / 6) + 0;
token.len_max[3] = ((SALT_MAX * 8) / 6) + 3; token.len_max[2] = ((SALT_MAX * 8) / 6) + 3;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_BASE64A; | TOKEN_ATTR_VERIFY_BASE64A;
token.sep[4] = '$'; token.sep[3] = '$';
token.len_min[4] = 16; token.len_min[3] = 16;
token.len_max[4] = 256; token.len_max[3] = 256;
token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_BASE64A; | TOKEN_ATTR_VERIFY_BASE64A;
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) { return (rc_tokenizer); } if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
u8 tmp_buf[512]; u8 tmp_buf[512];
int tmp_len; int tmp_len;
// iterations // iterations
const u8 *iter_pos = token.buf[2]; const u8 *iter_pos = token.buf[1];
const u32 iter = hc_strtoul ((const char *) iter_pos, NULL, 10); const u32 iter = hc_strtoul ((const char *) iter_pos, NULL, 10);
shiro_sha512->iterations = iter - 1;
salt->salt_iter = iter - 1; salt->salt_iter = iter - 1;
// salt // salt
const u8 *salt_pos = token.buf[3]; const u8 *salt_pos = token.buf[2];
const int salt_len = token.len[3]; const int salt_len = token.len[2];
memset (tmp_buf, 0, sizeof (tmp_buf)); memset (tmp_buf, 0, sizeof (tmp_buf));
tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf); tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
memcpy (shiro_sha512->salt_buf, tmp_buf, tmp_len); if (tmp_len > SALT_MAX) return (PARSER_SALT_LENGTH);
memcpy (salt->salt_buf, tmp_buf, tmp_len);
salt->salt_len = tmp_len; salt->salt_len = tmp_len;
salt->salt_buf[0] = shiro_sha512->salt_buf[0];
salt->salt_buf[1] = shiro_sha512->salt_buf[1];
salt->salt_buf[2] = shiro_sha512->salt_buf[2];
salt->salt_buf[3] = shiro_sha512->salt_buf[3];
// hash // hash
const u8 *hash_pos = token.buf[4]; const u8 *hash_pos = token.buf[3];
const int hash_len = token.len[4]; const int hash_len = token.len[3];
memset (tmp_buf, 0, sizeof (tmp_buf)); memset (tmp_buf, 0, sizeof (tmp_buf));
tmp_len = base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf); tmp_len = base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf);
if (tmp_len < 64) return (PARSER_HASH_LENGTH); if (tmp_len < 64) return (PARSER_HASH_LENGTH);