mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-23 08:38:09 +00:00
Add -m 1711 module
This commit is contained in:
jsteube
parent
0fa4c024f0
commit
1776e2d111
@ -48,7 +48,6 @@
|
|||||||
" 13900 | OpenCart | Forums, CMS, E-Commerce, Frameworks",
|
" 13900 | OpenCart | Forums, CMS, E-Commerce, Frameworks",
|
||||||
" 4521 | Redmine | Forums, CMS, E-Commerce, Frameworks",
|
" 4521 | Redmine | Forums, CMS, E-Commerce, Frameworks",
|
||||||
" 4522 | PunBB | Forums, CMS, E-Commerce, Frameworks",
|
" 4522 | PunBB | Forums, CMS, E-Commerce, Frameworks",
|
||||||
" 1711 | SSHA-512(Base64), LDAP {SSHA512} | HTTP, SMTP, LDAP Server",
|
|
||||||
" 1722 | macOS v10.7 | Operating Systems",
|
" 1722 | macOS v10.7 | Operating Systems",
|
||||||
" 22 | Juniper NetScreen/SSG (ScreenOS) | Operating Systems",
|
" 22 | Juniper NetScreen/SSG (ScreenOS) | Operating Systems",
|
||||||
|
|
||||||
@ -72,7 +71,6 @@ static const char *ST_HASH_01450 = "b435ffbacea34d5eb0dbc4d69a92f0152f2cf4cd364d
|
|||||||
static const char *ST_HASH_01460 = "8b9472281c36c3a693703de0e0f1ffab8fc0ecdd3bc5ead04c76dd74ef431e49:70108387805";
|
static const char *ST_HASH_01460 = "8b9472281c36c3a693703de0e0f1ffab8fc0ecdd3bc5ead04c76dd74ef431e49:70108387805";
|
||||||
static const char *ST_HASH_01600 = "$apr1$62722340$zGjeAwVP2KwY6MtumUI1N/";
|
static const char *ST_HASH_01600 = "$apr1$62722340$zGjeAwVP2KwY6MtumUI1N/";
|
||||||
static const char *ST_HASH_01710 = "3f749c84d00c6f94a6651b5c195c71dacae08f3cea6fed760232856cef701f7bf60d7f38a587f69f159d4e4cbe00435aeb9c8c0a4927b252d76a744e16e87e91:388026522082";
|
static const char *ST_HASH_01710 = "3f749c84d00c6f94a6651b5c195c71dacae08f3cea6fed760232856cef701f7bf60d7f38a587f69f159d4e4cbe00435aeb9c8c0a4927b252d76a744e16e87e91:388026522082";
|
||||||
static const char *ST_HASH_01711 = "{SSHA512}Bz8w5q6qEtB1Nnc8b1jfTvTXVTwohWag33oghQGOtLChnkZTw/cuJaHQlLJEI3AWKZGCRyLA6Phujdxo+is7AjA2MDcyNjY1Mg==";
|
|
||||||
static const char *ST_HASH_01720 = "efc5dd0e4145970917abdc311e1d4e23ba0afa9426d960cb28569f4d585cb031af5c936f57fbcb0a08368a1b302573cf582100d40bd7c632f3d8aecd1a1a8eb1:812";
|
static const char *ST_HASH_01720 = "efc5dd0e4145970917abdc311e1d4e23ba0afa9426d960cb28569f4d585cb031af5c936f57fbcb0a08368a1b302573cf582100d40bd7c632f3d8aecd1a1a8eb1:812";
|
||||||
static const char *ST_HASH_01730 = "eefb67342d62a5d8ac84e8ae89d0f157f03749bd0427c80637003a4760feefdb36cbe11ba35ab2015b3691e2e83803178c986aa85f29e6f56938b469a31ccd7a:6576666";
|
static const char *ST_HASH_01730 = "eefb67342d62a5d8ac84e8ae89d0f157f03749bd0427c80637003a4760feefdb36cbe11ba35ab2015b3691e2e83803178c986aa85f29e6f56938b469a31ccd7a:6576666";
|
||||||
static const char *ST_HASH_01740 = "ce77bf8a8ca9b9cf0ed67edde58ed7fafd4542ce1378fc8bd87b05656ebf92e5711517d5930c18de93a71990e77e1037423e5b64c2f293be7d859d7b6921622e:1512373";
|
static const char *ST_HASH_01740 = "ce77bf8a8ca9b9cf0ed67edde58ed7fafd4542ce1378fc8bd87b05656ebf92e5711517d5930c18de93a71990e77e1037423e5b64c2f293be7d859d7b6921622e:1512373";
|
||||||
@ -157,7 +155,6 @@ static const char *HT_00022 = "Juniper NetScreen/SSG (ScreenOS)";
|
|||||||
static const char *HT_00101 = "nsldap, SHA-1(Base64), Netscape LDAP SHA";
|
static const char *HT_00101 = "nsldap, SHA-1(Base64), Netscape LDAP SHA";
|
||||||
static const char *HT_00121 = "SMF (Simple Machines Forum) > v1.1";
|
static const char *HT_00121 = "SMF (Simple Machines Forum) > v1.1";
|
||||||
static const char *HT_00124 = "Django (SHA-1)";
|
static const char *HT_00124 = "Django (SHA-1)";
|
||||||
static const char *HT_01711 = "SSHA-512(Base64), LDAP {SSHA512}";
|
|
||||||
static const char *HT_01722 = "macOS v10.7";
|
static const char *HT_01722 = "macOS v10.7";
|
||||||
static const char *HT_02611 = "vBulletin < v3.8.5";
|
static const char *HT_02611 = "vBulletin < v3.8.5";
|
||||||
static const char *HT_02612 = "PHPS";
|
static const char *HT_02612 = "PHPS";
|
||||||
@ -168,69 +165,11 @@ static const char *HT_04522 = "PunBB";
|
|||||||
static const char *SIGNATURE_DJANGOSHA1 = "sha1$";
|
static const char *SIGNATURE_DJANGOSHA1 = "sha1$";
|
||||||
static const char *SIGNATURE_MEDIAWIKI_B = "$B$";
|
static const char *SIGNATURE_MEDIAWIKI_B = "$B$";
|
||||||
static const char *SIGNATURE_PHPS = "$PHPS$";
|
static const char *SIGNATURE_PHPS = "$PHPS$";
|
||||||
static const char *SIGNATURE_SHA1B64 = "{SHA}";
|
|
||||||
static const char *SIGNATURE_SHA256B64S = "{SSHA256}";
|
|
||||||
static const char *SIGNATURE_SHA512B64S = "{SSHA512}";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* decoder / encoder
|
* decoder / encoder
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int macos1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
|
||||||
{
|
|
||||||
u32 *digest = (u32 *) hash_buf->digest;
|
|
||||||
|
|
||||||
salt_t *salt = hash_buf->salt;
|
|
||||||
|
|
||||||
token_t token;
|
|
||||||
|
|
||||||
token.token_cnt = 2;
|
|
||||||
|
|
||||||
token.len[0] = 8;
|
|
||||||
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
|
|
||||||
| TOKEN_ATTR_VERIFY_HEX;
|
|
||||||
|
|
||||||
token.len[1] = 40;
|
|
||||||
token.attr[1] = TOKEN_ATTR_FIXED_LENGTH
|
|
||||||
| TOKEN_ATTR_VERIFY_HEX;
|
|
||||||
|
|
||||||
const int rc_tokenizer = input_tokenizer (input_buf, input_len, &token);
|
|
||||||
|
|
||||||
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
|
||||||
|
|
||||||
const u8 *hash_pos = token.buf[1];
|
|
||||||
|
|
||||||
digest[0] = hex_to_u32 (hash_pos + 0);
|
|
||||||
digest[1] = hex_to_u32 (hash_pos + 8);
|
|
||||||
digest[2] = hex_to_u32 (hash_pos + 16);
|
|
||||||
digest[3] = hex_to_u32 (hash_pos + 24);
|
|
||||||
digest[4] = hex_to_u32 (hash_pos + 32);
|
|
||||||
|
|
||||||
digest[0] = byte_swap_32 (digest[0]);
|
|
||||||
digest[1] = byte_swap_32 (digest[1]);
|
|
||||||
digest[2] = byte_swap_32 (digest[2]);
|
|
||||||
digest[3] = byte_swap_32 (digest[3]);
|
|
||||||
digest[4] = byte_swap_32 (digest[4]);
|
|
||||||
|
|
||||||
if (hashconfig->opti_type & OPTI_TYPE_PRECOMPUTE_MERKLE)
|
|
||||||
{
|
|
||||||
digest[0] -= SHA1M_A;
|
|
||||||
digest[1] -= SHA1M_B;
|
|
||||||
digest[2] -= SHA1M_C;
|
|
||||||
digest[3] -= SHA1M_D;
|
|
||||||
digest[4] -= SHA1M_E;
|
|
||||||
}
|
|
||||||
|
|
||||||
const u8 *salt_pos = token.buf[0];
|
|
||||||
const int salt_len = token.len[0];
|
|
||||||
|
|
||||||
const bool parse_rc = parse_and_store_generic_salt ((u8 *) salt->salt_buf, (int *) &salt->salt_len, salt_pos, salt_len, hashconfig);
|
|
||||||
|
|
||||||
if (parse_rc == false) return (PARSER_SALT_LENGTH);
|
|
||||||
|
|
||||||
return (PARSER_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
int macos512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
int macos512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
||||||
{
|
{
|
||||||
u64 *digest = (u64 *) hash_buf->digest;
|
u64 *digest = (u64 *) hash_buf->digest;
|
||||||
@ -2107,26 +2046,6 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size,
|
|||||||
digest_buf[3],
|
digest_buf[3],
|
||||||
digest_buf[4]);
|
digest_buf[4]);
|
||||||
}
|
}
|
||||||
else if (hash_mode == 1711)
|
|
||||||
{
|
|
||||||
// the encoder is a bit too intelligent, it expects the input data in the wrong BOM
|
|
||||||
|
|
||||||
digest_buf64[0] = byte_swap_64 (digest_buf64[0]);
|
|
||||||
digest_buf64[1] = byte_swap_64 (digest_buf64[1]);
|
|
||||||
digest_buf64[2] = byte_swap_64 (digest_buf64[2]);
|
|
||||||
digest_buf64[3] = byte_swap_64 (digest_buf64[3]);
|
|
||||||
digest_buf64[4] = byte_swap_64 (digest_buf64[4]);
|
|
||||||
digest_buf64[5] = byte_swap_64 (digest_buf64[5]);
|
|
||||||
digest_buf64[6] = byte_swap_64 (digest_buf64[6]);
|
|
||||||
digest_buf64[7] = byte_swap_64 (digest_buf64[7]);
|
|
||||||
|
|
||||||
memcpy (tmp_buf, digest_buf, 64);
|
|
||||||
memcpy (tmp_buf + 64, salt.salt_buf, salt.salt_len);
|
|
||||||
|
|
||||||
base64_encode (int_to_base64, (const u8 *) tmp_buf, 64 + salt.salt_len, (u8 *) ptr_plain);
|
|
||||||
|
|
||||||
snprintf (out_buf, out_size, "%s%s", SIGNATURE_SHA512B64S, ptr_plain);
|
|
||||||
}
|
|
||||||
else if (hash_mode == 1722)
|
else if (hash_mode == 1722)
|
||||||
{
|
{
|
||||||
u32 *ptr = digest_buf;
|
u32 *ptr = digest_buf;
|
||||||
@ -2778,31 +2697,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
|||||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1711: hashconfig->hash_type = HASH_TYPE_SHA512;
|
|
||||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
|
||||||
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
|
|
||||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_BE
|
|
||||||
| OPTS_TYPE_ST_ADD80
|
|
||||||
| OPTS_TYPE_ST_ADDBITS15;
|
|
||||||
hashconfig->kern_type = KERN_TYPE_SHA512_PWSLT;
|
|
||||||
hashconfig->dgst_size = DGST_SIZE_8_8;
|
|
||||||
hashconfig->parse_func = sha512b64s_parse_hash;
|
|
||||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
|
|
||||||
| OPTI_TYPE_PRECOMPUTE_INIT
|
|
||||||
| OPTI_TYPE_PRECOMPUTE_MERKLE
|
|
||||||
| OPTI_TYPE_EARLY_SKIP
|
|
||||||
| OPTI_TYPE_NOT_ITERATED
|
|
||||||
| OPTI_TYPE_APPENDED_SALT
|
|
||||||
| OPTI_TYPE_USES_BITS_64
|
|
||||||
| OPTI_TYPE_RAW_HASH;
|
|
||||||
hashconfig->dgst_pos0 = 14;
|
|
||||||
hashconfig->dgst_pos1 = 15;
|
|
||||||
hashconfig->dgst_pos2 = 6;
|
|
||||||
hashconfig->dgst_pos3 = 7;
|
|
||||||
hashconfig->st_hash = ST_HASH_01711;
|
|
||||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1720: hashconfig->hash_type = HASH_TYPE_SHA512;
|
case 1720: hashconfig->hash_type = HASH_TYPE_SHA512;
|
||||||
hashconfig->salt_type = SALT_TYPE_GENERIC;
|
hashconfig->salt_type = SALT_TYPE_GENERIC;
|
||||||
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
|
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
|
||||||
|
|||||||
251
src/modules/module_01711.c
Normal file
251
src/modules/module_01711.c
Normal file
@ -0,0 +1,251 @@
|
|||||||
|
/**
|
||||||
|
* Author......: See docs/credits.txt
|
||||||
|
* License.....: MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
#include "types.h"
|
||||||
|
#include "modules.h"
|
||||||
|
#include "bitops.h"
|
||||||
|
#include "convert.h"
|
||||||
|
#include "shared.h"
|
||||||
|
#include "inc_hash_constants.h"
|
||||||
|
|
||||||
|
static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL;
|
||||||
|
static const u32 DGST_POS0 = 14;
|
||||||
|
static const u32 DGST_POS1 = 15;
|
||||||
|
static const u32 DGST_POS2 = 6;
|
||||||
|
static const u32 DGST_POS3 = 7;
|
||||||
|
static const u32 DGST_SIZE = DGST_SIZE_8_8;
|
||||||
|
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_SERVER;
|
||||||
|
static const char *HASH_NAME = "SSHA-512(Base64), LDAP {SSHA512}";
|
||||||
|
static const u32 HASH_TYPE = HASH_TYPE_GENERIC;
|
||||||
|
static const u64 KERN_TYPE = 1710;
|
||||||
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||||
|
| OPTI_TYPE_PRECOMPUTE_INIT
|
||||||
|
| OPTI_TYPE_PRECOMPUTE_MERKLE
|
||||||
|
| OPTI_TYPE_EARLY_SKIP
|
||||||
|
| OPTI_TYPE_NOT_ITERATED
|
||||||
|
| OPTI_TYPE_APPENDED_SALT
|
||||||
|
| OPTI_TYPE_USES_BITS_64
|
||||||
|
| OPTI_TYPE_RAW_HASH;
|
||||||
|
static const u32 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE
|
||||||
|
| OPTS_TYPE_ST_ADD80
|
||||||
|
| OPTS_TYPE_ST_ADDBITS15;
|
||||||
|
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||||
|
static const char *ST_PASS = "hashcat";
|
||||||
|
static const char *ST_HASH = "{SSHA512}Bz8w5q6qEtB1Nnc8b1jfTvTXVTwohWag33oghQGOtLChnkZTw/cuJaHQlLJEI3AWKZGCRyLA6Phujdxo+is7AjA2MDcyNjY1Mg==";
|
||||||
|
|
||||||
|
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; }
|
||||||
|
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_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; }
|
||||||
|
u32 module_hash_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 HASH_TYPE; }
|
||||||
|
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_SHA512B64S = "{SSHA512}";
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
token_t token;
|
||||||
|
|
||||||
|
token.token_cnt = 2;
|
||||||
|
|
||||||
|
token.signatures_cnt = 1;
|
||||||
|
token.signatures_buf[0] = SIGNATURE_SHA512B64S;
|
||||||
|
|
||||||
|
token.len[0] = 9;
|
||||||
|
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||||
|
|
||||||
|
token.len_min[1] = 88;
|
||||||
|
token.len_max[1] = 428; // 428 = 64 + 256 where 64 is digest length and 256 is SALT_MAX
|
||||||
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||||
|
|
||||||
|
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
|
||||||
|
|
||||||
|
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
||||||
|
|
||||||
|
const u8 *hashsalt_pos = token.buf[1];
|
||||||
|
const int hashsalt_len = token.len[1];
|
||||||
|
|
||||||
|
u8 tmp_buf[512] = { 0 };
|
||||||
|
|
||||||
|
const int tmp_len = base64_decode (base64_to_int, hashsalt_pos, hashsalt_len, tmp_buf);
|
||||||
|
|
||||||
|
if (tmp_len < 64) return (PARSER_HASH_LENGTH);
|
||||||
|
|
||||||
|
u8 *hash_pos = tmp_buf;
|
||||||
|
|
||||||
|
memcpy (digest, hash_pos, 64);
|
||||||
|
|
||||||
|
digest[0] = byte_swap_64 (digest[0]);
|
||||||
|
digest[1] = byte_swap_64 (digest[1]);
|
||||||
|
digest[2] = byte_swap_64 (digest[2]);
|
||||||
|
digest[3] = byte_swap_64 (digest[3]);
|
||||||
|
digest[4] = byte_swap_64 (digest[4]);
|
||||||
|
digest[5] = byte_swap_64 (digest[5]);
|
||||||
|
digest[6] = byte_swap_64 (digest[6]);
|
||||||
|
digest[7] = byte_swap_64 (digest[7]);
|
||||||
|
|
||||||
|
if (hashconfig->opti_type & OPTI_TYPE_PRECOMPUTE_MERKLE)
|
||||||
|
{
|
||||||
|
digest[0] -= SHA512M_A;
|
||||||
|
digest[1] -= SHA512M_B;
|
||||||
|
digest[2] -= SHA512M_C;
|
||||||
|
digest[3] -= SHA512M_D;
|
||||||
|
digest[4] -= SHA512M_E;
|
||||||
|
digest[5] -= SHA512M_F;
|
||||||
|
digest[6] -= SHA512M_G;
|
||||||
|
digest[7] -= SHA512M_H;
|
||||||
|
}
|
||||||
|
|
||||||
|
// salt
|
||||||
|
|
||||||
|
u8 *salt_pos = tmp_buf + 64;
|
||||||
|
int salt_len = tmp_len - 64;
|
||||||
|
|
||||||
|
salt->salt_len = salt_len;
|
||||||
|
|
||||||
|
memcpy (salt->salt_buf, salt_pos, salt_len);
|
||||||
|
|
||||||
|
if (hashconfig->opts_type & OPTS_TYPE_ST_ADD80)
|
||||||
|
{
|
||||||
|
u8 *ptr = (u8 *) salt->salt_buf;
|
||||||
|
|
||||||
|
ptr[salt_len] = 0x80;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (PARSER_OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
|
||||||
|
{
|
||||||
|
const u64 *digest = (const u64 *) digest_buf;
|
||||||
|
|
||||||
|
u64 tmp[8];
|
||||||
|
|
||||||
|
tmp[0] = digest[0];
|
||||||
|
tmp[1] = digest[1];
|
||||||
|
tmp[2] = digest[2];
|
||||||
|
tmp[3] = digest[3];
|
||||||
|
tmp[4] = digest[4];
|
||||||
|
tmp[5] = digest[5];
|
||||||
|
tmp[6] = digest[6];
|
||||||
|
tmp[7] = digest[7];
|
||||||
|
|
||||||
|
if (hashconfig->opti_type & OPTI_TYPE_PRECOMPUTE_MERKLE)
|
||||||
|
{
|
||||||
|
tmp[0] += SHA512M_A;
|
||||||
|
tmp[1] += SHA512M_B;
|
||||||
|
tmp[2] += SHA512M_C;
|
||||||
|
tmp[3] += SHA512M_D;
|
||||||
|
tmp[4] += SHA512M_E;
|
||||||
|
tmp[5] += SHA512M_F;
|
||||||
|
tmp[6] += SHA512M_G;
|
||||||
|
tmp[7] += SHA512M_H;
|
||||||
|
}
|
||||||
|
|
||||||
|
tmp[0] = byte_swap_64 (tmp[0]);
|
||||||
|
tmp[1] = byte_swap_64 (tmp[1]);
|
||||||
|
tmp[2] = byte_swap_64 (tmp[2]);
|
||||||
|
tmp[3] = byte_swap_64 (tmp[3]);
|
||||||
|
tmp[4] = byte_swap_64 (tmp[4]);
|
||||||
|
tmp[5] = byte_swap_64 (tmp[5]);
|
||||||
|
tmp[6] = byte_swap_64 (tmp[6]);
|
||||||
|
tmp[7] = byte_swap_64 (tmp[7]);
|
||||||
|
|
||||||
|
char tmp_buf[512];
|
||||||
|
|
||||||
|
memcpy (tmp_buf, tmp, 64);
|
||||||
|
memcpy (tmp_buf + 64, salt->salt_buf, salt->salt_len);
|
||||||
|
|
||||||
|
char ptr_plain[512] = { 0 };
|
||||||
|
|
||||||
|
base64_encode (int_to_base64, (const u8 *) tmp_buf, 64 + salt->salt_len, (u8 *) ptr_plain);
|
||||||
|
|
||||||
|
const int line_len = snprintf (line_buf, line_size, "%s%s", SIGNATURE_SHA512B64S, ptr_plain);
|
||||||
|
|
||||||
|
return line_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
void module_init (module_ctx_t *module_ctx)
|
||||||
|
{
|
||||||
|
module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
|
||||||
|
module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
|
||||||
|
|
||||||
|
module_ctx->module_attack_exec = module_attack_exec;
|
||||||
|
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_benchmark_mask = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_deep_comp_kernel = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_dgst_pos0 = module_dgst_pos0;
|
||||||
|
module_ctx->module_dgst_pos1 = module_dgst_pos1;
|
||||||
|
module_ctx->module_dgst_pos2 = module_dgst_pos2;
|
||||||
|
module_ctx->module_dgst_pos3 = module_dgst_pos3;
|
||||||
|
module_ctx->module_dgst_size = module_dgst_size;
|
||||||
|
module_ctx->module_dictstat_disable = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_esalt_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_extra_buffer_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_extra_tmp_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_forced_outfile_format = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_binary_count = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_binary_parse = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_binary_save = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_decode_outfile = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_decode = module_hash_decode;
|
||||||
|
module_ctx->module_hash_encode_status = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_encode = module_hash_encode;
|
||||||
|
module_ctx->module_hash_init_selftest = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_mode = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hash_category = module_hash_category;
|
||||||
|
module_ctx->module_hash_name = module_hash_name;
|
||||||
|
module_ctx->module_hash_type = module_hash_type;
|
||||||
|
module_ctx->module_hlfmt_disable = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hook12 = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hook23 = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_hook_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_jit_build_options = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_loops_max = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_loops_min = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_threads_max = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kernel_threads_min = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_kern_type = module_kern_type;
|
||||||
|
module_ctx->module_kern_type_dynamic = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_opti_type = module_opti_type;
|
||||||
|
module_ctx->module_opts_type = module_opts_type;
|
||||||
|
module_ctx->module_outfile_check_disable = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_potfile_disable = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_pwdump_column = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_pw_max = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_pw_min = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_salt_max = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_salt_min = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_salt_type = module_salt_type;
|
||||||
|
module_ctx->module_separator = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_st_hash = module_st_hash;
|
||||||
|
module_ctx->module_st_pass = module_st_pass;
|
||||||
|
module_ctx->module_tmp_size = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_unstable_warning = MODULE_DEFAULT;
|
||||||
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user