mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
Add -m 6211 module and moved some code around
This commit is contained in:
jsteube
parent
dd85a8a44e
commit
8eb2558a7e
@ -27,10 +27,6 @@ int module_filename (const folder_config_t *folder_config, const int hash_mode,
|
||||
bool module_load (hashcat_ctx_t *hashcat_ctx, module_ctx_t *module_ctx, const u32 hash_mode);
|
||||
void module_unload (module_ctx_t *module_ctx);
|
||||
|
||||
bool initialize_keyboard_layout_mapping (hashcat_ctx_t *hashcat_ctx, const char *filename, keyboard_layout_mapping_t *keyboard_layout_mapping, int *keyboard_layout_mapping_cnt);
|
||||
int find_keyboard_layout_map (const u32 search, const int search_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt);
|
||||
int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt);
|
||||
|
||||
int hashconfig_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void hashconfig_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
|
||||
|
||||
@ -788,7 +788,6 @@ typedef enum kern_type
|
||||
KERN_TYPE_ANDROIDPIN = 5800,
|
||||
KERN_TYPE_RIPEMD160 = 6000,
|
||||
KERN_TYPE_WHIRLPOOL = 6100,
|
||||
KERN_TYPE_TCRIPEMD160_XTS512 = 6211,
|
||||
KERN_TYPE_TCRIPEMD160_XTS1024 = 6212,
|
||||
KERN_TYPE_TCRIPEMD160_XTS1536 = 6213,
|
||||
KERN_TYPE_TCSHA512_XTS512 = 6221,
|
||||
|
||||
13
include/keyboard_layout.h
Normal file
13
include/keyboard_layout.h
Normal file
@ -0,0 +1,13 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#ifndef _KEYBOARD_LAYOUT_H
|
||||
#define _KEYBOARD_LAYOUT_H
|
||||
|
||||
bool initialize_keyboard_layout_mapping (const char *filename, keyboard_layout_mapping_t *keyboard_layout_mapping, int *keyboard_layout_mapping_cnt);
|
||||
int find_keyboard_layout_map (const u32 search, const int search_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt);
|
||||
int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt);
|
||||
|
||||
#endif // _KEYBOARD_LAYOUT_H
|
||||
@ -346,7 +346,7 @@ LFLAGS_CROSS_WIN64 += -lws2_32
|
||||
## Objects
|
||||
##
|
||||
|
||||
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu rp_kernel_on_cpu rp_kernel_on_cpu_optimized selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist
|
||||
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface keyboard_layout locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu rp_kernel_on_cpu rp_kernel_on_cpu_optimized selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist
|
||||
|
||||
ifeq ($(ENABLE_BRAIN),1)
|
||||
OBJS_ALL += brain
|
||||
@ -389,7 +389,7 @@ WIN_64_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).WIN.64.o)
|
||||
endif
|
||||
endif
|
||||
|
||||
MODULE_OBJS_ALL := bitops convert cpu_aes cpu_crc32 cpu_des cpu_md5 ext_lzma memory shared
|
||||
MODULE_OBJS_ALL := bitops convert cpu_aes cpu_crc32 cpu_des cpu_md5 ext_lzma filehandling keyboard_layout memory shared
|
||||
|
||||
ifeq ($(USE_SYSTEM_LZMA),0)
|
||||
MODULE_OBJS_ALL += Alloc Lzma2Dec LzmaDec
|
||||
|
||||
@ -1497,11 +1497,6 @@ int hashes_init_stage4 (hashcat_ctx_t *hashcat_ctx)
|
||||
hashes_t *hashes = hashcat_ctx->hashes;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
// this is a good phase for setting keyfile and keyboard mapping
|
||||
//const int rc_defaults = hashconfig_general_defaults (hashcat_ctx);
|
||||
|
||||
//if (rc_defaults == -1) return -1;
|
||||
|
||||
if (hashes->salts_cnt == 1)
|
||||
hashconfig->opti_type |= OPTI_TYPE_SINGLE_SALT;
|
||||
|
||||
|
||||
217
src/interface.c
217
src/interface.c
@ -16,218 +16,6 @@
|
||||
#include "modules.h"
|
||||
#include "dynloader.h"
|
||||
|
||||
/**
|
||||
* parser
|
||||
*/
|
||||
|
||||
static int sort_by_src_len (const void *p1, const void *p2)
|
||||
{
|
||||
const keyboard_layout_mapping_t *k1 = (const keyboard_layout_mapping_t *) p1;
|
||||
const keyboard_layout_mapping_t *k2 = (const keyboard_layout_mapping_t *) p2;
|
||||
|
||||
return k1->src_len < k2->src_len;
|
||||
}
|
||||
|
||||
bool initialize_keyboard_layout_mapping (hashcat_ctx_t *hashcat_ctx, const char *filename, keyboard_layout_mapping_t *keyboard_layout_mapping, int *keyboard_layout_mapping_cnt)
|
||||
{
|
||||
char *line_buf = (char *) hcmalloc (HCBUFSIZ_LARGE);
|
||||
|
||||
FILE *fp = fopen (filename, "r");
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "%s: %s", filename, strerror (errno));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
int maps_cnt = 0;
|
||||
|
||||
while (!feof (fp))
|
||||
{
|
||||
const size_t line_len = fgetl (fp, line_buf);
|
||||
|
||||
if (line_len == 0) continue;
|
||||
|
||||
token_t token;
|
||||
|
||||
token.token_cnt = 2;
|
||||
|
||||
token.len_min[0] = 1;
|
||||
token.len_max[0] = 4;
|
||||
token.sep[0] = 0x09;
|
||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH;
|
||||
|
||||
token.len_min[1] = 0;
|
||||
token.len_max[1] = 4;
|
||||
token.sep[1] = 0x09;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
|
||||
|
||||
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, (const int) line_len, &token);
|
||||
|
||||
if (rc_tokenizer != PARSER_OK)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "%s: Syntax error: %s", filename, line_buf);
|
||||
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
memcpy (&keyboard_layout_mapping[maps_cnt].src_char, token.buf[0], token.len[0]);
|
||||
memcpy (&keyboard_layout_mapping[maps_cnt].dst_char, token.buf[1], token.len[1]);
|
||||
|
||||
keyboard_layout_mapping[maps_cnt].src_len = token.len[0];
|
||||
keyboard_layout_mapping[maps_cnt].dst_len = token.len[1];
|
||||
|
||||
if (maps_cnt == 256)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "%s: too many entries", filename);
|
||||
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
maps_cnt++;
|
||||
}
|
||||
|
||||
*keyboard_layout_mapping_cnt = maps_cnt;
|
||||
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
// we need to sort this by length to ensure the largest blocks come first in mapping
|
||||
|
||||
qsort (keyboard_layout_mapping, maps_cnt, sizeof (keyboard_layout_mapping_t), sort_by_src_len);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int find_keyboard_layout_map (const u32 search, const int search_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt)
|
||||
{
|
||||
for (int idx = 0; idx < keyboard_layout_mapping_cnt; idx++)
|
||||
{
|
||||
const u32 src_char = s_keyboard_layout_mapping[idx].src_char;
|
||||
const int src_len = s_keyboard_layout_mapping[idx].src_len;
|
||||
|
||||
if (src_len == search_len)
|
||||
{
|
||||
const u32 mask = 0xffffffff >> ((4 - search_len) * 8);
|
||||
|
||||
if ((src_char & mask) == (search & mask)) return idx;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt)
|
||||
{
|
||||
u32 out_buf[16] = { 0 };
|
||||
|
||||
u8 *out_ptr = (u8 *) out_buf;
|
||||
|
||||
int out_len = 0;
|
||||
|
||||
u8 *plain_ptr = (u8 *) plain_buf;
|
||||
|
||||
int plain_pos = 0;
|
||||
|
||||
while (plain_pos < plain_len)
|
||||
{
|
||||
u32 src0 = 0;
|
||||
u32 src1 = 0;
|
||||
u32 src2 = 0;
|
||||
u32 src3 = 0;
|
||||
|
||||
const int rem = MIN (plain_len - plain_pos, 4);
|
||||
|
||||
if (rem > 0) src0 = plain_ptr[plain_pos + 0];
|
||||
if (rem > 1) src1 = plain_ptr[plain_pos + 1];
|
||||
if (rem > 2) src2 = plain_ptr[plain_pos + 2];
|
||||
if (rem > 3) src3 = plain_ptr[plain_pos + 3];
|
||||
|
||||
const u32 src = (src0 << 0)
|
||||
| (src1 << 8)
|
||||
| (src2 << 16)
|
||||
| (src3 << 24);
|
||||
|
||||
int src_len;
|
||||
|
||||
for (src_len = rem; src_len > 0; src_len--)
|
||||
{
|
||||
const int idx = find_keyboard_layout_map (src, src_len, s_keyboard_layout_mapping, keyboard_layout_mapping_cnt);
|
||||
|
||||
if (idx == -1) continue;
|
||||
|
||||
u32 dst_char = s_keyboard_layout_mapping[idx].dst_char;
|
||||
int dst_len = s_keyboard_layout_mapping[idx].dst_len;
|
||||
|
||||
switch (dst_len)
|
||||
{
|
||||
case 1:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
break;
|
||||
case 2:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
break;
|
||||
case 3:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 16) & 0xff;
|
||||
break;
|
||||
case 4:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 16) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 24) & 0xff;
|
||||
break;
|
||||
}
|
||||
|
||||
plain_pos += src_len;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
// not matched, keep original
|
||||
|
||||
if (src_len == 0)
|
||||
{
|
||||
out_ptr[out_len] = plain_ptr[plain_pos];
|
||||
|
||||
out_len++;
|
||||
|
||||
plain_pos++;
|
||||
}
|
||||
}
|
||||
|
||||
plain_buf[ 0] = out_buf[ 0];
|
||||
plain_buf[ 1] = out_buf[ 1];
|
||||
plain_buf[ 2] = out_buf[ 2];
|
||||
plain_buf[ 3] = out_buf[ 3];
|
||||
plain_buf[ 4] = out_buf[ 4];
|
||||
plain_buf[ 5] = out_buf[ 5];
|
||||
plain_buf[ 6] = out_buf[ 6];
|
||||
plain_buf[ 7] = out_buf[ 7];
|
||||
plain_buf[ 8] = out_buf[ 8];
|
||||
plain_buf[ 9] = out_buf[ 9];
|
||||
plain_buf[10] = out_buf[10];
|
||||
plain_buf[11] = out_buf[11];
|
||||
plain_buf[12] = out_buf[12];
|
||||
plain_buf[13] = out_buf[13];
|
||||
plain_buf[14] = out_buf[14];
|
||||
plain_buf[15] = out_buf[15];
|
||||
|
||||
return out_len;
|
||||
}
|
||||
|
||||
/**
|
||||
* parsing
|
||||
*/
|
||||
@ -245,6 +33,11 @@ int ascii_digest (const hashconfig_t *hashconfig, const hashes_t *hashes, const
|
||||
const u64 esalt_size = hashconfig->esalt_size;
|
||||
const u64 hook_salt_size = hashconfig->hook_salt_size;
|
||||
|
||||
if (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE)
|
||||
{
|
||||
return snprintf (out_buf, out_size, "%s", hashfile);
|
||||
}
|
||||
|
||||
//const u32 hash_type = hashconfig->hash_type;
|
||||
//const u32 hash_mode = hashconfig->hash_mode;
|
||||
//const u32 salt_type = hashconfig->salt_type;
|
||||
|
||||
@ -313,7 +313,6 @@ static const char *ST_HASH_05700 = "2btjjy78REtmYkkW0csHUbJZOstRXoWdX1mGrmmfeHI"
|
||||
static const char *ST_HASH_05800 = "3edde1eb9e6679ccbc1ff3c417e8a475a2d2e279:7724368582277760";
|
||||
static const char *ST_HASH_06000 = "012cb9b334ec1aeb71a9c8ce85586082467f7eb6";
|
||||
static const char *ST_HASH_06100 = "7ca8eaaaa15eaa4c038b4c47b9313e92da827c06940e69947f85bc0fbef3eb8fd254da220ad9e208b6b28f6bb9be31dd760f1fdb26112d83f87d96b416a4d258";
|
||||
static const char *ST_HASH_06211 = "87914967f14737a67fb460f27b8aeb81de2b41bf2740b3dd78784e02763951daa47c7ca235e75c22ec8d959d6b67f7eedefad61e6a0d038079d3721a8e7215e415671e8c7b3dbed6453a114e6db89a52be9a9c1698a9c698f1e37f80d7afaf0efba82b6e5f5df32bd289b95343c6775e2c7f025ef1d8bfae84042a92546e15b635b5fade3aef6ee52a7a5ab018d33ea98bc115dfc62af606187fbab8cbda6e8417402c722ca8c2b07e6ca6a33bf94b2ce2a819a9f8cfaa5af70e3af6e5350d3a306f036f13ff5ba97d5728d5f6413b482c74f528211ae77b6c169215c5487d5a3ce23736b16996b86c71b12d120df28ef322f5143d9a258d0ae7aaa8c193a6dcb5bf18e3c57b5474d24b843f8dd4e83a74109396ddb4f0c50d3657a7eacc8828568e51202de48cd2dfe5acbe3d8840ade1ce44b716d5c0008f2b21b9981353cb12b8af2592a5ab744ae83623349f551acf371c81f86d17a8422654989f078179b2386e2aa8375853a1802cd8bc5d41ce45795f78b80e69fcfa3d14cf9127c3a33fa2dc76ad73960fb7bce15dd489e0b6eca7beed3733887cd5e6f3939a015d4d449185060b2f3bbad46e46d417b8f0830e91edd5ebc17cd5a99316792a36afd83fa1edc55da25518c8e7ff61e201976fa2c5fc9969e05cbee0dce7a0ef876b7340bbe8937c9d9c8248f0e0eae705fe7e1d2da48902f4f3e27d2cf532b7021e18";
|
||||
static const char *ST_HASH_06212 = "d6e1644acd373e6fdb8ccaaeab0c400d22eaa0b02e2a6649e065ad50f91e2f81fc5e1600d1cdf3b4ee72a7326a9a28d336ec65adf2d54661e1a609dd9941279fd64a9c513dfb0192734fc1e1014cdd0a399e89a0860c4077463c18609f5218254edd998adb11a02271723d1aa094550df385dd8e080cb42ed1349f69c0a6bad4b37e6dab1effbe0095471a8d640679422fe1533a21f10cb6d15e5ee8cde78e677acf3d09d008e9fbf57f09c1c57f19e51ff54631e0e2adc2ee2832425c1ec718d96a17df7e55aceffb7b23a1872f32795d4491c739e21b01e19a1b7dfcb22709c9d9302154462664a668ea635664df65804bf680ff07026d6f5b225762a3a270df832d47e7feb6277a228454a3ba9b5bbade23ecaec0eaf31ad1dbac31754c970a212bd44c9278bc6076f096a2eed602e04a70c6f7fa94ef4e75299692e5dcc6f1a7e6032b9b765e9e61faeed3f9efacc0a15b1817e74d48ec11a13d15811c7e2c4d12f36d35a04131d02f14184fc15bc20e79115dc7c980b681a19a225964469787df481b68a8f722f2bd3115dbbcb3c8ac1b07d742f78f30635dea29dfb1db83e89fc85a30b0379fc8aa69a4ea94c99052685d38c9559a1246284cdc32c5110eb8c6741352cd42e09e6389d4765c58aa84d51867cf86fba69d29eac1cd7fac2f36603d2fb2af146c5d4c2bedb4f6c6d0f387f0a8d635e33384df60f8d2415b";
|
||||
static const char *ST_HASH_06213 = "3916e924d246e5ceb17b140211fff57b67150b3dee53fa475261d465b0ee3e56ee820e6ba3958d84c61508f028b2a112e9005877784e07deddcf310d01ba81710b620533790456d20d17c8fda84f9d93bbfe41509b931a417b82d68ed9b0bc9641b79a5bf8f71bcdbba979dfb7566a5b8ccc221f80722c1ce7ec81be4a8c880b1b057e681c187504eabf4eea32f7b81383defd4616618a99852d1678a6520883c8f3564e6dcf874150a060b9a44748d97f95b223b089ac847e31fb5a2db3656d7b57decff65e2c5c9af5bdece7a1845caa9df805fc1f7e56bf545d854beec27a9640bf1697c195e5f95b82c20d76c5a56ff4283219caa5a618e8caace9d0fcde0df6ee6e043ccbc78fd06a602cc638f7ae4675063b840ee08ffa9e143553bffd20126fa30f95e013aabf103f12c3ceeb284c80dc335fe2e78580d6ddfa80511aba9db7c93838cae0db40b9dbeccbf9d160032d334a9c35156721c746b51131baf6855fdfc1edee3099b8e4abc619e1c60e3ce68615e1eb42bd8d338046f7c854a60defe395e0d7168786a3035c9735cd42433dd0c46dcf8b5cb2c28905df80476561e55d6310b25f74d78b651ccd3484332c59a6ad490e29ea267db5ce4a47c9dcde39f420ba0755ea7e5583a3a562925acaa125d5056795b98135825232aa543a460137cc84235b85dd44d65e01e6eb1ade1b970f3ffe2b9762f5a7f261037e";
|
||||
static const char *ST_HASH_06221 = "5ebff6b4050aaa3374f9946166a9c4134dd3ec0df1176da2fb103909d20e8b3c9b95cbbd6d1a7ad05411a1443ad6254e059e924d78bab6a0463e71cf7c3109b7ef4e837bf6d7a548dd8333c451b59d1132098f44c6ff19c6cb921b1de3bd0aa675e0478a05f90204d46a5d6ff598bfa40370ac8795928a6d2e0f1347696e3cfa329738170fe54298981d84f40c63d1a338c5db62679338e849124a28a79a8e505bb89a4673f0457b2737a00b908116310281b5b2eb66c6fda5599196b313d51ef26201335d715c18f6b128454a5601671e619bdcce8e54acb47d498c4161614a05063bff5497a4a3d99bff1fce2a163727af2fe9ae7512461b9dcebf3a4f1031d6235d8ce09b734294d0cedc04eafc6295f212b1b080e7b9745580d0dd18e99cfd95afef982762d5aabeaa2d3a928dcf36322cc06b07fd719c88e0b9a2625a94a77502d4bd40a85ba138cbd0cf9561aa395dc552801f68cce16e5484a672aa5b78665dc531ab1e3e728185929dc443b7f4c8a5cb687c6589bb3f4ddc2a8639d959b839b0813d50e7711b761622c3693a92e540e4f932c6c89bf4e1bff1d69151848c3d01b2f6aba52b58e5b393f6cd58ff0d2e040b1205b042b5a28d5b12cb0cc95fa32f1bcdebd4c82d889a5d87c45dcfd34e80b19bf7be35696e0fa0cbd9338b314de24c1ee7bbc0a3b6824f86af2aa5d127d21444985ff566e921431938f6";
|
||||
@ -622,7 +621,6 @@ static const char *HT_02711 = "vBulletin >= v3.8.5";
|
||||
static const char *HT_02811 = "IPB2+ (Invision Power Board), MyBB 1.2+";
|
||||
static const char *HT_04521 = "Redmine";
|
||||
static const char *HT_04522 = "PunBB";
|
||||
static const char *HT_06211 = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit";
|
||||
static const char *HT_06212 = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit";
|
||||
static const char *HT_06213 = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit";
|
||||
static const char *HT_06221 = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit";
|
||||
@ -14919,8 +14917,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
||||
break;
|
||||
case 5800: salt->salt_iter = ROUNDS_ANDROIDPIN - 1;
|
||||
break;
|
||||
case 6211: salt->salt_iter = ROUNDS_TRUECRYPT_2K;
|
||||
break;
|
||||
case 6212: salt->salt_iter = ROUNDS_TRUECRYPT_2K;
|
||||
break;
|
||||
case 6213: salt->salt_iter = ROUNDS_TRUECRYPT_2K;
|
||||
@ -19536,24 +19532,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 6211: hashconfig->hash_type = HASH_TYPE_RIPEMD160;
|
||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_BINARY_HASHFILE;
|
||||
hashconfig->kern_type = KERN_TYPE_TCRIPEMD160_XTS512;
|
||||
hashconfig->dgst_size = DGST_SIZE_4_5;
|
||||
hashconfig->parse_func = truecrypt_parse_hash_2k;
|
||||
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_06211;
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 6212: hashconfig->hash_type = HASH_TYPE_RIPEMD160;
|
||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
@ -22079,7 +22057,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
case 5300: hashconfig->esalt_size = sizeof (ikepsk_t); break;
|
||||
case 5400: hashconfig->esalt_size = sizeof (ikepsk_t); break;
|
||||
case 6211: hashconfig->esalt_size = sizeof (tc_t); break;
|
||||
case 6212: hashconfig->esalt_size = sizeof (tc_t); break;
|
||||
case 6213: hashconfig->esalt_size = sizeof (tc_t); break;
|
||||
case 6221: hashconfig->esalt_size = sizeof (tc_t); break;
|
||||
@ -22169,7 +22146,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
case 2100: hashconfig->tmp_size = sizeof (dcc2_tmp_t); break;
|
||||
case 5200: hashconfig->tmp_size = sizeof (pwsafe3_tmp_t); break;
|
||||
case 5800: hashconfig->tmp_size = sizeof (androidpin_tmp_t); break;
|
||||
case 6211: hashconfig->tmp_size = sizeof (tc_tmp_t); break;
|
||||
case 6212: hashconfig->tmp_size = sizeof (tc_tmp_t); break;
|
||||
case 6213: hashconfig->tmp_size = sizeof (tc_tmp_t); break;
|
||||
case 6221: hashconfig->tmp_size = sizeof (tc64_tmp_t); break;
|
||||
@ -22323,7 +22299,6 @@ u32 default_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED co
|
||||
case 2100: pw_max = PW_MAX; break;
|
||||
case 3100: pw_max = 30; break; // http://www.red-database-security.de/whitepaper/oracle_passwords.html
|
||||
case 5200: pw_max = PW_MAX; break;
|
||||
case 6211: pw_max = 64; break; // TC limits itself to 64
|
||||
case 6212: pw_max = 64; break; // TC limits itself to 64
|
||||
case 6213: pw_max = 64; break; // TC limits itself to 64
|
||||
case 6221: pw_max = 64; break; // TC limits itself to 64
|
||||
@ -23033,14 +23008,91 @@ bool module_hash_binary_verify (MAYBE_UNUSED const hashes_t *hashes)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int hashconfig_general_defaults (hashcat_ctx_t *hashcat_ctx)
|
||||
void decoder_apply_optimizer (const hashconfig_t *hashconfig, void *data)
|
||||
{
|
||||
hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
const u32 hash_type = hashconfig->hash_type;
|
||||
const u32 opti_type = hashconfig->opti_type;
|
||||
|
||||
u32 *digest_buf = (u32 *) data;
|
||||
u64 *digest_buf64 = (u64 *) data;
|
||||
|
||||
if (opti_type & OPTI_TYPE_PRECOMPUTE_PERMUT)
|
||||
{
|
||||
u32 tt;
|
||||
|
||||
switch (hash_type)
|
||||
{
|
||||
case HASH_TYPE_DESRACF:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 29);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 29);
|
||||
|
||||
IP (digest_buf[0], digest_buf[1], tt);
|
||||
break;
|
||||
|
||||
case HASH_TYPE_BSDICRYPT:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 31);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 31);
|
||||
|
||||
IP (digest_buf[0], digest_buf[1], tt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void encoder_apply_optimizer (const hashconfig_t *hashconfig, void *data)
|
||||
{
|
||||
const u32 hash_type = hashconfig->hash_type;
|
||||
const u32 opti_type = hashconfig->opti_type;
|
||||
|
||||
u32 *digest_buf = (u32 *) data;
|
||||
u64 *digest_buf64 = (u64 *) data;
|
||||
|
||||
if (opti_type & OPTI_TYPE_PRECOMPUTE_PERMUT)
|
||||
{
|
||||
u32 tt;
|
||||
|
||||
// dont trust this too much, was created untested
|
||||
|
||||
|
||||
case HASH_TYPE_NETNTLM:
|
||||
|
||||
salt.salt_buf[0] = rotr32 (salt.salt_buf[0], 3);
|
||||
salt.salt_buf[1] = rotr32 (salt.salt_buf[1], 3);
|
||||
|
||||
u32 tt;
|
||||
|
||||
FP (salt.salt_buf[1], salt.salt_buf[0], tt);
|
||||
|
||||
break;
|
||||
|
||||
|
||||
|
||||
switch (hash_type)
|
||||
{
|
||||
case HASH_TYPE_DESRACF:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 29);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 29);
|
||||
|
||||
FP (digest_buf[1], digest_buf[0], tt);
|
||||
break;
|
||||
|
||||
case HASH_TYPE_BSDICRYPT:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 31);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 31);
|
||||
|
||||
FP (digest_buf[1], digest_buf[0], tt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void module_hash_binary_parse
|
||||
{
|
||||
// some special initializations for rare hash-modes which have special user_options
|
||||
|
||||
// truecrypt and veracrypt only
|
||||
if (((hashconfig->hash_mode >= 6200) && (hashconfig->hash_mode <= 6299))
|
||||
|| ((hashconfig->hash_mode >= 13700) && (hashconfig->hash_mode == 13799)))
|
||||
{
|
||||
@ -23163,86 +23215,4 @@ static int hashconfig_general_defaults (hashcat_ctx_t *hashcat_ctx)
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void decoder_apply_optimizer (const hashconfig_t *hashconfig, void *data)
|
||||
{
|
||||
const u32 hash_type = hashconfig->hash_type;
|
||||
const u32 opti_type = hashconfig->opti_type;
|
||||
|
||||
u32 *digest_buf = (u32 *) data;
|
||||
u64 *digest_buf64 = (u64 *) data;
|
||||
|
||||
if (opti_type & OPTI_TYPE_PRECOMPUTE_PERMUT)
|
||||
{
|
||||
u32 tt;
|
||||
|
||||
switch (hash_type)
|
||||
{
|
||||
case HASH_TYPE_DESRACF:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 29);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 29);
|
||||
|
||||
IP (digest_buf[0], digest_buf[1], tt);
|
||||
break;
|
||||
|
||||
case HASH_TYPE_BSDICRYPT:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 31);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 31);
|
||||
|
||||
IP (digest_buf[0], digest_buf[1], tt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void encoder_apply_optimizer (const hashconfig_t *hashconfig, void *data)
|
||||
{
|
||||
const u32 hash_type = hashconfig->hash_type;
|
||||
const u32 opti_type = hashconfig->opti_type;
|
||||
|
||||
u32 *digest_buf = (u32 *) data;
|
||||
u64 *digest_buf64 = (u64 *) data;
|
||||
|
||||
if (opti_type & OPTI_TYPE_PRECOMPUTE_PERMUT)
|
||||
{
|
||||
u32 tt;
|
||||
|
||||
// dont trust this too much, was created untested
|
||||
|
||||
|
||||
case HASH_TYPE_NETNTLM:
|
||||
|
||||
salt.salt_buf[0] = rotr32 (salt.salt_buf[0], 3);
|
||||
salt.salt_buf[1] = rotr32 (salt.salt_buf[1], 3);
|
||||
|
||||
u32 tt;
|
||||
|
||||
FP (salt.salt_buf[1], salt.salt_buf[0], tt);
|
||||
|
||||
break;
|
||||
|
||||
|
||||
|
||||
switch (hash_type)
|
||||
{
|
||||
case HASH_TYPE_DESRACF:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 29);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 29);
|
||||
|
||||
FP (digest_buf[1], digest_buf[0], tt);
|
||||
break;
|
||||
|
||||
case HASH_TYPE_BSDICRYPT:
|
||||
digest_buf[0] = rotl32 (digest_buf[0], 31);
|
||||
digest_buf[1] = rotl32 (digest_buf[1], 31);
|
||||
|
||||
FP (digest_buf[1], digest_buf[0], tt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
210
src/keyboard_layout.c
Normal file
210
src/keyboard_layout.c
Normal file
@ -0,0 +1,210 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "types.h"
|
||||
#include "memory.h"
|
||||
#include "filehandling.h"
|
||||
#include "shared.h"
|
||||
#include "keyboard_layout.h"
|
||||
|
||||
static int sort_by_src_len (const void *p1, const void *p2)
|
||||
{
|
||||
const keyboard_layout_mapping_t *k1 = (const keyboard_layout_mapping_t *) p1;
|
||||
const keyboard_layout_mapping_t *k2 = (const keyboard_layout_mapping_t *) p2;
|
||||
|
||||
return k1->src_len < k2->src_len;
|
||||
}
|
||||
|
||||
bool initialize_keyboard_layout_mapping (const char *filename, keyboard_layout_mapping_t *keyboard_layout_mapping, int *keyboard_layout_mapping_cnt)
|
||||
{
|
||||
char *line_buf = (char *) hcmalloc (HCBUFSIZ_LARGE);
|
||||
|
||||
FILE *fp = fopen (filename, "r");
|
||||
|
||||
if (fp == NULL) return false;
|
||||
|
||||
int maps_cnt = 0;
|
||||
|
||||
while (!feof (fp))
|
||||
{
|
||||
const size_t line_len = fgetl (fp, line_buf);
|
||||
|
||||
if (line_len == 0) continue;
|
||||
|
||||
token_t token;
|
||||
|
||||
token.token_cnt = 2;
|
||||
|
||||
token.len_min[0] = 1;
|
||||
token.len_max[0] = 4;
|
||||
token.sep[0] = 0x09;
|
||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH;
|
||||
|
||||
token.len_min[1] = 0;
|
||||
token.len_max[1] = 4;
|
||||
token.sep[1] = 0x09;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
|
||||
|
||||
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, (const int) line_len, &token);
|
||||
|
||||
if (rc_tokenizer != PARSER_OK)
|
||||
{
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
memcpy (&keyboard_layout_mapping[maps_cnt].src_char, token.buf[0], token.len[0]);
|
||||
memcpy (&keyboard_layout_mapping[maps_cnt].dst_char, token.buf[1], token.len[1]);
|
||||
|
||||
keyboard_layout_mapping[maps_cnt].src_len = token.len[0];
|
||||
keyboard_layout_mapping[maps_cnt].dst_len = token.len[1];
|
||||
|
||||
if (maps_cnt == 256)
|
||||
{
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
maps_cnt++;
|
||||
}
|
||||
|
||||
*keyboard_layout_mapping_cnt = maps_cnt;
|
||||
|
||||
fclose (fp);
|
||||
|
||||
free (line_buf);
|
||||
|
||||
// we need to sort this by length to ensure the largest blocks come first in mapping
|
||||
|
||||
qsort (keyboard_layout_mapping, maps_cnt, sizeof (keyboard_layout_mapping_t), sort_by_src_len);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int find_keyboard_layout_map (const u32 search, const int search_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt)
|
||||
{
|
||||
for (int idx = 0; idx < keyboard_layout_mapping_cnt; idx++)
|
||||
{
|
||||
const u32 src_char = s_keyboard_layout_mapping[idx].src_char;
|
||||
const int src_len = s_keyboard_layout_mapping[idx].src_len;
|
||||
|
||||
if (src_len == search_len)
|
||||
{
|
||||
const u32 mask = 0xffffffff >> ((4 - search_len) * 8);
|
||||
|
||||
if ((src_char & mask) == (search & mask)) return idx;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, keyboard_layout_mapping_t *s_keyboard_layout_mapping, const int keyboard_layout_mapping_cnt)
|
||||
{
|
||||
u32 out_buf[16] = { 0 };
|
||||
|
||||
u8 *out_ptr = (u8 *) out_buf;
|
||||
|
||||
int out_len = 0;
|
||||
|
||||
u8 *plain_ptr = (u8 *) plain_buf;
|
||||
|
||||
int plain_pos = 0;
|
||||
|
||||
while (plain_pos < plain_len)
|
||||
{
|
||||
u32 src0 = 0;
|
||||
u32 src1 = 0;
|
||||
u32 src2 = 0;
|
||||
u32 src3 = 0;
|
||||
|
||||
const int rem = MIN (plain_len - plain_pos, 4);
|
||||
|
||||
if (rem > 0) src0 = plain_ptr[plain_pos + 0];
|
||||
if (rem > 1) src1 = plain_ptr[plain_pos + 1];
|
||||
if (rem > 2) src2 = plain_ptr[plain_pos + 2];
|
||||
if (rem > 3) src3 = plain_ptr[plain_pos + 3];
|
||||
|
||||
const u32 src = (src0 << 0)
|
||||
| (src1 << 8)
|
||||
| (src2 << 16)
|
||||
| (src3 << 24);
|
||||
|
||||
int src_len;
|
||||
|
||||
for (src_len = rem; src_len > 0; src_len--)
|
||||
{
|
||||
const int idx = find_keyboard_layout_map (src, src_len, s_keyboard_layout_mapping, keyboard_layout_mapping_cnt);
|
||||
|
||||
if (idx == -1) continue;
|
||||
|
||||
u32 dst_char = s_keyboard_layout_mapping[idx].dst_char;
|
||||
int dst_len = s_keyboard_layout_mapping[idx].dst_len;
|
||||
|
||||
switch (dst_len)
|
||||
{
|
||||
case 1:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
break;
|
||||
case 2:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
break;
|
||||
case 3:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 16) & 0xff;
|
||||
break;
|
||||
case 4:
|
||||
out_ptr[out_len++] = (dst_char >> 0) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 8) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 16) & 0xff;
|
||||
out_ptr[out_len++] = (dst_char >> 24) & 0xff;
|
||||
break;
|
||||
}
|
||||
|
||||
plain_pos += src_len;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
// not matched, keep original
|
||||
|
||||
if (src_len == 0)
|
||||
{
|
||||
out_ptr[out_len] = plain_ptr[plain_pos];
|
||||
|
||||
out_len++;
|
||||
|
||||
plain_pos++;
|
||||
}
|
||||
}
|
||||
|
||||
plain_buf[ 0] = out_buf[ 0];
|
||||
plain_buf[ 1] = out_buf[ 1];
|
||||
plain_buf[ 2] = out_buf[ 2];
|
||||
plain_buf[ 3] = out_buf[ 3];
|
||||
plain_buf[ 4] = out_buf[ 4];
|
||||
plain_buf[ 5] = out_buf[ 5];
|
||||
plain_buf[ 6] = out_buf[ 6];
|
||||
plain_buf[ 7] = out_buf[ 7];
|
||||
plain_buf[ 8] = out_buf[ 8];
|
||||
plain_buf[ 9] = out_buf[ 9];
|
||||
plain_buf[10] = out_buf[10];
|
||||
plain_buf[11] = out_buf[11];
|
||||
plain_buf[12] = out_buf[12];
|
||||
plain_buf[13] = out_buf[13];
|
||||
plain_buf[14] = out_buf[14];
|
||||
plain_buf[15] = out_buf[15];
|
||||
|
||||
return out_len;
|
||||
}
|
||||
@ -303,10 +303,10 @@ int module_hash_encode_status (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYB
|
||||
|
||||
int module_hash_init_selftest (MAYBE_UNUSED const hashconfig_t *hashconfig, hash_t *hash)
|
||||
{
|
||||
char *tmpdata = (char *) hcmalloc (sizeof (hccapx_t));
|
||||
|
||||
const size_t st_hash_len = strlen (hashconfig->st_hash);
|
||||
|
||||
char *tmpdata = (char *) hcmalloc (st_hash_len / 2);
|
||||
|
||||
for (size_t i = 0, j = 0; j < st_hash_len; i += 1, j += 2)
|
||||
{
|
||||
const u8 c = hex_to_u8 ((const u8 *) hashconfig->st_hash + j);
|
||||
@ -314,7 +314,7 @@ int module_hash_init_selftest (MAYBE_UNUSED const hashconfig_t *hashconfig, hash
|
||||
tmpdata[i] = c;
|
||||
}
|
||||
|
||||
int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, tmpdata, sizeof (hccapx_t));
|
||||
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, tmpdata, st_hash_len / 2);
|
||||
|
||||
wpa_eapol_t *wpa_eapol = (wpa_eapol_t *) hash->esalt;
|
||||
|
||||
|
||||
302
src/modules/module_06211.c
Normal file
302
src/modules/module_06211.c
Normal file
@ -0,0 +1,302 @@
|
||||
/**
|
||||
* 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 "memory.h"
|
||||
#include "cpu_crc32.h"
|
||||
#include "keyboard_layout.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;
|
||||
static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE;
|
||||
static const char *HASH_NAME = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit";
|
||||
static const u32 HASH_TYPE = HASH_TYPE_GENERIC;
|
||||
static const u64 KERN_TYPE = 6211;
|
||||
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_BINARY_HASHFILE;
|
||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||
static const char *ST_PASS = "hashcat";
|
||||
static const char *ST_HASH = "87914967f14737a67fb460f27b8aeb81de2b41bf2740b3dd78784e02763951daa47c7ca235e75c22ec8d959d6b67f7eedefad61e6a0d038079d3721a8e7215e415671e8c7b3dbed6453a114e6db89a52be9a9c1698a9c698f1e37f80d7afaf0efba82b6e5f5df32bd289b95343c6775e2c7f025ef1d8bfae84042a92546e15b635b5fade3aef6ee52a7a5ab018d33ea98bc115dfc62af606187fbab8cbda6e8417402c722ca8c2b07e6ca6a33bf94b2ce2a819a9f8cfaa5af70e3af6e5350d3a306f036f13ff5ba97d5728d5f6413b482c74f528211ae77b6c169215c5487d5a3ce23736b16996b86c71b12d120df28ef322f5143d9a258d0ae7aaa8c193a6dcb5bf18e3c57b5474d24b843f8dd4e83a74109396ddb4f0c50d3657a7eacc8828568e51202de48cd2dfe5acbe3d8840ade1ce44b716d5c0008f2b21b9981353cb12b8af2592a5ab744ae83623349f551acf371c81f86d17a8422654989f078179b2386e2aa8375853a1802cd8bc5d41ce45795f78b80e69fcfa3d14cf9127c3a33fa2dc76ad73960fb7bce15dd489e0b6eca7beed3733887cd5e6f3939a015d4d449185060b2f3bbad46e46d417b8f0830e91edd5ebc17cd5a99316792a36afd83fa1edc55da25518c8e7ff61e201976fa2c5fc9969e05cbee0dce7a0ef876b7340bbe8937c9d9c8248f0e0eae705fe7e1d2da48902f4f3e27d2cf532b7021e18";
|
||||
|
||||
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 tc_tmp
|
||||
{
|
||||
u32 ipad[16];
|
||||
u32 opad[16];
|
||||
|
||||
u32 dgst[64];
|
||||
u32 out[64];
|
||||
|
||||
} tc_tmp_t;
|
||||
|
||||
typedef struct tc
|
||||
{
|
||||
u32 salt_buf[32];
|
||||
u32 data_buf[112];
|
||||
u32 keyfile_buf[16];
|
||||
u32 signature;
|
||||
|
||||
keyboard_layout_mapping_t keyboard_layout_mapping_buf[256];
|
||||
int keyboard_layout_mapping_cnt;
|
||||
|
||||
} tc_t;
|
||||
|
||||
static const int ROUNDS_TRUECRYPT_2K = 2000;
|
||||
static const float MIN_SUFFICIENT_ENTROPY_FILE = 7.0f;
|
||||
|
||||
bool module_potfile_disable (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 bool potfile_disable = true;
|
||||
|
||||
return potfile_disable;
|
||||
}
|
||||
|
||||
bool module_outfile_check_disable (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 bool outfile_check_disable = true;
|
||||
|
||||
return outfile_check_disable;
|
||||
}
|
||||
|
||||
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 (tc_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 (tc_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 64
|
||||
|
||||
const u32 pw_max = 64;
|
||||
|
||||
return pw_max;
|
||||
}
|
||||
|
||||
int module_hash_init_selftest (MAYBE_UNUSED const hashconfig_t *hashconfig, hash_t *hash)
|
||||
{
|
||||
const size_t st_hash_len = strlen (hashconfig->st_hash);
|
||||
|
||||
char *tmpdata = (char *) hcmalloc (st_hash_len / 2);
|
||||
|
||||
for (size_t i = 0, j = 0; j < st_hash_len; i += 1, j += 2)
|
||||
{
|
||||
const u8 c = hex_to_u8 ((const u8 *) hashconfig->st_hash + j);
|
||||
|
||||
tmpdata[i] = c;
|
||||
}
|
||||
|
||||
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, tmpdata, st_hash_len / 2);
|
||||
|
||||
|
||||
|
||||
hcfree (tmpdata);
|
||||
|
||||
return parser_status;
|
||||
}
|
||||
|
||||
int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, hashes_t *hashes)
|
||||
{
|
||||
// note: if module_hash_binary_parse exists, then module_hash_decode is not called
|
||||
|
||||
FILE *fp = fopen (hashes->hashfile, "rb");
|
||||
|
||||
if (fp == NULL) return (PARSER_HASH_FILE);
|
||||
|
||||
#define TC_HEADER_SIZE 512
|
||||
|
||||
char *in = (char *) hcmalloc (TC_HEADER_SIZE);
|
||||
|
||||
const size_t n = hc_fread (in, 1, TC_HEADER_SIZE, fp);
|
||||
|
||||
fclose (fp);
|
||||
|
||||
if (n != TC_HEADER_SIZE) return (PARSER_TC_FILE_SIZE);
|
||||
|
||||
hash_t *hashes_buf = hashes->hashes_buf;
|
||||
|
||||
hash_t *hash = &hashes_buf[0];
|
||||
|
||||
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, in, TC_HEADER_SIZE);
|
||||
|
||||
if (parser_status != PARSER_OK) return 0;
|
||||
|
||||
hcfree (in);
|
||||
|
||||
// keyfiles
|
||||
|
||||
tc_t *tc = (tc_t *) hash->esalt;
|
||||
|
||||
if (user_options->truecrypt_keyfiles)
|
||||
{
|
||||
char *keyfiles = hcstrdup (user_options->truecrypt_keyfiles);
|
||||
|
||||
char *saveptr = NULL;
|
||||
|
||||
char *keyfile = strtok_r (keyfiles, ",", &saveptr);
|
||||
|
||||
while (keyfile)
|
||||
{
|
||||
if (hc_path_read (keyfile))
|
||||
{
|
||||
cpu_crc32 (keyfile, (u8 *) tc->keyfile_buf);
|
||||
}
|
||||
|
||||
keyfile = strtok_r ((char *) NULL, ",", &saveptr);
|
||||
}
|
||||
|
||||
free (keyfiles);
|
||||
}
|
||||
|
||||
// keyboard layout mapping
|
||||
|
||||
if (user_options->keyboard_layout_mapping)
|
||||
{
|
||||
if (hc_path_read (user_options->keyboard_layout_mapping))
|
||||
{
|
||||
initialize_keyboard_layout_mapping (user_options->keyboard_layout_mapping, tc->keyboard_layout_mapping_buf, &tc->keyboard_layout_mapping_cnt);
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
tc_t *tc = (tc_t *) esalt_buf;
|
||||
|
||||
const float entropy = get_entropy ((const u8 *) line_buf, line_len);
|
||||
|
||||
if (entropy < MIN_SUFFICIENT_ENTROPY_FILE) return (PARSER_INSUFFICIENT_ENTROPY);
|
||||
|
||||
memcpy (tc->salt_buf, line_buf, 64);
|
||||
|
||||
memcpy (tc->data_buf, line_buf + 64, 512 - 64);
|
||||
|
||||
salt->salt_buf[0] = tc->salt_buf[0];
|
||||
|
||||
salt->salt_len = 4;
|
||||
|
||||
salt->salt_iter = ROUNDS_TRUECRYPT_2K - 1;
|
||||
|
||||
tc->signature = 0x45555254; // "TRUE"
|
||||
|
||||
digest[0] = tc->data_buf[0];
|
||||
|
||||
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)
|
||||
{
|
||||
line_buf[0] = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
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_hash_binary_parse;
|
||||
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_hash_init_selftest;
|
||||
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_outfile_check_disable;
|
||||
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
|
||||
module_ctx->module_potfile_disable = module_potfile_disable;
|
||||
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