arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update AuthMe patch (2)

Browse Source
pull/2128/head
Gabriele Gristina 5 years ago
parent 468bf2f19a
commit 66337ee8f5
5 changed files with 92 additions and 66 deletions
Show Stats Download Patch File Download Diff File

3
docs/readme.txt
Unescape View File

@ -92,7 +92,8 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o
- sha512($salt.$pass)
- sha512(utf16le($pass).$salt)
- sha512($salt.utf16le($pass))
- AuthMe - sha256(sha256($pass).$salt)
- sha256(sha256($pass).$salt)
- AuthMe sha256
- HMAC-MD5 (key = $pass)
- HMAC-MD5 (key = $salt)
- HMAC-SHA1 (key = $pass)

105
src/modules/module_20710.c
Unescape View File

@ -17,8 +17,8 @@ static const u32 DGST_POS1 = 7;
static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 6;
static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_EAS;
static const char *HASH_NAME = "AuthMe - sha256(sha256($pass).$salt)";
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
static const char *HASH_NAME = "sha256(sha256($pass).$salt)";
static const u64 KERN_TYPE = 20710;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
@ -30,7 +30,7 @@ static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADDBITS15;
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "$SHA$7218532375810603$bfede293ecf6539211a7305ea218b9f3f608953130405cda9eaba6fb6250f824";
static const char *ST_HASH = "bfede293ecf6539211a7305ea218b9f3f608953130405cda9eaba6fb6250f824:7218532375810603";
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; }
@ -54,51 +54,37 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
return pw_max;
}
static const char *SIGNATURE_AUTHME = "$SHA$";
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)
{
u32 *digest = (u32 *) digest_buf;
token_t token;
token.token_cnt = 3;
token.token_cnt = 2;
token.signatures_cnt = 1;
token.signatures_buf[0] = SIGNATURE_AUTHME;
token.sep[0] = hashconfig->separator;
token.len_min[0] = 64;
token.len_max[0] = 64;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT;
token.len[0] = 5;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
token.len_min[1] = SALT_MIN;
token.len_max[1] = SALT_MAX;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
token.sep[1] = '$';
token.len_min[1] = 16;
token.len_max[1] = 16;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT;
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
{
token.len_min[1] *= 2;
token.len_max[1] *= 2;
token.sep[2] = '$';
token.len_min[2] = 64;
token.len_max[2] = 64;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
token.attr[1] |= TOKEN_ATTR_VERIFY_HEX;
}
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
// salt
const u8 *salt_pos = token.buf[1];
const int salt_len = token.len[1];
memcpy ((u8 *) salt->salt_buf, salt_pos, salt_len);
salt->salt_len = salt_len;
// hash
const u8 *hash_pos = token.buf[2];
const u8 *hash_pos = token.buf[0];
digest[0] = hex_to_u32 (hash_pos + 0);
digest[1] = hex_to_u32 (hash_pos + 8);
@ -130,6 +116,13 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
digest[7] -= SHA256M_H;
}
const u8 *salt_pos = token.buf[1];
const int salt_len = token.len[1];
const bool parse_rc = generic_salt_decode (hashconfig, salt_pos, salt_len, (u8 *) salt->salt_buf, (int *) &salt->salt_len);
if (parse_rc == false) return (PARSER_SALT_LENGTH);
return (PARSER_OK);
}
@ -137,26 +130,6 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
{
const u32 *digest = (const u32 *) digest_buf;
int line_len = 0;
// signature
line_buf[line_len++] = '$';
line_buf[line_len++] = 'S';
line_buf[line_len++] = 'H';
line_buf[line_len++] = 'A';
line_buf[line_len++] = '$';
// salt
memcpy (line_buf + line_len, salt->salt_buf, salt->salt_len);
line_len += salt->salt_len;
line_buf[line_len++] = '$';
// digest
u32 tmp[8];
tmp[0] = digest[0];
@ -191,18 +164,24 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *out_buf = (u8 *) line_buf;
u32_to_hex (tmp[0], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[1], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[2], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[3], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[4], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[5], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[6], out_buf + line_len); line_len += 8;
u32_to_hex (tmp[7], out_buf + line_len); line_len += 8;
int out_len = 0;
u32_to_hex (tmp[0], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[1], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[2], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[3], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[4], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[5], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[6], out_buf + out_len); out_len += 8;
u32_to_hex (tmp[7], out_buf + out_len); out_len += 8;
out_buf[out_len] = hashconfig->separator;
out_len += 1;
line_buf[line_len] = 0;
out_len += generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, out_buf + out_len);
return line_len;
return out_len;
}
void module_init (module_ctx_t *module_ctx)

2
src/modules/module_20711.c
Unescape View File

@ -18,7 +18,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 6;
static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_EAS;
static const char *HASH_NAME = "AuthMe - sha256(sha256($pass).$salt)";
static const char *HASH_NAME = "AuthMe sha256";
static const u64 KERN_TYPE = 20710;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT

46
tools/test_modules/m20710.pm
Unescape View File

@ -0,0 +1,46 @@
#!/usr/bin/env perl
##
## Author......: See docs/credits.txt
## License.....: MIT
##
use strict;
use warnings;
use Digest::SHA qw (sha256_hex);
sub module_constraints { [[1, 31], [16, 16], [1, 31], [16, 16], [-1, -1]] }
sub module_generate_hash
{
my $word = shift;
my $salt = shift;
my $digest = sha256_hex (sha256_hex ($word) . $salt);
my $hash = sprintf ("%s:%s", $digest, $salt);
return $hash;
}
sub module_verify_hash
{
my $line = shift;
my ($digest, $salt, $word) = split (':', $line);
return unless defined $digest;
return unless defined $salt;
return unless defined $word;
return unless length ($salt) == 16;
my $word_packed = pack_if_HEX_notation ($word);
my $new_hash = module_generate_hash ($word_packed, $salt);
return ($new_hash, $word);
}
1;

2
tools/test_modules/m20700.pm → tools/test_modules/m20711.pm
Unescape View File

@ -10,7 +10,7 @@ use warnings;
use Digest::SHA qw (sha256_hex);
sub module_constraints { [[1, 31], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }
sub module_constraints { [[1, 31], [16, 16], [1, 31], [16, 16], [-1, -1]] }
sub module_generate_hash
{
Write Preview
Loading…
Cancel
Save