arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1661 from hops/master

Browse Source 
Getting rid of OPTS_TYPE_HASH_COPY for Ansible Vault
This commit is contained in:
Jens Steube 2018-08-16 11:26:48 +02:00 committed by GitHub
commit fb2de3cb7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCL/inc_types.cl
View File

@ -1530,6 +1530,8 @@ typedef struct electrum_wallet
typedef struct ansible_vault
{
u32 cipher;
u32 version;
u32 ct_data_buf[4096];
u32 ct_data_len;
} ansible_vault_t;

1
docs/changes.txt
View File

@ -6,6 +6,7 @@
- Workaround some AMD OpenCL runtime segmentation faults
- Allow bitcoin master key length not be exactly 96 byte a multiple of 16
- Getting rid of OPTS_TYPE_HASH_COPY for Ansible Vault
##
## Bugs

2
include/interface.h
View File

@ -533,6 +533,8 @@ typedef struct electrum_wallet
typedef struct ansible_vault
{
u32 cipher;
u32 version;
u32 ct_data_buf[4096];
u32 ct_data_len;
} ansible_vault_t;

55
src/interface.c
View File

@ -17804,16 +17804,12 @@ int ansible_vault_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MA
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
// version (unused)
token.sep[1] = '*';
token.len_min[1] = 1;
token.len_max[1] = 1;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT;
// cipher (unused)
token.sep[2] = '*';
token.len_min[2] = 1;
token.len_max[2] = 1;
@ -17842,6 +17838,18 @@ int ansible_vault_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MA
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
// cipher (unused)
u8 *cipher_pos = token.buf[1];
ansible_vault->cipher = hc_strtoul ((const char *) cipher_pos, NULL, 10);
// version (unused)
u8 *version_pos = token.buf[2];
ansible_vault->version = hc_strtoul ((const char *) version_pos, NULL, 10);
// salt
u8 *salt_pos = token.buf[3];
@ -22030,10 +22038,40 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
}
else if (hash_mode == 16900)
{
hashinfo_t **hashinfo_ptr = hash_info;
char *hash_buf = hashinfo_ptr[digest_cur]->orighash;
ansible_vault_t *ansible_vaults = (ansible_vault_t *) esalts_buf;
snprintf (out_buf, out_len - 1, "%s", hash_buf);
ansible_vault_t *ansible_vault = &ansible_vaults[digest_cur];
u8 ct_data[16384 + 1] = { 0 };
u32 *ct_data_ptr = ansible_vault->ct_data_buf;
for (u32 i = 0, j = 0; i < ansible_vault->ct_data_len / 4; i++, j += 8)
{
u32_to_hex_lower (ct_data_ptr[i], ct_data + j);
}
snprintf (out_buf, out_len - 1, "%s%u*%u*%08x%08x%08x%08x%08x%08x%08x%08x*%s*%08x%08x%08x%08x%08x%08x%08x%08x",
SIGNATURE_ANSIBLE_VAULT,
ansible_vault->cipher,
ansible_vault->version,
salt.salt_buf[0],
salt.salt_buf[1],
salt.salt_buf[2],
salt.salt_buf[3],
salt.salt_buf[4],
salt.salt_buf[5],
salt.salt_buf[6],
salt.salt_buf[7],
ct_data,
byte_swap_32 (digest_buf[0]),
byte_swap_32 (digest_buf[1]),
byte_swap_32 (digest_buf[2]),
byte_swap_32 (digest_buf[3]),
byte_swap_32 (digest_buf[4]),
byte_swap_32 (digest_buf[5]),
byte_swap_32 (digest_buf[6]),
byte_swap_32 (digest_buf[7]));
}
else if (hash_mode == 99999)
{
@ -27216,8 +27254,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
case 16900: hashconfig->hash_type = HASH_TYPE_ANSIBLE_VAULT;
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_HASH_COPY;
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE;
hashconfig->kern_type = KERN_TYPE_ANSIBLE_VAULT;
hashconfig->dgst_size = DGST_SIZE_4_8;
hashconfig->parse_func = ansible_vault_parse_hash;