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

fix: g madness...

Browse Source
This commit is contained in:
DoZ10 2017-04-13 17:33:08 -04:00
parent bf45f87d39
commit 0a8f17c24a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/interface.h
View File

@ -1326,7 +1326,7 @@ typedef enum hash_type
HASH_TYPE_ITUNES_BACKUP_9 = 56, HASH_TYPE_ITUNES_BACKUP_9 = 56,
HASH_TYPE_ITUNES_BACKUP_10 = 57, HASH_TYPE_ITUNES_BACKUP_10 = 57,
HASH_TYPE_SKIP32 = 58, HASH_TYPE_SKIP32 = 58,
HASH_TYPE_BLAKE2G = 59, HASH_TYPE_BLAKE2B = 59,
} hash_type_t; } hash_type_t;
@ -1406,7 +1406,7 @@ typedef enum kern_type
KERN_TYPE_ANDROIDPIN = 5800, KERN_TYPE_ANDROIDPIN = 5800,
KERN_TYPE_RIPEMD160 = 6000, KERN_TYPE_RIPEMD160 = 6000,
KERN_TYPE_WHIRLPOOL = 6100, KERN_TYPE_WHIRLPOOL = 6100,
KERN_TYPE_BLAKE2G = 6200, KERN_TYPE_BLAKE2B = 6200,
KERN_TYPE_TCRIPEMD160_XTS512 = 6211, KERN_TYPE_TCRIPEMD160_XTS512 = 6211,
KERN_TYPE_TCRIPEMD160_XTS1024 = 6212, KERN_TYPE_TCRIPEMD160_XTS1024 = 6212,
KERN_TYPE_TCRIPEMD160_XTS1536 = 6213, KERN_TYPE_TCRIPEMD160_XTS1536 = 6213,
@ -1605,7 +1605,7 @@ int joomla_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu
int postgresql_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int postgresql_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int netscreen_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int netscreen_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int keccak_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int keccak_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int blake2g_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int blake2b_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int lm_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int lm_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int md4_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int md4_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int md5_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig); int md5_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);

12
src/interface.c
View File

@ -148,7 +148,7 @@ static const char HT_05700[] = "Cisco-IOS type 4 (SHA256)";
static const char HT_05800[] = "Samsung Android Password/PIN"; static const char HT_05800[] = "Samsung Android Password/PIN";
static const char HT_06000[] = "RIPEMD-160"; static const char HT_06000[] = "RIPEMD-160";
static const char HT_06100[] = "Whirlpool"; static const char HT_06100[] = "Whirlpool";
static const char HT_06200[] = "Blake2g"; static const char HT_06200[] = "Blake2b";
static const char HT_06300[] = "AIX {smd5}"; static const char HT_06300[] = "AIX {smd5}";
static const char HT_06400[] = "AIX {ssha256}"; static const char HT_06400[] = "AIX {ssha256}";
static const char HT_06500[] = "AIX {ssha512}"; static const char HT_06500[] = "AIX {ssha512}";
@ -5261,7 +5261,7 @@ int keccak_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNU
return (PARSER_OK); return (PARSER_OK);
} }
int blake2g_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig) int blake2b_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
{ {
if ((input_len < DISPLAY_LEN_MIN_6200) || (input_len > DISPLAY_LEN_MAX_6200)) return (PARSE_GLOBAL_LENGTH); if ((input_len < DISPLAY_LEN_MIN_6200) || (input_len > DISPLAY_LEN_MAX_6200)) return (PARSE_GLOBAL_LENGTH);
@ -18340,7 +18340,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
out_buf[salt.keccak_mdlen * 2] = 0; out_buf[salt.keccak_mdlen * 2] = 0;
} }
else if (hash_type == HASH_TYPE_BLAKE2G) else if (hash_type == HASH_TYPE_BLAKE2B)
{ {
snprintf (out_buf, out_len - 1, "%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x", snprintf (out_buf, out_len - 1, "%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x",
digest_buf[ 0], digest_buf[ 0],
@ -20538,14 +20538,14 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
hashconfig->dgst_pos3 = 3; hashconfig->dgst_pos3 = 3;
break; break;
case 6200: hashconfig->hash_type = HASH_TYPE_BLAKE2G; case 6200: hashconfig->hash_type = HASH_TYPE_BLAKE2B;
hashconfig->salt_type = SALT_TYPE_EMBEDDED; hashconfig->salt_type = SALT_TYPE_EMBEDDED;
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL; hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_PT_ADD01; | OPTS_TYPE_PT_ADD01;
hashconfig->kern_type = KERN_TYPE_BLAKE2G; hashconfig->kern_type = KERN_TYPE_BLAKE2B;
hashconfig->dgst_size = DGST_SIZE_8_25; hashconfig->dgst_size = DGST_SIZE_8_25;
hashconfig->parse_func = blake2g_parse_hash; hashconfig->parse_func = blake2b_parse_hash;
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_USES_BITS_64
| OPTI_TYPE_RAW_HASH; | OPTI_TYPE_RAW_HASH;

2
src/usage.c
View File

@ -123,7 +123,7 @@ static const char *USAGE_BIG[] =
" 10800 | SHA-384 | Raw Hash", " 10800 | SHA-384 | Raw Hash",
" 1700 | SHA-512 | Raw Hash", " 1700 | SHA-512 | Raw Hash",
" 5000 | SHA-3 (Keccak) | Raw Hash", " 5000 | SHA-3 (Keccak) | Raw Hash",
" 6200 | BLAKE2G | Raw Hash", " 6200 | BLAKE2B | Raw Hash",
" 10100 | SipHash | Raw Hash", " 10100 | SipHash | Raw Hash",
" 6000 | RIPEMD-160 | Raw Hash", " 6000 | RIPEMD-160 | Raw Hash",
" 6100 | Whirlpool | Raw Hash", " 6100 | Whirlpool | Raw Hash",