mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 16:18:09 +00:00
Add module -m 6600
This commit is contained in:
jsteube
parent
d7db71042f
commit
5cc04fe92a
@ -65,12 +65,6 @@ typedef struct pbkdf2_sha512
|
|||||||
|
|
||||||
} pbkdf2_sha512_t;
|
} pbkdf2_sha512_t;
|
||||||
|
|
||||||
typedef struct agilekey
|
|
||||||
{
|
|
||||||
u8 cipher[1040];
|
|
||||||
|
|
||||||
} agilekey_t;
|
|
||||||
|
|
||||||
typedef struct rakp
|
typedef struct rakp
|
||||||
{
|
{
|
||||||
u32 salt_buf[128];
|
u32 salt_buf[128];
|
||||||
@ -216,16 +210,6 @@ typedef struct androidfde_tmp
|
|||||||
|
|
||||||
} androidfde_tmp_t;
|
} androidfde_tmp_t;
|
||||||
|
|
||||||
typedef struct agilekey_tmp
|
|
||||||
{
|
|
||||||
u32 ipad[5];
|
|
||||||
u32 opad[5];
|
|
||||||
|
|
||||||
u32 dgst[5];
|
|
||||||
u32 out[5];
|
|
||||||
|
|
||||||
} agilekey_tmp_t;
|
|
||||||
|
|
||||||
typedef struct mywallet_tmp
|
typedef struct mywallet_tmp
|
||||||
{
|
{
|
||||||
u32 ipad[5];
|
u32 ipad[5];
|
||||||
@ -430,7 +414,6 @@ typedef enum kern_type
|
|||||||
KERN_TYPE_MD5AIX = 6300,
|
KERN_TYPE_MD5AIX = 6300,
|
||||||
KERN_TYPE_SHA256AIX = 6400,
|
KERN_TYPE_SHA256AIX = 6400,
|
||||||
KERN_TYPE_SHA512AIX = 6500,
|
KERN_TYPE_SHA512AIX = 6500,
|
||||||
KERN_TYPE_AGILEKEY = 6600,
|
|
||||||
KERN_TYPE_SHA1AIX = 6700,
|
KERN_TYPE_SHA1AIX = 6700,
|
||||||
KERN_TYPE_GOST = 6900,
|
KERN_TYPE_GOST = 6900,
|
||||||
KERN_TYPE_FORTIGATE = 7000,
|
KERN_TYPE_FORTIGATE = 7000,
|
||||||
@ -505,7 +488,6 @@ typedef enum rounds_count
|
|||||||
ROUNDS_SHA512AIX = (1 << 6),
|
ROUNDS_SHA512AIX = (1 << 6),
|
||||||
ROUNDS_SHA256CRYPT = 5000,
|
ROUNDS_SHA256CRYPT = 5000,
|
||||||
ROUNDS_GRUB = 10000,
|
ROUNDS_GRUB = 10000,
|
||||||
ROUNDS_AGILEKEY = 1000,
|
|
||||||
ROUNDS_DRUPAL7 = (1 << 14), // $S$C
|
ROUNDS_DRUPAL7 = (1 << 14), // $S$C
|
||||||
ROUNDS_CLOUDKEY = 40000,
|
ROUNDS_CLOUDKEY = 40000,
|
||||||
ROUNDS_NSEC3 = 1,
|
ROUNDS_NSEC3 = 1,
|
||||||
|
|||||||
@ -125,7 +125,6 @@
|
|||||||
" 10600 | PDF 1.7 Level 3 (Acrobat 9) | Documents",
|
" 10600 | PDF 1.7 Level 3 (Acrobat 9) | Documents",
|
||||||
" 10700 | PDF 1.7 Level 8 (Acrobat 10 - 11) | Documents",
|
" 10700 | PDF 1.7 Level 8 (Acrobat 10 - 11) | Documents",
|
||||||
" 16200 | Apple Secure Notes | Documents",
|
" 16200 | Apple Secure Notes | Documents",
|
||||||
" 6600 | 1Password, agilekeychain | Password Managers",
|
|
||||||
" 8200 | 1Password, cloudkeychain | Password Managers",
|
" 8200 | 1Password, cloudkeychain | Password Managers",
|
||||||
" 12700 | Blockchain, My Wallet | Password Managers",
|
" 12700 | Blockchain, My Wallet | Password Managers",
|
||||||
" 15200 | Blockchain, My Wallet, V2 | Password Managers",
|
" 15200 | Blockchain, My Wallet, V2 | Password Managers",
|
||||||
@ -207,7 +206,6 @@ static const char *ST_HASH_06100 = "7ca8eaaaa15eaa4c038b4c47b9313e92da827c06940e
|
|||||||
static const char *ST_HASH_06300 = "{smd5}17800721$WkGka7tXcrfpUQS6WOQyw/";
|
static const char *ST_HASH_06300 = "{smd5}17800721$WkGka7tXcrfpUQS6WOQyw/";
|
||||||
static const char *ST_HASH_06400 = "{ssha256}06$2715084824104660$1s/s4RZWEcvZ5VuWPXWGUfwSoG07eVSVce8F6ANJ.g4";
|
static const char *ST_HASH_06400 = "{ssha256}06$2715084824104660$1s/s4RZWEcvZ5VuWPXWGUfwSoG07eVSVce8F6ANJ.g4";
|
||||||
static const char *ST_HASH_06500 = "{ssha512}06$4653718755856803$O04nVHL7iU9Jguy/B3Yow.veBM52irn.038Y/Ln6AMy/BG8wbU6ozSP8/W9KDZPUbhdsbl1lf8px.vKJS1S/..";
|
static const char *ST_HASH_06500 = "{ssha512}06$4653718755856803$O04nVHL7iU9Jguy/B3Yow.veBM52irn.038Y/Ln6AMy/BG8wbU6ozSP8/W9KDZPUbhdsbl1lf8px.vKJS1S/..";
|
||||||
static const char *ST_HASH_06600 = "1000:d61a54f1efdfcf57:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000afdb51c887d14df6200bbde872aabfd9e12a1f163eed40e6b3ec33ba394c47e9";
|
|
||||||
static const char *ST_HASH_06700 = "{ssha1}06$5586485655847243$V5f1Ff1y4dr7AWeVSSdv6N52..Y";
|
static const char *ST_HASH_06700 = "{ssha1}06$5586485655847243$V5f1Ff1y4dr7AWeVSSdv6N52..Y";
|
||||||
static const char *ST_HASH_06900 = "df226c2c6dcb1d995c0299a33a084b201544293c31fc3d279530121d36bbcea9";
|
static const char *ST_HASH_06900 = "df226c2c6dcb1d995c0299a33a084b201544293c31fc3d279530121d36bbcea9";
|
||||||
static const char *ST_HASH_07000 = "AK1FCIhM0IUIQVFJgcDFwLCMi7GppdwtRzMyDpFOFxdpH8=";
|
static const char *ST_HASH_07000 = "AK1FCIhM0IUIQVFJgcDFwLCMi7GppdwtRzMyDpFOFxdpH8=";
|
||||||
@ -319,7 +317,6 @@ static const char *HT_06100 = "Whirlpool";
|
|||||||
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}";
|
||||||
static const char *HT_06600 = "1Password, agilekeychain";
|
|
||||||
static const char *HT_06700 = "AIX {ssha1}";
|
static const char *HT_06700 = "AIX {ssha1}";
|
||||||
static const char *HT_06900 = "GOST R 34.11-94";
|
static const char *HT_06900 = "GOST R 34.11-94";
|
||||||
static const char *HT_07000 = "FortiGate (FortiOS)";
|
static const char *HT_07000 = "FortiGate (FortiOS)";
|
||||||
@ -3808,121 +3805,6 @@ int sha512aix_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_
|
|||||||
return (PARSER_OK);
|
return (PARSER_OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
int agilekey_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;
|
|
||||||
|
|
||||||
agilekey_t *agilekey = (agilekey_t *) hash_buf->esalt;
|
|
||||||
|
|
||||||
token_t token;
|
|
||||||
|
|
||||||
token.token_cnt = 3;
|
|
||||||
|
|
||||||
token.len_min[0] = 1;
|
|
||||||
token.len_max[0] = 6;
|
|
||||||
token.sep[0] = ':';
|
|
||||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH;
|
|
||||||
|
|
||||||
token.len_min[1] = 16;
|
|
||||||
token.len_max[1] = 16;
|
|
||||||
token.sep[1] = ':';
|
|
||||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
|
||||||
| TOKEN_ATTR_VERIFY_HEX;
|
|
||||||
|
|
||||||
token.len_min[2] = 2080;
|
|
||||||
token.len_max[2] = 2080;
|
|
||||||
token.sep[2] = ':';
|
|
||||||
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
|
||||||
| TOKEN_ATTR_VERIFY_HEX;
|
|
||||||
|
|
||||||
const int rc_tokenizer = input_tokenizer (input_buf, input_len, &token);
|
|
||||||
|
|
||||||
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* pbkdf2 iterations
|
|
||||||
*/
|
|
||||||
|
|
||||||
const u8 *iter_pos = token.buf[0];
|
|
||||||
|
|
||||||
salt->salt_iter = hc_strtoul ((const char *) iter_pos, NULL, 10) - 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* handle salt encoding
|
|
||||||
*/
|
|
||||||
|
|
||||||
const u8 *salt_pos = token.buf[1];
|
|
||||||
const int salt_len = token.len[1];
|
|
||||||
|
|
||||||
u8 *saltbuf_ptr = (u8 *) salt->salt_buf;
|
|
||||||
|
|
||||||
for (int i = 0; i < salt_len; i += 2)
|
|
||||||
{
|
|
||||||
const u8 p0 = salt_pos[i + 0];
|
|
||||||
const u8 p1 = salt_pos[i + 1];
|
|
||||||
|
|
||||||
*saltbuf_ptr++ = hex_convert (p1) << 0
|
|
||||||
| hex_convert (p0) << 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
salt->salt_len = salt_len / 2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* handle cipher encoding
|
|
||||||
*/
|
|
||||||
|
|
||||||
const u8 *cipher_pos = token.buf[2];
|
|
||||||
const int cipher_len = token.len[2];
|
|
||||||
|
|
||||||
u32 tmp[32] = { 0 };
|
|
||||||
|
|
||||||
u8 *cipherbuf_ptr = (u8 *) tmp;
|
|
||||||
|
|
||||||
for (int i = 2016; i < cipher_len; i += 2)
|
|
||||||
{
|
|
||||||
const u8 p0 = cipher_pos[i + 0];
|
|
||||||
const u8 p1 = cipher_pos[i + 1];
|
|
||||||
|
|
||||||
*cipherbuf_ptr++ = hex_convert (p1) << 0
|
|
||||||
| hex_convert (p0) << 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
// iv is stored at salt_buf 4 (length 16)
|
|
||||||
// data is stored at salt_buf 8 (length 16)
|
|
||||||
|
|
||||||
salt->salt_buf[ 4] = byte_swap_32 (tmp[0]);
|
|
||||||
salt->salt_buf[ 5] = byte_swap_32 (tmp[1]);
|
|
||||||
salt->salt_buf[ 6] = byte_swap_32 (tmp[2]);
|
|
||||||
salt->salt_buf[ 7] = byte_swap_32 (tmp[3]);
|
|
||||||
|
|
||||||
salt->salt_buf[ 8] = byte_swap_32 (tmp[4]);
|
|
||||||
salt->salt_buf[ 9] = byte_swap_32 (tmp[5]);
|
|
||||||
salt->salt_buf[10] = byte_swap_32 (tmp[6]);
|
|
||||||
salt->salt_buf[11] = byte_swap_32 (tmp[7]);
|
|
||||||
|
|
||||||
for (int i = 0, j = 0; i < 1040; i += 1, j += 2)
|
|
||||||
{
|
|
||||||
const u8 p0 = cipher_pos[j + 0];
|
|
||||||
const u8 p1 = cipher_pos[j + 1];
|
|
||||||
|
|
||||||
agilekey->cipher[i] = hex_convert (p1) << 0
|
|
||||||
| hex_convert (p0) << 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* digest buf
|
|
||||||
*/
|
|
||||||
|
|
||||||
digest[0] = 0x10101010;
|
|
||||||
digest[1] = 0x10101010;
|
|
||||||
digest[2] = 0x10101010;
|
|
||||||
digest[3] = 0x10101010;
|
|
||||||
|
|
||||||
return (PARSER_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
int gost_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
int gost_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig)
|
||||||
{
|
{
|
||||||
u32 *digest = (u32 *) hash_buf->digest;
|
u32 *digest = (u32 *) hash_buf->digest;
|
||||||
@ -10678,22 +10560,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size,
|
|||||||
|
|
||||||
snprintf (out_buf, out_size, "{ssha512}%02u$%s$%s", salt.salt_sign[0], (char *) salt.salt_buf, ptr_plain);
|
snprintf (out_buf, out_size, "{ssha512}%02u$%s$%s", salt.salt_sign[0], (char *) salt.salt_buf, ptr_plain);
|
||||||
}
|
}
|
||||||
else if (hash_mode == 6600)
|
|
||||||
{
|
|
||||||
agilekey_t *agilekeys = (agilekey_t *) esalts_buf;
|
|
||||||
|
|
||||||
agilekey_t *agilekey = &agilekeys[digest_cur];
|
|
||||||
|
|
||||||
salt.salt_buf[0] = byte_swap_32 (salt.salt_buf[0]);
|
|
||||||
salt.salt_buf[1] = byte_swap_32 (salt.salt_buf[1]);
|
|
||||||
|
|
||||||
u32 off = snprintf (out_buf, out_size, "%u:%08x%08x:", salt.salt_iter + 1, salt.salt_buf[0], salt.salt_buf[1]);
|
|
||||||
|
|
||||||
for (u32 i = 0, j = off; i < 1040; i++, j += 2)
|
|
||||||
{
|
|
||||||
snprintf (out_buf + j, out_len - j, "%02x", agilekey->cipher[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (hash_mode == 6700)
|
else if (hash_mode == 6700)
|
||||||
{
|
{
|
||||||
sha1aix_encode ((unsigned char *) digest_buf, (unsigned char *) ptr_plain);
|
sha1aix_encode ((unsigned char *) digest_buf, (unsigned char *) ptr_plain);
|
||||||
@ -13499,23 +13366,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 6600: hashconfig->hash_type = HASH_TYPE_AES;
|
|
||||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
|
||||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
|
||||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE;
|
|
||||||
hashconfig->kern_type = KERN_TYPE_AGILEKEY;
|
|
||||||
hashconfig->dgst_size = DGST_SIZE_4_5; // because kernel uses _SHA1_
|
|
||||||
hashconfig->parse_func = agilekey_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_06600;
|
|
||||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 6700: hashconfig->hash_type = HASH_TYPE_SHA1;
|
case 6700: hashconfig->hash_type = HASH_TYPE_SHA1;
|
||||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||||
@ -14725,7 +14575,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
|||||||
|
|
||||||
switch (hashconfig->hash_mode)
|
switch (hashconfig->hash_mode)
|
||||||
{
|
{
|
||||||
case 6600: hashconfig->esalt_size = sizeof (agilekey_t); break;
|
|
||||||
case 7200: hashconfig->esalt_size = sizeof (pbkdf2_sha512_t); break;
|
case 7200: hashconfig->esalt_size = sizeof (pbkdf2_sha512_t); break;
|
||||||
case 7300: hashconfig->esalt_size = sizeof (rakp_t); break;
|
case 7300: hashconfig->esalt_size = sizeof (rakp_t); break;
|
||||||
case 8200: hashconfig->esalt_size = sizeof (cloudkey_t); break;
|
case 8200: hashconfig->esalt_size = sizeof (cloudkey_t); break;
|
||||||
@ -14761,7 +14610,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
|||||||
case 5800: hashconfig->tmp_size = sizeof (androidpin_tmp_t); break;
|
case 5800: hashconfig->tmp_size = sizeof (androidpin_tmp_t); break;
|
||||||
case 6400: hashconfig->tmp_size = sizeof (sha256aix_tmp_t); break;
|
case 6400: hashconfig->tmp_size = sizeof (sha256aix_tmp_t); break;
|
||||||
case 6500: hashconfig->tmp_size = sizeof (sha512aix_tmp_t); break;
|
case 6500: hashconfig->tmp_size = sizeof (sha512aix_tmp_t); break;
|
||||||
case 6600: hashconfig->tmp_size = sizeof (agilekey_tmp_t); break;
|
|
||||||
case 6700: hashconfig->tmp_size = sizeof (sha1aix_tmp_t); break;
|
case 6700: hashconfig->tmp_size = sizeof (sha1aix_tmp_t); break;
|
||||||
case 7200: hashconfig->tmp_size = sizeof (pbkdf2_sha512_tmp_t); break;
|
case 7200: hashconfig->tmp_size = sizeof (pbkdf2_sha512_tmp_t); break;
|
||||||
case 7400: hashconfig->tmp_size = sizeof (sha256crypt_tmp_t); break;
|
case 7400: hashconfig->tmp_size = sizeof (sha256crypt_tmp_t); break;
|
||||||
@ -14848,7 +14696,6 @@ u32 default_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED co
|
|||||||
case 3100: pw_max = 30; break; // http://www.red-database-security.de/whitepaper/oracle_passwords.html
|
case 3100: pw_max = 30; break; // http://www.red-database-security.de/whitepaper/oracle_passwords.html
|
||||||
case 6400: pw_max = PW_MAX; break;
|
case 6400: pw_max = PW_MAX; break;
|
||||||
case 6500: pw_max = PW_MAX; break;
|
case 6500: pw_max = PW_MAX; break;
|
||||||
case 6600: pw_max = PW_MAX; break;
|
|
||||||
case 6700: pw_max = PW_MAX; break;
|
case 6700: pw_max = PW_MAX; break;
|
||||||
case 7200: pw_max = PW_MAX; break;
|
case 7200: pw_max = PW_MAX; break;
|
||||||
case 7700: pw_max = 8; break; // https://www.daniel-berlin.de/security/sap-sec/password-hash-algorithms/
|
case 7700: pw_max = 8; break; // https://www.daniel-berlin.de/security/sap-sec/password-hash-algorithms/
|
||||||
@ -14877,18 +14724,6 @@ u32 default_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED co
|
|||||||
case 12900: pw_max = PW_MAX; break;
|
case 12900: pw_max = PW_MAX; break;
|
||||||
case 13200: pw_max = PW_MAX; break;
|
case 13200: pw_max = PW_MAX; break;
|
||||||
case 13600: pw_max = PW_MAX; break;
|
case 13600: pw_max = PW_MAX; break;
|
||||||
case 14611: pw_max = PW_MAX; break;
|
|
||||||
case 14612: pw_max = PW_MAX; break;
|
|
||||||
case 14613: pw_max = PW_MAX; break;
|
|
||||||
case 14621: pw_max = PW_MAX; break;
|
|
||||||
case 14622: pw_max = PW_MAX; break;
|
|
||||||
case 14623: pw_max = PW_MAX; break;
|
|
||||||
case 14631: pw_max = PW_MAX; break;
|
|
||||||
case 14632: pw_max = PW_MAX; break;
|
|
||||||
case 14633: pw_max = PW_MAX; break;
|
|
||||||
case 14641: pw_max = PW_MAX; break;
|
|
||||||
case 14642: pw_max = PW_MAX; break;
|
|
||||||
case 14643: pw_max = PW_MAX; break;
|
|
||||||
case 14700: pw_max = PW_MAX; break;
|
case 14700: pw_max = PW_MAX; break;
|
||||||
case 14800: pw_max = PW_MAX; break;
|
case 14800: pw_max = PW_MAX; break;
|
||||||
case 15100: pw_max = PW_MAX; break;
|
case 15100: pw_max = PW_MAX; break;
|
||||||
|
|||||||
281
src/modules/module_06600.c
Normal file
281
src/modules/module_06600.c
Normal file
@ -0,0 +1,281 @@
|
|||||||
|
/**
|
||||||
|
* 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_5; // because kernel uses _SHA1;
|
||||||
|
static const u32 HASH_CATEGORY = HASH_CATEGORY_PASSWORD_MANAGER;
|
||||||
|
static const char *HASH_NAME = "1Password, agilekeychain";
|
||||||
|
static const u32 HASH_TYPE = HASH_TYPE_GENERIC;
|
||||||
|
static const u64 KERN_TYPE = 6600;
|
||||||
|
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;
|
||||||
|
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||||
|
static const char *ST_PASS = "hashcat";
|
||||||
|
static const char *ST_HASH = "1000:d61a54f1efdfcf57:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000afdb51c887d14df6200bbde872aabfd9e12a1f163eed40e6b3ec33ba394c47e9";
|
||||||
|
|
||||||
|
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 agilekey
|
||||||
|
{
|
||||||
|
u8 cipher[1040];
|
||||||
|
|
||||||
|
} agilekey_t;
|
||||||
|
|
||||||
|
typedef struct agilekey_tmp
|
||||||
|
{
|
||||||
|
u32 ipad[5];
|
||||||
|
u32 opad[5];
|
||||||
|
|
||||||
|
u32 dgst[5];
|
||||||
|
u32 out[5];
|
||||||
|
|
||||||
|
} agilekey_tmp_t;
|
||||||
|
|
||||||
|
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 (agilekey_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 (agilekey_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 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;
|
||||||
|
|
||||||
|
agilekey_t *agilekey = (agilekey_t *) esalt_buf;
|
||||||
|
|
||||||
|
token_t token;
|
||||||
|
|
||||||
|
token.token_cnt = 3;
|
||||||
|
|
||||||
|
token.len_min[0] = 1;
|
||||||
|
token.len_max[0] = 6;
|
||||||
|
token.sep[0] = ':';
|
||||||
|
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH;
|
||||||
|
|
||||||
|
token.len_min[1] = 16;
|
||||||
|
token.len_max[1] = 16;
|
||||||
|
token.sep[1] = ':';
|
||||||
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_HEX;
|
||||||
|
|
||||||
|
token.len_min[2] = 2080;
|
||||||
|
token.len_max[2] = 2080;
|
||||||
|
token.sep[2] = ':';
|
||||||
|
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
||||||
|
| 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);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* pbkdf2 iterations
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u8 *iter_pos = token.buf[0];
|
||||||
|
|
||||||
|
salt->salt_iter = hc_strtoul ((const char *) iter_pos, NULL, 10) - 1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* handle salt encoding
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u8 *salt_pos = token.buf[1];
|
||||||
|
const int salt_len = token.len[1];
|
||||||
|
|
||||||
|
u8 *saltbuf_ptr = (u8 *) salt->salt_buf;
|
||||||
|
|
||||||
|
for (int i = 0; i < salt_len; i += 2)
|
||||||
|
{
|
||||||
|
const u8 p0 = salt_pos[i + 0];
|
||||||
|
const u8 p1 = salt_pos[i + 1];
|
||||||
|
|
||||||
|
*saltbuf_ptr++ = hex_convert (p1) << 0
|
||||||
|
| hex_convert (p0) << 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
salt->salt_len = salt_len / 2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* handle cipher encoding
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u8 *cipher_pos = token.buf[2];
|
||||||
|
const int cipher_len = token.len[2];
|
||||||
|
|
||||||
|
u32 tmp[32] = { 0 };
|
||||||
|
|
||||||
|
u8 *cipherbuf_ptr = (u8 *) tmp;
|
||||||
|
|
||||||
|
for (int i = 2016; i < cipher_len; i += 2)
|
||||||
|
{
|
||||||
|
const u8 p0 = cipher_pos[i + 0];
|
||||||
|
const u8 p1 = cipher_pos[i + 1];
|
||||||
|
|
||||||
|
*cipherbuf_ptr++ = hex_convert (p1) << 0
|
||||||
|
| hex_convert (p0) << 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// iv is stored at salt_buf 4 (length 16)
|
||||||
|
// data is stored at salt_buf 8 (length 16)
|
||||||
|
|
||||||
|
salt->salt_buf[ 4] = byte_swap_32 (tmp[0]);
|
||||||
|
salt->salt_buf[ 5] = byte_swap_32 (tmp[1]);
|
||||||
|
salt->salt_buf[ 6] = byte_swap_32 (tmp[2]);
|
||||||
|
salt->salt_buf[ 7] = byte_swap_32 (tmp[3]);
|
||||||
|
|
||||||
|
salt->salt_buf[ 8] = byte_swap_32 (tmp[4]);
|
||||||
|
salt->salt_buf[ 9] = byte_swap_32 (tmp[5]);
|
||||||
|
salt->salt_buf[10] = byte_swap_32 (tmp[6]);
|
||||||
|
salt->salt_buf[11] = byte_swap_32 (tmp[7]);
|
||||||
|
|
||||||
|
for (int i = 0, j = 0; i < 1040; i += 1, j += 2)
|
||||||
|
{
|
||||||
|
const u8 p0 = cipher_pos[j + 0];
|
||||||
|
const u8 p1 = cipher_pos[j + 1];
|
||||||
|
|
||||||
|
agilekey->cipher[i] = hex_convert (p1) << 0
|
||||||
|
| hex_convert (p0) << 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* digest buf
|
||||||
|
*/
|
||||||
|
|
||||||
|
digest[0] = 0x10101010;
|
||||||
|
digest[1] = 0x10101010;
|
||||||
|
digest[2] = 0x10101010;
|
||||||
|
digest[3] = 0x10101010;
|
||||||
|
|
||||||
|
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 agilekey_t *agilekey = (const agilekey_t *) esalt_buf;
|
||||||
|
|
||||||
|
int line_len = snprintf (line_buf, line_size, "%u:%08x%08x:", salt->salt_iter + 1, byte_swap_32 (salt->salt_buf[0]), byte_swap_32 (salt->salt_buf[1]));
|
||||||
|
|
||||||
|
for (u32 i = 0; i < 1040; i++)
|
||||||
|
{
|
||||||
|
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x", agilekey->cipher[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
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_esalt_size;
|
||||||
|
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_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;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user