|
|
|
@ -74,6 +74,7 @@ typedef enum loglevel
|
|
|
|
|
LOGLEVEL_INFO = 0,
|
|
|
|
|
LOGLEVEL_WARNING = 1,
|
|
|
|
|
LOGLEVEL_ERROR = 2,
|
|
|
|
|
LOGLEVEL_ADVICE = 3,
|
|
|
|
|
|
|
|
|
|
} loglevel_t;
|
|
|
|
|
|
|
|
|
@ -103,6 +104,7 @@ typedef enum event_identifier
|
|
|
|
|
EVENT_LOG_ERROR = 0x00000070,
|
|
|
|
|
EVENT_LOG_INFO = 0x00000071,
|
|
|
|
|
EVENT_LOG_WARNING = 0x00000072,
|
|
|
|
|
EVENT_LOG_ADVICE = 0x00000073,
|
|
|
|
|
EVENT_MONITOR_RUNTIME_LIMIT = 0x00000080,
|
|
|
|
|
EVENT_MONITOR_STATUS_REFRESH = 0x00000081,
|
|
|
|
|
EVENT_MONITOR_TEMP_ABORT = 0x00000082,
|
|
|
|
@ -490,6 +492,7 @@ typedef enum progress_mode
|
|
|
|
|
|
|
|
|
|
typedef enum user_options_defaults
|
|
|
|
|
{
|
|
|
|
|
ADVICE_DISABLE = false,
|
|
|
|
|
ATTACK_MODE = ATTACK_MODE_STRAIGHT,
|
|
|
|
|
BENCHMARK = false,
|
|
|
|
|
BITMAP_MAX = 24,
|
|
|
|
@ -558,91 +561,92 @@ typedef enum user_options_defaults
|
|
|
|
|
|
|
|
|
|
typedef enum user_options_map
|
|
|
|
|
{
|
|
|
|
|
IDX_ADVICE_DISABLE = 0xff00,
|
|
|
|
|
IDX_ATTACK_MODE = 'a',
|
|
|
|
|
IDX_BENCHMARK = 'b',
|
|
|
|
|
IDX_BITMAP_MAX = 0xff00,
|
|
|
|
|
IDX_BITMAP_MIN = 0xff01,
|
|
|
|
|
IDX_CPU_AFFINITY = 0xff02,
|
|
|
|
|
IDX_BITMAP_MAX = 0xff01,
|
|
|
|
|
IDX_BITMAP_MIN = 0xff02,
|
|
|
|
|
IDX_CPU_AFFINITY = 0xff03,
|
|
|
|
|
IDX_CUSTOM_CHARSET_1 = '1',
|
|
|
|
|
IDX_CUSTOM_CHARSET_2 = '2',
|
|
|
|
|
IDX_CUSTOM_CHARSET_3 = '3',
|
|
|
|
|
IDX_CUSTOM_CHARSET_4 = '4',
|
|
|
|
|
IDX_DEBUG_FILE = 0xff03,
|
|
|
|
|
IDX_DEBUG_MODE = 0xff04,
|
|
|
|
|
IDX_FORCE = 0xff05,
|
|
|
|
|
IDX_GPU_TEMP_ABORT = 0xff06,
|
|
|
|
|
IDX_GPU_TEMP_DISABLE = 0xff07,
|
|
|
|
|
IDX_GPU_TEMP_RETAIN = 0xff08,
|
|
|
|
|
IDX_DEBUG_FILE = 0xff04,
|
|
|
|
|
IDX_DEBUG_MODE = 0xff05,
|
|
|
|
|
IDX_FORCE = 0xff06,
|
|
|
|
|
IDX_GPU_TEMP_ABORT = 0xff07,
|
|
|
|
|
IDX_GPU_TEMP_DISABLE = 0xff08,
|
|
|
|
|
IDX_GPU_TEMP_RETAIN = 0xff09,
|
|
|
|
|
IDX_HASH_MODE = 'm',
|
|
|
|
|
IDX_HCCAPX_MESSAGE_PAIR = 0xff09,
|
|
|
|
|
IDX_HCCAPX_MESSAGE_PAIR = 0xff0a,
|
|
|
|
|
IDX_HELP = 'h',
|
|
|
|
|
IDX_HEX_CHARSET = 0xff0a,
|
|
|
|
|
IDX_HEX_SALT = 0xff0b,
|
|
|
|
|
IDX_HEX_WORDLIST = 0xff0c,
|
|
|
|
|
IDX_HEX_CHARSET = 0xff0b,
|
|
|
|
|
IDX_HEX_SALT = 0xff0c,
|
|
|
|
|
IDX_HEX_WORDLIST = 0xff0d,
|
|
|
|
|
IDX_INCREMENT = 'i',
|
|
|
|
|
IDX_INCREMENT_MAX = 0xff0d,
|
|
|
|
|
IDX_INCREMENT_MIN = 0xff0e,
|
|
|
|
|
IDX_INDUCTION_DIR = 0xff0f,
|
|
|
|
|
IDX_KEEP_GUESSING = 0xff10,
|
|
|
|
|
IDX_INCREMENT_MAX = 0xff0e,
|
|
|
|
|
IDX_INCREMENT_MIN = 0xff0f,
|
|
|
|
|
IDX_INDUCTION_DIR = 0xff10,
|
|
|
|
|
IDX_KEEP_GUESSING = 0xff11,
|
|
|
|
|
IDX_KERNEL_ACCEL = 'n',
|
|
|
|
|
IDX_KERNEL_LOOPS = 'u',
|
|
|
|
|
IDX_KEYSPACE = 0xff11,
|
|
|
|
|
IDX_LEFT = 0xff12,
|
|
|
|
|
IDX_KEYSPACE = 0xff12,
|
|
|
|
|
IDX_LEFT = 0xff13,
|
|
|
|
|
IDX_LIMIT = 'l',
|
|
|
|
|
IDX_LOGFILE_DISABLE = 0xff13,
|
|
|
|
|
IDX_LOOPBACK = 0xff14,
|
|
|
|
|
IDX_MACHINE_READABLE = 0xff15,
|
|
|
|
|
IDX_MARKOV_CLASSIC = 0xff16,
|
|
|
|
|
IDX_MARKOV_DISABLE = 0xff17,
|
|
|
|
|
IDX_MARKOV_HCSTAT = 0xff18,
|
|
|
|
|
IDX_LOGFILE_DISABLE = 0xff14,
|
|
|
|
|
IDX_LOOPBACK = 0xff15,
|
|
|
|
|
IDX_MACHINE_READABLE = 0xff16,
|
|
|
|
|
IDX_MARKOV_CLASSIC = 0xff17,
|
|
|
|
|
IDX_MARKOV_DISABLE = 0xff18,
|
|
|
|
|
IDX_MARKOV_HCSTAT = 0xff19,
|
|
|
|
|
IDX_MARKOV_THRESHOLD = 't',
|
|
|
|
|
IDX_NONCE_ERROR_CORRECTIONS = 0xff19,
|
|
|
|
|
IDX_NVIDIA_SPIN_DAMP = 0xff1a,
|
|
|
|
|
IDX_NONCE_ERROR_CORRECTIONS = 0xff1a,
|
|
|
|
|
IDX_NVIDIA_SPIN_DAMP = 0xff1b,
|
|
|
|
|
IDX_OPENCL_DEVICES = 'd',
|
|
|
|
|
IDX_OPENCL_DEVICE_TYPES = 'D',
|
|
|
|
|
IDX_OPENCL_INFO = 'I',
|
|
|
|
|
IDX_OPENCL_PLATFORMS = 0xff1b,
|
|
|
|
|
IDX_OPENCL_VECTOR_WIDTH = 0xff1c,
|
|
|
|
|
IDX_OUTFILE_AUTOHEX_DISABLE = 0xff1d,
|
|
|
|
|
IDX_OUTFILE_CHECK_DIR = 0xff1e,
|
|
|
|
|
IDX_OUTFILE_CHECK_TIMER = 0xff1f,
|
|
|
|
|
IDX_OUTFILE_FORMAT = 0xff20,
|
|
|
|
|
IDX_OPENCL_PLATFORMS = 0xff1c,
|
|
|
|
|
IDX_OPENCL_VECTOR_WIDTH = 0xff1d,
|
|
|
|
|
IDX_OUTFILE_AUTOHEX_DISABLE = 0xff1e,
|
|
|
|
|
IDX_OUTFILE_CHECK_DIR = 0xff1f,
|
|
|
|
|
IDX_OUTFILE_CHECK_TIMER = 0xff20,
|
|
|
|
|
IDX_OUTFILE_FORMAT = 0xff21,
|
|
|
|
|
IDX_OUTFILE = 'o',
|
|
|
|
|
IDX_POTFILE_DISABLE = 0xff21,
|
|
|
|
|
IDX_POTFILE_PATH = 0xff22,
|
|
|
|
|
IDX_POWERTUNE_ENABLE = 0xff23,
|
|
|
|
|
IDX_QUIET = 0xff24,
|
|
|
|
|
IDX_REMOVE = 0xff25,
|
|
|
|
|
IDX_REMOVE_TIMER = 0xff26,
|
|
|
|
|
IDX_RESTORE = 0xff27,
|
|
|
|
|
IDX_RESTORE_DISABLE = 0xff28,
|
|
|
|
|
IDX_RESTORE_FILE_PATH = 0xff29,
|
|
|
|
|
IDX_POTFILE_DISABLE = 0xff22,
|
|
|
|
|
IDX_POTFILE_PATH = 0xff23,
|
|
|
|
|
IDX_POWERTUNE_ENABLE = 0xff24,
|
|
|
|
|
IDX_QUIET = 0xff25,
|
|
|
|
|
IDX_REMOVE = 0xff26,
|
|
|
|
|
IDX_REMOVE_TIMER = 0xff27,
|
|
|
|
|
IDX_RESTORE = 0xff28,
|
|
|
|
|
IDX_RESTORE_DISABLE = 0xff29,
|
|
|
|
|
IDX_RESTORE_FILE_PATH = 0xff2a,
|
|
|
|
|
IDX_RP_FILE = 'r',
|
|
|
|
|
IDX_RP_GEN_FUNC_MAX = 0xff2a,
|
|
|
|
|
IDX_RP_GEN_FUNC_MIN = 0xff2b,
|
|
|
|
|
IDX_RP_GEN_FUNC_MAX = 0xff2b,
|
|
|
|
|
IDX_RP_GEN_FUNC_MIN = 0xff2c,
|
|
|
|
|
IDX_RP_GEN = 'g',
|
|
|
|
|
IDX_RP_GEN_SEED = 0xff2c,
|
|
|
|
|
IDX_RP_GEN_SEED = 0xff2d,
|
|
|
|
|
IDX_RULE_BUF_L = 'j',
|
|
|
|
|
IDX_RULE_BUF_R = 'k',
|
|
|
|
|
IDX_RUNTIME = 0xff2d,
|
|
|
|
|
IDX_SCRYPT_TMTO = 0xff2e,
|
|
|
|
|
IDX_RUNTIME = 0xff2e,
|
|
|
|
|
IDX_SCRYPT_TMTO = 0xff2f,
|
|
|
|
|
IDX_SEGMENT_SIZE = 'c',
|
|
|
|
|
IDX_SEPARATOR = 'p',
|
|
|
|
|
IDX_SESSION = 0xff2f,
|
|
|
|
|
IDX_SHOW = 0xff30,
|
|
|
|
|
IDX_SESSION = 0xff30,
|
|
|
|
|
IDX_SHOW = 0xff31,
|
|
|
|
|
IDX_SKIP = 's',
|
|
|
|
|
IDX_STATUS = 0xff31,
|
|
|
|
|
IDX_STATUS_TIMER = 0xff32,
|
|
|
|
|
IDX_STDOUT_FLAG = 0xff33,
|
|
|
|
|
IDX_SPEED_ONLY = 0xff34,
|
|
|
|
|
IDX_PROGRESS_ONLY = 0xff35,
|
|
|
|
|
IDX_TRUECRYPT_KEYFILES = 0xff36,
|
|
|
|
|
IDX_USERNAME = 0xff37,
|
|
|
|
|
IDX_VERACRYPT_KEYFILES = 0xff38,
|
|
|
|
|
IDX_VERACRYPT_PIM = 0xff39,
|
|
|
|
|
IDX_STATUS = 0xff32,
|
|
|
|
|
IDX_STATUS_TIMER = 0xff33,
|
|
|
|
|
IDX_STDOUT_FLAG = 0xff34,
|
|
|
|
|
IDX_SPEED_ONLY = 0xff35,
|
|
|
|
|
IDX_PROGRESS_ONLY = 0xff36,
|
|
|
|
|
IDX_TRUECRYPT_KEYFILES = 0xff37,
|
|
|
|
|
IDX_USERNAME = 0xff38,
|
|
|
|
|
IDX_VERACRYPT_KEYFILES = 0xff39,
|
|
|
|
|
IDX_VERACRYPT_PIM = 0xff3a,
|
|
|
|
|
IDX_VERSION_LOWER = 'v',
|
|
|
|
|
IDX_VERSION = 'V',
|
|
|
|
|
IDX_WEAK_HASH_THRESHOLD = 0xff3a,
|
|
|
|
|
IDX_WEAK_HASH_THRESHOLD = 0xff3b,
|
|
|
|
|
IDX_WORKLOAD_PROFILE = 'w'
|
|
|
|
|
|
|
|
|
|
} user_options_map_t;
|
|
|
|
@ -1411,6 +1415,7 @@ typedef struct user_options
|
|
|
|
|
bool segment_size_chgd;
|
|
|
|
|
bool hccapx_message_pair_chgd;
|
|
|
|
|
|
|
|
|
|
bool advice_disable;
|
|
|
|
|
bool benchmark;
|
|
|
|
|
bool force;
|
|
|
|
|
bool gpu_temp_disable;
|
|
|
|
|