diff --git a/docs/changes.txt b/docs/changes.txt index 1d8874dc2..4a9b69407 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -70,6 +70,7 @@ - Backend Info: Added local memory size to output - Backend: with kernel build options, switch from -I to -D INCLUDE_PATH, in order to support Apple Metal runtime - CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h +- Command Line: Disallow combinations of some options. for instance, using -t in -a 0 mode - Hardware Monitor: Add support for GPU device utilization readings using iokit on Apple Silicon (OpenCL and Metal) - Hash Info: show more information (Updated Hash-Format. Added Autodetect, Self-Test, Potfile and Plaintext encoding) - HIP Backend: moved functions to ext_hip.c/ext_hiprtc.c and includes to ext_hip.h/ext_hiprtc.h diff --git a/src/user_options.c b/src/user_options.c index 97c035d12..ca3fc8afe 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -1294,6 +1294,16 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) } } + if (user_options->markov_threshold != 0) // is 0 by default + { + if ((user_options->attack_mode == ATTACK_MODE_STRAIGHT) || (user_options->attack_mode == ATTACK_MODE_COMBI) || (user_options->attack_mode == ATTACK_MODE_ASSOCIATION)) + { + event_log_error (hashcat_ctx, "Option --markov-threshold is not allowed in combination with --attack mode %d", user_options->attack_mode); + + return -1; + } + } + if (user_options->restore_file_path != NULL) { if (strlen (user_options->restore_file_path) == 0)