arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-16 17:42:04 +00:00
Code Issues Releases Wiki Activity

Make VeraCrypt PIM configuration mechanism easier to read

Browse Source
This commit is contained in:
Jens Steube 2020-02-08 12:24:47 +01:00
parent d1db16d5d3
commit 4ed18af14c
23 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types.h
View File

@ -646,6 +646,8 @@ typedef enum user_options_defaults
USAGE = false, USAGE = false,
USERNAME = false, USERNAME = false,
VERSION = false, VERSION = false,
VERACRYPT_PIM_START = 485,
VERACRYPT_PIM_STOP = 485,
WORDLIST_AUTOHEX_DISABLE = false, WORDLIST_AUTOHEX_DISABLE = false,
WORKLOAD_PROFILE = 2, WORKLOAD_PROFILE = 2,
@ -1938,6 +1940,8 @@ typedef struct user_options
bool stdin_timeout_abort_chgd; bool stdin_timeout_abort_chgd;
bool usage; bool usage;
bool username; bool username;
bool veracrypt_pim_start_chgd;
bool veracrypt_pim_stop_chgd;
bool version; bool version;
bool wordlist_autohex_disable; bool wordlist_autohex_disable;
#ifdef WITH_BRAIN #ifdef WITH_BRAIN

2
src/modules/module_13711.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13712.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13713.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13721.c
View File

@ -244,7 +244,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13722.c
View File

@ -244,7 +244,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13723.c
View File

@ -244,7 +244,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13731.c
View File

@ -255,7 +255,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13732.c
View File

@ -255,7 +255,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13733.c
View File

@ -255,7 +255,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13741.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13742.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13743.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13751.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13752.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13753.c
View File

@ -246,7 +246,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13761.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13762.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13763.c
View File

@ -247,7 +247,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = user_options->veracrypt_pim_start; vc->pim_start = user_options->veracrypt_pim_start;
vc->pim_stop = user_options->veracrypt_pim_stop; vc->pim_stop = user_options->veracrypt_pim_stop;

2
src/modules/module_13771.c
View File

@ -250,7 +250,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13772.c
View File

@ -250,7 +250,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

2
src/modules/module_13773.c
View File

@ -250,7 +250,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
salt_t *salt = hash->salt; salt_t *salt = hash->salt;
if ((user_options->veracrypt_pim_start) && (user_options->veracrypt_pim_stop)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
vc->pim_start = 15 + user_options->veracrypt_pim_start; vc->pim_start = 15 + user_options->veracrypt_pim_start;
vc->pim_stop = 15 + user_options->veracrypt_pim_stop; vc->pim_stop = 15 + user_options->veracrypt_pim_stop;

14
src/user_options.c
View File

@ -257,8 +257,8 @@ int user_options_init (hashcat_ctx_t *hashcat_ctx)
user_options->usage = USAGE; user_options->usage = USAGE;
user_options->username = USERNAME; user_options->username = USERNAME;
user_options->veracrypt_keyfiles = NULL; user_options->veracrypt_keyfiles = NULL;
user_options->veracrypt_pim_start = 0; user_options->veracrypt_pim_start = VERACRYPT_PIM_START;
user_options->veracrypt_pim_stop = 0; user_options->veracrypt_pim_stop = VERACRYPT_PIM_STOP;
user_options->version = VERSION; user_options->version = VERSION;
user_options->wordlist_autohex_disable = WORDLIST_AUTOHEX_DISABLE; user_options->wordlist_autohex_disable = WORDLIST_AUTOHEX_DISABLE;
user_options->workload_profile = WORKLOAD_PROFILE; user_options->workload_profile = WORKLOAD_PROFILE;
@ -460,8 +460,10 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
case IDX_KEYBOARD_LAYOUT_MAPPING: user_options->keyboard_layout_mapping = optarg; break; case IDX_KEYBOARD_LAYOUT_MAPPING: user_options->keyboard_layout_mapping = optarg; break;
case IDX_TRUECRYPT_KEYFILES: user_options->truecrypt_keyfiles = optarg; break; case IDX_TRUECRYPT_KEYFILES: user_options->truecrypt_keyfiles = optarg; break;
case IDX_VERACRYPT_KEYFILES: user_options->veracrypt_keyfiles = optarg; break; case IDX_VERACRYPT_KEYFILES: user_options->veracrypt_keyfiles = optarg; break;
case IDX_VERACRYPT_PIM_START: user_options->veracrypt_pim_start = hc_strtoul (optarg, NULL, 10); break; case IDX_VERACRYPT_PIM_START: user_options->veracrypt_pim_start = hc_strtoul (optarg, NULL, 10);
case IDX_VERACRYPT_PIM_STOP: user_options->veracrypt_pim_stop = hc_strtoul (optarg, NULL, 10); break; user_options->veracrypt_pim_start_chgd = true; break;
case IDX_VERACRYPT_PIM_STOP: user_options->veracrypt_pim_stop = hc_strtoul (optarg, NULL, 10);
user_options->veracrypt_pim_stop_chgd = true; break;
case IDX_SEGMENT_SIZE: user_options->segment_size = hc_strtoul (optarg, NULL, 10); case IDX_SEGMENT_SIZE: user_options->segment_size = hc_strtoul (optarg, NULL, 10);
user_options->segment_size_chgd = true; break; user_options->segment_size_chgd = true; break;
case IDX_SCRYPT_TMTO: user_options->scrypt_tmto = hc_strtoul (optarg, NULL, 10); break; case IDX_SCRYPT_TMTO: user_options->scrypt_tmto = hc_strtoul (optarg, NULL, 10); break;
@ -720,14 +722,14 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
if ((user_options->veracrypt_pim_start != 0) && (user_options->veracrypt_pim_stop == 0)) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == false))
{ {
event_log_error (hashcat_ctx, "If --veracrypt-pim-start is specified then --veracrypt-pim-stop needs to be specified, too."); event_log_error (hashcat_ctx, "If --veracrypt-pim-start is specified then --veracrypt-pim-stop needs to be specified, too.");
return -1; return -1;
} }
if ((user_options->veracrypt_pim_start == 0) && (user_options->veracrypt_pim_stop != 0)) if ((user_options->veracrypt_pim_start_chgd == false) && (user_options->veracrypt_pim_stop_chgd == true))
{ {
event_log_error (hashcat_ctx, "If --veracrypt-pim-stop is specified then --veracrypt-pim-start needs to be specified, too."); event_log_error (hashcat_ctx, "If --veracrypt-pim-stop is specified then --veracrypt-pim-start needs to be specified, too.");