Deprecated Plugins: Add new module function module_deprecated_notice() to mark a plugin as deprecated and to return a free text user notice

Added option --deprecated-check-disable to enable deprecated plugins
This commit is contained in:
Jens Steube
2021-08-10 17:59:52 +02:00
parent 66873857f0
commit 01738fafa0
398 changed files with 516 additions and 72 deletions
+1
View File
@@ -11,6 +11,7 @@ void *module_benchmark_esalt (MAYBE_UNUSED const hashconfig_t *ha
void *module_benchmark_hook_salt (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 char *module_benchmark_mask (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
salt_t *module_benchmark_salt (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 char *module_deprecated_notice (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
bool module_dictstat_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);
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);
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);
+66 -62
View File
@@ -615,6 +615,7 @@ typedef enum user_options_defaults
BRAIN_SESSION = 0,
#endif
DEBUG_MODE = 0,
DEPRECATED_CHECK_DISABLE = false,
FORCE = false,
HWMON_DISABLE = false,
#if defined (__APPLE__)
@@ -726,89 +727,90 @@ typedef enum user_options_map
IDX_CUSTOM_CHARSET_4 = '4',
IDX_DEBUG_FILE = 0xff11,
IDX_DEBUG_MODE = 0xff12,
IDX_ENCODING_FROM = 0xff13,
IDX_ENCODING_TO = 0xff14,
IDX_HASH_INFO = 0xff15,
IDX_FORCE = 0xff16,
IDX_HWMON_DISABLE = 0xff17,
IDX_HWMON_TEMP_ABORT = 0xff18,
IDX_DEPRECATED_CHECK_DISABLE = 0xff13,
IDX_ENCODING_FROM = 0xff14,
IDX_ENCODING_TO = 0xff15,
IDX_HASH_INFO = 0xff16,
IDX_FORCE = 0xff17,
IDX_HWMON_DISABLE = 0xff18,
IDX_HWMON_TEMP_ABORT = 0xff19,
IDX_HASH_MODE = 'm',
IDX_HCCAPX_MESSAGE_PAIR = 0xff19,
IDX_HCCAPX_MESSAGE_PAIR = 0xff1a,
IDX_HELP = 'h',
IDX_HEX_CHARSET = 0xff1a,
IDX_HEX_SALT = 0xff1b,
IDX_HEX_WORDLIST = 0xff1c,
IDX_HOOK_THREADS = 0xff1d,
IDX_IDENTIFY = 0xff1e,
IDX_HEX_CHARSET = 0xff1b,
IDX_HEX_SALT = 0xff1c,
IDX_HEX_WORDLIST = 0xff1d,
IDX_HOOK_THREADS = 0xff1e,
IDX_IDENTIFY = 0xff1f,
IDX_INCREMENT = 'i',
IDX_INCREMENT_MAX = 0xff1f,
IDX_INCREMENT_MIN = 0xff20,
IDX_INDUCTION_DIR = 0xff21,
IDX_KEEP_GUESSING = 0xff22,
IDX_INCREMENT_MAX = 0xff20,
IDX_INCREMENT_MIN = 0xff21,
IDX_INDUCTION_DIR = 0xff22,
IDX_KEEP_GUESSING = 0xff23,
IDX_KERNEL_ACCEL = 'n',
IDX_KERNEL_LOOPS = 'u',
IDX_KERNEL_THREADS = 'T',
IDX_KEYBOARD_LAYOUT_MAPPING = 0xff23,
IDX_KEYSPACE = 0xff24,
IDX_LEFT = 0xff25,
IDX_KEYBOARD_LAYOUT_MAPPING = 0xff24,
IDX_KEYSPACE = 0xff25,
IDX_LEFT = 0xff26,
IDX_LIMIT = 'l',
IDX_LOGFILE_DISABLE = 0xff26,
IDX_LOOPBACK = 0xff27,
IDX_MACHINE_READABLE = 0xff28,
IDX_MARKOV_CLASSIC = 0xff29,
IDX_MARKOV_DISABLE = 0xff2a,
IDX_MARKOV_HCSTAT2 = 0xff2b,
IDX_MARKOV_INVERSE = 0xff2c,
IDX_LOGFILE_DISABLE = 0xff27,
IDX_LOOPBACK = 0xff28,
IDX_MACHINE_READABLE = 0xff29,
IDX_MARKOV_CLASSIC = 0xff2a,
IDX_MARKOV_DISABLE = 0xff2b,
IDX_MARKOV_HCSTAT2 = 0xff2c,
IDX_MARKOV_INVERSE = 0xff2d,
IDX_MARKOV_THRESHOLD = 't',
IDX_NONCE_ERROR_CORRECTIONS = 0xff2d,
IDX_NONCE_ERROR_CORRECTIONS = 0xff2e,
IDX_OPENCL_DEVICE_TYPES = 'D',
IDX_OPTIMIZED_KERNEL_ENABLE = 'O',
IDX_MULTIPLY_ACCEL_DISABLE = 'M',
IDX_OUTFILE_AUTOHEX_DISABLE = 0xff2e,
IDX_OUTFILE_CHECK_DIR = 0xff2f,
IDX_OUTFILE_CHECK_TIMER = 0xff30,
IDX_OUTFILE_FORMAT = 0xff31,
IDX_OUTFILE_AUTOHEX_DISABLE = 0xff2f,
IDX_OUTFILE_CHECK_DIR = 0xff30,
IDX_OUTFILE_CHECK_TIMER = 0xff31,
IDX_OUTFILE_FORMAT = 0xff32,
IDX_OUTFILE = 'o',
IDX_POTFILE_DISABLE = 0xff32,
IDX_POTFILE_PATH = 0xff33,
IDX_PROGRESS_ONLY = 0xff34,
IDX_QUIET = 0xff35,
IDX_REMOVE = 0xff36,
IDX_REMOVE_TIMER = 0xff37,
IDX_RESTORE = 0xff38,
IDX_RESTORE_DISABLE = 0xff39,
IDX_RESTORE_FILE_PATH = 0xff3a,
IDX_POTFILE_DISABLE = 0xff33,
IDX_POTFILE_PATH = 0xff34,
IDX_PROGRESS_ONLY = 0xff35,
IDX_QUIET = 0xff36,
IDX_REMOVE = 0xff37,
IDX_REMOVE_TIMER = 0xff38,
IDX_RESTORE = 0xff39,
IDX_RESTORE_DISABLE = 0xff3a,
IDX_RESTORE_FILE_PATH = 0xff3b,
IDX_RP_FILE = 'r',
IDX_RP_GEN_FUNC_MAX = 0xff3b,
IDX_RP_GEN_FUNC_MIN = 0xff3c,
IDX_RP_GEN_FUNC_MAX = 0xff3c,
IDX_RP_GEN_FUNC_MIN = 0xff3d,
IDX_RP_GEN = 'g',
IDX_RP_GEN_SEED = 0xff3d,
IDX_RP_GEN_SEED = 0xff3e,
IDX_RULE_BUF_L = 'j',
IDX_RULE_BUF_R = 'k',
IDX_RUNTIME = 0xff3e,
IDX_SCRYPT_TMTO = 0xff3f,
IDX_RUNTIME = 0xff3f,
IDX_SCRYPT_TMTO = 0xff40,
IDX_SEGMENT_SIZE = 'c',
IDX_SELF_TEST_DISABLE = 0xff40,
IDX_SELF_TEST_DISABLE = 0xff41,
IDX_SEPARATOR = 'p',
IDX_SESSION = 0xff41,
IDX_SHOW = 0xff42,
IDX_SESSION = 0xff42,
IDX_SHOW = 0xff43,
IDX_SKIP = 's',
IDX_SLOW_CANDIDATES = 'S',
IDX_SPEED_ONLY = 0xff43,
IDX_SPIN_DAMP = 0xff44,
IDX_STATUS = 0xff45,
IDX_STATUS_JSON = 0xff46,
IDX_STATUS_TIMER = 0xff47,
IDX_STDOUT_FLAG = 0xff48,
IDX_STDIN_TIMEOUT_ABORT = 0xff49,
IDX_TRUECRYPT_KEYFILES = 0xff4a,
IDX_USERNAME = 0xff4b,
IDX_VERACRYPT_KEYFILES = 0xff4c,
IDX_VERACRYPT_PIM_START = 0xff4d,
IDX_VERACRYPT_PIM_STOP = 0xff4e,
IDX_SPEED_ONLY = 0xff44,
IDX_SPIN_DAMP = 0xff45,
IDX_STATUS = 0xff46,
IDX_STATUS_JSON = 0xff47,
IDX_STATUS_TIMER = 0xff48,
IDX_STDOUT_FLAG = 0xff49,
IDX_STDIN_TIMEOUT_ABORT = 0xff4a,
IDX_TRUECRYPT_KEYFILES = 0xff4b,
IDX_USERNAME = 0xff4c,
IDX_VERACRYPT_KEYFILES = 0xff4d,
IDX_VERACRYPT_PIM_START = 0xff4e,
IDX_VERACRYPT_PIM_STOP = 0xff4f,
IDX_VERSION_LOWER = 'v',
IDX_VERSION = 'V',
IDX_WORDLIST_AUTOHEX_DISABLE = 0xff4f,
IDX_WORDLIST_AUTOHEX_DISABLE = 0xff50,
IDX_WORKLOAD_PROFILE = 'w',
} user_options_map_t;
@@ -2118,6 +2120,7 @@ typedef struct user_options
bool brain_server;
#endif
bool force;
bool deprecated_check_disable;
bool hwmon_disable;
bool hash_info;
bool hex_charset;
@@ -2648,12 +2651,13 @@ typedef struct module_ctx
void *(*module_benchmark_hook_salt) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
const char *(*module_benchmark_mask) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
salt_t *(*module_benchmark_salt) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
bool (*module_dictstat_disable) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
const char *(*module_deprecated_notice) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_dgst_pos0) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_dgst_pos1) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_dgst_pos2) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_dgst_pos3) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_dgst_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
bool (*module_dictstat_disable) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u64 (*module_esalt_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
const char *(*module_extra_tuningdb_block) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_forced_outfile_format) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);