mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-22 05:31:11 +00:00
Add module and unit test for hash-mode 12000
This commit is contained in:
jsteube
parent
d266cb5834
commit
748a1aac22
@ -148,12 +148,6 @@ typedef struct pbkdf2_md5
|
||||
|
||||
} pbkdf2_md5_t;
|
||||
|
||||
typedef struct pbkdf2_sha1
|
||||
{
|
||||
u32 salt_buf[16];
|
||||
|
||||
} pbkdf2_sha1_t;
|
||||
|
||||
typedef struct pbkdf2_sha256
|
||||
{
|
||||
u32 salt_buf[16];
|
||||
@ -629,16 +623,6 @@ typedef struct pbkdf2_md5_tmp
|
||||
|
||||
} pbkdf2_md5_tmp_t;
|
||||
|
||||
typedef struct pbkdf2_sha1_tmp
|
||||
{
|
||||
u32 ipad[5];
|
||||
u32 opad[5];
|
||||
|
||||
u32 dgst[32];
|
||||
u32 out[32];
|
||||
|
||||
} pbkdf2_sha1_tmp_t;
|
||||
|
||||
typedef struct pbkdf2_sha256_tmp
|
||||
{
|
||||
u32 ipad[8];
|
||||
@ -843,7 +827,6 @@ typedef enum hash_type
|
||||
HASH_TYPE_STREEBOG_256 = 42,
|
||||
HASH_TYPE_STREEBOG_512 = 43,
|
||||
HASH_TYPE_PBKDF2_MD5 = 44,
|
||||
HASH_TYPE_PBKDF2_SHA1 = 45,
|
||||
HASH_TYPE_PBKDF2_SHA512 = 46,
|
||||
HASH_TYPE_ECRYPTFS = 47,
|
||||
HASH_TYPE_ORACLET = 48,
|
||||
@ -999,7 +982,6 @@ typedef enum kern_type
|
||||
KERN_TYPE_HMAC_STREEBOG_512_PW = 11850,
|
||||
KERN_TYPE_HMAC_STREEBOG_512_SLT = 11860,
|
||||
KERN_TYPE_PBKDF2_MD5 = 11900,
|
||||
KERN_TYPE_PBKDF2_SHA1 = 12000,
|
||||
KERN_TYPE_ECRYPTFS = 12200,
|
||||
KERN_TYPE_ORACLET = 12300,
|
||||
KERN_TYPE_BSDICRYPT = 12400,
|
||||
@ -1096,7 +1078,6 @@ typedef enum rounds_count
|
||||
ROUNDS_BITCOIN_WALLET = 200000,
|
||||
ROUNDS_SEVEN_ZIP = (1 << 19),
|
||||
ROUNDS_PBKDF2_MD5 = 1000,
|
||||
ROUNDS_PBKDF2_SHA1 = 1000,
|
||||
ROUNDS_PBKDF2_SHA512 = 1000,
|
||||
ROUNDS_ECRYPTFS = 65536,
|
||||
ROUNDS_ORACLET = 4096,
|
||||
|
||||
@ -53,7 +53,6 @@
|
||||
" 15400 | ChaCha20 | Raw Cipher, Known-Plaintext attack",
|
||||
" 8900 | scrypt | Generic KDF",
|
||||
" 11900 | PBKDF2-HMAC-MD5 | Generic KDF",
|
||||
" 12000 | PBKDF2-HMAC-SHA1 | Generic KDF",
|
||||
" 10900 | PBKDF2-HMAC-SHA256 | Generic KDF",
|
||||
" 12100 | PBKDF2-HMAC-SHA512 | Generic KDF",
|
||||
" 23 | Skype | Network Protocols",
|
||||
@ -414,7 +413,6 @@ static const char *ST_HASH_11800 = "5d5bdba48c8f89ee6c0a0e11023540424283e84902de
|
||||
static const char *ST_HASH_11850 = "be4555415af4a05078dcf260bb3c0a35948135df3dbf93f7c8b80574ceb0d71ea4312127f839b7707bf39ccc932d9e7cb799671183455889e8dde3738dfab5b6:08151337";
|
||||
static const char *ST_HASH_11860 = "bebf6831b3f9f958acb345a88cb98f30cb0374cff13e6012818487c8dc8d5857f23bca2caed280195ad558b8ce393503e632e901e8d1eb2ccb349a544ac195fd:08151337";
|
||||
static const char *ST_HASH_11900 = "md5:1000:NjAxMDY4MQ==:a00DtIW9hP9voC85fmEA5uVhgdDx67nSPSm9yADHjkI=";
|
||||
static const char *ST_HASH_12000 = "sha1:1000:MTYwNTM4MDU4Mzc4MzA=:aGghFQBtQ8+WVlMk5GEaMw==";
|
||||
static const char *ST_HASH_12001 = "{PKCS5S2}NTczNTY0NDY2NjQyNzU1Mx8gGiRGobaZYwumctGHbn2ZOHB8LkwzH+Z1gkWfy1zD";
|
||||
static const char *ST_HASH_12100 = "sha512:1000:NzY2:DNWohLbdIWIt4Npk9gpTvA==";
|
||||
static const char *ST_HASH_12200 = "$ecryptfs$0$1$4207883745556753$567daa975114206c";
|
||||
@ -599,7 +597,6 @@ static const char *HT_11800 = "GOST R 34.11-2012 (Streebog) 512-bit, big-endian"
|
||||
static const char *HT_11850 = "HMAC-Streebog-512 (key = $pass), big-endian";
|
||||
static const char *HT_11860 = "HMAC-Streebog-512 (key = $salt), big-endian";
|
||||
static const char *HT_11900 = "PBKDF2-HMAC-MD5";
|
||||
static const char *HT_12000 = "PBKDF2-HMAC-SHA1";
|
||||
static const char *HT_12100 = "PBKDF2-HMAC-SHA512";
|
||||
static const char *HT_12200 = "eCryptfs";
|
||||
static const char *HT_12300 = "Oracle T: Type (Oracle 12+)";
|
||||
@ -755,7 +752,6 @@ static const char *SIGNATURE_OLDOFFICE1 = "$oldoffice$1";
|
||||
static const char *SIGNATURE_OLDOFFICE3 = "$oldoffice$3";
|
||||
static const char *SIGNATURE_OLDOFFICE4 = "$oldoffice$4";
|
||||
static const char *SIGNATURE_PBKDF2_MD5 = "md5";
|
||||
static const char *SIGNATURE_PBKDF2_SHA1 = "sha1";
|
||||
static const char *SIGNATURE_PBKDF2_SHA256 = "sha256";
|
||||
static const char *SIGNATURE_PBKDF2_SHA512 = "sha512";
|
||||
static const char *SIGNATURE_PDF = "$pdf$";
|
||||
@ -12361,102 +12357,6 @@ int pbkdf2_md5_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
int pbkdf2_sha1_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;
|
||||
|
||||
pbkdf2_sha1_t *pbkdf2_sha1 = (pbkdf2_sha1_t *) hash_buf->esalt;
|
||||
|
||||
token_t token;
|
||||
|
||||
token.token_cnt = 4;
|
||||
|
||||
token.signatures_cnt = 1;
|
||||
token.signatures_buf[0] = SIGNATURE_PBKDF2_SHA1;
|
||||
|
||||
token.sep[0] = ':';
|
||||
token.len_min[0] = 4;
|
||||
token.len_max[0] = 4;
|
||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||
|
||||
token.sep[1] = ':';
|
||||
token.len_min[1] = 1;
|
||||
token.len_max[1] = 6;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_DIGIT;
|
||||
|
||||
token.sep[2] = ':';
|
||||
token.len_min[2] = SALT_MIN;
|
||||
token.len_max[2] = SALT_MAX;
|
||||
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
token.sep[3] = ':';
|
||||
token.len_min[3] = 16;
|
||||
token.len_max[3] = 256;
|
||||
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
const int rc_tokenizer = input_tokenizer (input_buf, input_len, &token);
|
||||
|
||||
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
||||
|
||||
u8 tmp_buf[512];
|
||||
int tmp_len;
|
||||
|
||||
// iter
|
||||
|
||||
const u8 *iter_pos = token.buf[1];
|
||||
|
||||
const u32 iter = hc_strtoul ((const char *) iter_pos, NULL, 10);
|
||||
|
||||
salt->salt_iter = iter - 1;
|
||||
|
||||
// salt
|
||||
|
||||
const u8 *salt_pos = token.buf[2];
|
||||
const int salt_len = token.len[2];
|
||||
|
||||
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||
|
||||
tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
|
||||
|
||||
if (tmp_len > SALT_MAX) return (PARSER_SALT_LENGTH);
|
||||
|
||||
memcpy (pbkdf2_sha1->salt_buf, tmp_buf, tmp_len);
|
||||
|
||||
salt->salt_len = tmp_len;
|
||||
|
||||
salt->salt_buf[0] = pbkdf2_sha1->salt_buf[0];
|
||||
salt->salt_buf[1] = pbkdf2_sha1->salt_buf[1];
|
||||
salt->salt_buf[2] = pbkdf2_sha1->salt_buf[2];
|
||||
salt->salt_buf[3] = pbkdf2_sha1->salt_buf[3];
|
||||
salt->salt_buf[4] = salt->salt_iter;
|
||||
|
||||
// hash
|
||||
|
||||
const u8 *hash_pos = token.buf[3];
|
||||
const int hash_len = token.len[3];
|
||||
|
||||
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||
|
||||
tmp_len = base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf);
|
||||
|
||||
if (tmp_len < 16) return (PARSER_HASH_LENGTH);
|
||||
|
||||
memcpy (digest, tmp_buf, 16);
|
||||
|
||||
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]);
|
||||
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
int pbkdf2_sha512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
||||
{
|
||||
u64 *digest = (u64 *) hash_buf->digest;
|
||||
@ -16885,8 +16785,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
||||
break;
|
||||
case 11900: salt->salt_iter = ROUNDS_PBKDF2_MD5 - 1;
|
||||
break;
|
||||
case 12000: salt->salt_iter = ROUNDS_PBKDF2_SHA1 - 1;
|
||||
break;
|
||||
case 12001: salt->salt_iter = ROUNDS_ATLASSIAN - 1;
|
||||
break;
|
||||
case 12100: salt->salt_iter = ROUNDS_PBKDF2_SHA512 - 1;
|
||||
@ -18809,13 +18707,6 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size,
|
||||
|
||||
snprintf (out_buf, out_size, "%s", hash_buf);
|
||||
}
|
||||
else if (hash_mode == 12000)
|
||||
{
|
||||
hashinfo_t **hashinfo_ptr = hash_info;
|
||||
char *hash_buf = hashinfo_ptr[digest_cur]->orighash;
|
||||
|
||||
snprintf (out_buf, out_size, "%s", hash_buf);
|
||||
}
|
||||
else if (hash_mode == 12001)
|
||||
{
|
||||
hashinfo_t **hashinfo_ptr = hash_info;
|
||||
@ -23413,25 +23304,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 12000: hashconfig->hash_type = HASH_TYPE_PBKDF2_SHA1;
|
||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_ST_BASE64
|
||||
| OPTS_TYPE_HASH_COPY;
|
||||
hashconfig->kern_type = KERN_TYPE_PBKDF2_SHA1;
|
||||
hashconfig->dgst_size = DGST_SIZE_4_32;
|
||||
hashconfig->parse_func = pbkdf2_sha1_parse_hash;
|
||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
hashconfig->dgst_pos0 = 0;
|
||||
hashconfig->dgst_pos1 = 1;
|
||||
hashconfig->dgst_pos2 = 2;
|
||||
hashconfig->dgst_pos3 = 3;
|
||||
hashconfig->st_hash = ST_HASH_12000;
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 12001: hashconfig->hash_type = HASH_TYPE_PBKDF2_SHA1;
|
||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
@ -24832,7 +24704,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
case 11300: hashconfig->esalt_size = sizeof (bitcoin_wallet_t); break;
|
||||
case 11400: hashconfig->esalt_size = sizeof (sip_t); break;
|
||||
case 11900: hashconfig->esalt_size = sizeof (pbkdf2_md5_t); break;
|
||||
case 12000: hashconfig->esalt_size = sizeof (pbkdf2_sha1_t); break;
|
||||
case 12001: hashconfig->esalt_size = sizeof (pbkdf2_sha1_t); break;
|
||||
case 12100: hashconfig->esalt_size = sizeof (pbkdf2_sha512_t); break;
|
||||
case 13000: hashconfig->esalt_size = sizeof (rar5_t); break;
|
||||
@ -24935,7 +24806,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
case 11300: hashconfig->tmp_size = sizeof (bitcoin_wallet_tmp_t); break;
|
||||
case 11600: hashconfig->tmp_size = sizeof (seven_zip_tmp_t); break;
|
||||
case 11900: hashconfig->tmp_size = sizeof (pbkdf2_md5_tmp_t); break;
|
||||
case 12000: hashconfig->tmp_size = sizeof (pbkdf2_sha1_tmp_t); break;
|
||||
case 12001: hashconfig->tmp_size = sizeof (pbkdf2_sha1_tmp_t); break;
|
||||
case 12100: hashconfig->tmp_size = sizeof (pbkdf2_sha512_tmp_t); break;
|
||||
case 12200: hashconfig->tmp_size = sizeof (ecryptfs_tmp_t); break;
|
||||
@ -25122,7 +24992,6 @@ u32 default_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED co
|
||||
case 11300: pw_max = PW_MAX; break;
|
||||
case 11600: pw_max = PW_MAX; break;
|
||||
case 11900: pw_max = PW_MAX; break;
|
||||
case 12000: pw_max = PW_MAX; break;
|
||||
case 12001: pw_max = PW_MAX; break;
|
||||
case 12200: pw_max = PW_MAX; break;
|
||||
case 12300: pw_max = PW_MAX; break;
|
||||
|
||||
256
src/modules/module_12000.c
Normal file
256
src/modules/module_12000.c
Normal file
@ -0,0 +1,256 @@
|
||||
/**
|
||||
* 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"
|
||||
|
||||
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
static const u32 DGST_POS0 = 0;
|
||||
static const u32 DGST_POS1 = 1;
|
||||
static const u32 DGST_POS2 = 2;
|
||||
static const u32 DGST_POS3 = 3;
|
||||
static const u32 DGST_SIZE = DGST_SIZE_4_32;
|
||||
static const u32 HASH_CATEGORY = HASH_CATEGORY_GENERIC_KDF;
|
||||
static const char *HASH_NAME = "PBKDF2-HMAC-SHA1";
|
||||
static const u32 HASH_TYPE = HASH_TYPE_GENERIC;
|
||||
static const u64 KERN_TYPE = 12000;
|
||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
|
||||
| OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_ST_BASE64
|
||||
| OPTS_TYPE_HASH_COPY;
|
||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||
static const char *ST_PASS = "hashcat";
|
||||
static const char *ST_HASH = "sha1:1000:MTYwNTM4MDU4Mzc4MzA=:aGghFQBtQ8+WVlMk5GEaMw==";
|
||||
|
||||
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; }
|
||||
|
||||
typedef struct pbkdf2_sha1_tmp
|
||||
{
|
||||
u32 ipad[5];
|
||||
u32 opad[5];
|
||||
|
||||
u32 dgst[32];
|
||||
u32 out[32];
|
||||
|
||||
} pbkdf2_sha1_tmp_t;
|
||||
|
||||
typedef struct pbkdf2_sha1
|
||||
{
|
||||
u32 salt_buf[16];
|
||||
|
||||
} pbkdf2_sha1_t;
|
||||
|
||||
static const char *SIGNATURE_PBKDF2_SHA1 = "sha1";
|
||||
|
||||
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)
|
||||
{
|
||||
const u64 esalt_size = (const u64) sizeof (pbkdf2_sha1_t);
|
||||
|
||||
return esalt_size;
|
||||
}
|
||||
|
||||
u64 module_tmp_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)
|
||||
{
|
||||
const u64 tmp_size = (const u64) sizeof (pbkdf2_sha1_tmp_t);
|
||||
|
||||
return tmp_size;
|
||||
}
|
||||
|
||||
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
// this overrides the reductions of PW_MAX in case optimized kernel is selected
|
||||
// IOW, even in optimized kernel mode it support length 256
|
||||
|
||||
const u32 pw_max = PW_MAX;
|
||||
|
||||
return pw_max;
|
||||
}
|
||||
|
||||
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 hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
|
||||
{
|
||||
u32 *digest = (u32 *) digest_buf;
|
||||
|
||||
pbkdf2_sha1_t *pbkdf2_sha1 = (pbkdf2_sha1_t *) esalt_buf;
|
||||
|
||||
token_t token;
|
||||
|
||||
token.token_cnt = 4;
|
||||
|
||||
token.signatures_cnt = 1;
|
||||
token.signatures_buf[0] = SIGNATURE_PBKDF2_SHA1;
|
||||
|
||||
token.sep[0] = ':';
|
||||
token.len_min[0] = 4;
|
||||
token.len_max[0] = 4;
|
||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||
|
||||
token.sep[1] = ':';
|
||||
token.len_min[1] = 1;
|
||||
token.len_max[1] = 6;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_DIGIT;
|
||||
|
||||
token.sep[2] = ':';
|
||||
token.len_min[2] = SALT_MIN;
|
||||
token.len_max[2] = SALT_MAX;
|
||||
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
token.sep[3] = ':';
|
||||
token.len_min[3] = 16;
|
||||
token.len_max[3] = 256;
|
||||
token.attr[3] = 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);
|
||||
|
||||
u8 tmp_buf[512];
|
||||
int tmp_len;
|
||||
|
||||
// iter
|
||||
|
||||
const u8 *iter_pos = token.buf[1];
|
||||
|
||||
const u32 iter = hc_strtoul ((const char *) iter_pos, NULL, 10);
|
||||
|
||||
salt->salt_iter = iter - 1;
|
||||
|
||||
// salt
|
||||
|
||||
const u8 *salt_pos = token.buf[2];
|
||||
const int salt_len = token.len[2];
|
||||
|
||||
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||
|
||||
tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
|
||||
|
||||
if (tmp_len > SALT_MAX) return (PARSER_SALT_LENGTH);
|
||||
|
||||
memcpy (pbkdf2_sha1->salt_buf, tmp_buf, tmp_len);
|
||||
|
||||
salt->salt_len = tmp_len;
|
||||
|
||||
salt->salt_buf[0] = pbkdf2_sha1->salt_buf[0];
|
||||
salt->salt_buf[1] = pbkdf2_sha1->salt_buf[1];
|
||||
salt->salt_buf[2] = pbkdf2_sha1->salt_buf[2];
|
||||
salt->salt_buf[3] = pbkdf2_sha1->salt_buf[3];
|
||||
salt->salt_buf[4] = salt->salt_iter;
|
||||
|
||||
// hash
|
||||
|
||||
const u8 *hash_pos = token.buf[3];
|
||||
const int hash_len = token.len[3];
|
||||
|
||||
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||
|
||||
tmp_len = base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf);
|
||||
|
||||
if (tmp_len < 16) return (PARSER_HASH_LENGTH);
|
||||
|
||||
memcpy (digest, tmp_buf, 16);
|
||||
|
||||
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]);
|
||||
|
||||
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 hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
|
||||
{
|
||||
return snprintf (line_buf, line_size, "%s", hash_info->orighash);
|
||||
}
|
||||
|
||||
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_esalt_size;
|
||||
module_ctx->module_extra_buffer_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_binary_verify = 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_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_pw_max;
|
||||
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_tmp_size;
|
||||
module_ctx->module_unstable_warning = MODULE_DEFAULT;
|
||||
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||
}
|
||||
80
tools/test_modules/m12000.pm
Normal file
80
tools/test_modules/m12000.pm
Normal file
@ -0,0 +1,80 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
##
|
||||
## Author......: See docs/credits.txt
|
||||
## License.....: MIT
|
||||
##
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use MIME::Base64 qw (encode_base64 decode_base64);
|
||||
use Crypt::PBKDF2;
|
||||
|
||||
sub module_constraints { [[0, 255], [0, 64], [0, 55], [0, 64], [-1, -1]] }
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
my $word = shift;
|
||||
my $salt = shift;
|
||||
my $iter = shift // random_number (100, 10000);
|
||||
|
||||
my $kdf = Crypt::PBKDF2->new
|
||||
(
|
||||
hash_class => 'HMACSHA1',
|
||||
iterations => $iter,
|
||||
output_len => 16
|
||||
);
|
||||
|
||||
my $key = $kdf->PBKDF2 ($salt, $word);
|
||||
|
||||
my $key_b64 = encode_base64 ($key, "");
|
||||
|
||||
my $salt_b64 = encode_base64 ($salt, "");
|
||||
|
||||
my $hash = sprintf ("sha1:%i:%s:%s", $iter, $salt_b64, $key_b64);
|
||||
|
||||
return $hash;
|
||||
}
|
||||
|
||||
sub module_verify_hash
|
||||
{
|
||||
my $line = shift;
|
||||
|
||||
next unless (substr ($line, 0, 5) eq 'sha1:');
|
||||
|
||||
# iterations
|
||||
my $index1 = index ($line, ":", 5);
|
||||
|
||||
next if $index1 < 1;
|
||||
|
||||
my $iter = substr ($line, 5, $index1 - 5);
|
||||
|
||||
# salt
|
||||
|
||||
my $index2 = index ($line, ":", $index1 + 1);
|
||||
|
||||
return if $index2 < 1;
|
||||
|
||||
my $salt = substr ($line, $index1 + 1, $index2 - $index1 - 1);
|
||||
|
||||
$salt = decode_base64 ($salt);
|
||||
|
||||
# end of digest
|
||||
|
||||
$index1 = index ($line, ":", $index2 + 1);
|
||||
|
||||
return if $index1 < 1;
|
||||
|
||||
# word / hash
|
||||
|
||||
my $word = substr ($line, $index1 + 1);
|
||||
|
||||
my $word_packed = pack_if_HEX_notation ($word);
|
||||
|
||||
my $new_hash = module_generate_hash ($word_packed, $salt, $iter);
|
||||
|
||||
return ($new_hash, $word);
|
||||
}
|
||||
|
||||
1;
|
||||
Loading…
Reference in New Issue
Block a user