mirror of
https://github.com/hashcat/hashcat
synced 2024-12-23 14:13:43 +01:00
fix string
This commit is contained in:
parent
fee364ec7a
commit
21efc80975
@ -9,7 +9,7 @@
|
||||
int hashcat_init (hashcat_ctx_t *hashcat_ctx, void (*event) (const u32, struct hashcat_ctx *, const void *, const size_t));
|
||||
void hashcat_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
|
||||
int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, char *install_folder, char *shared_folder, int argc, char **argv, const int comptime);
|
||||
int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, const char *install_folder, const char *shared_folder, int argc, char **argv, const int comptime);
|
||||
int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx);
|
||||
int hashcat_session_pause (hashcat_ctx_t *hashcat_ctx);
|
||||
int hashcat_session_resume (hashcat_ctx_t *hashcat_ctx);
|
||||
|
@ -1777,12 +1777,12 @@ void to_hccapx_t (hashcat_ctx_t *hashcat_ctx, hccapx_t *hccapx, const u32 salt_p
|
||||
|
||||
int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_len, const u32 salt_pos, const u32 digest_pos);
|
||||
|
||||
int hashconfig_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void hashconfig_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
u32 hashconfig_get_kernel_threads (hashcat_ctx_t *hashcat_ctx, const hc_device_param_t *device_param);
|
||||
u32 hashconfig_get_kernel_loops (hashcat_ctx_t *hashcat_ctx);
|
||||
int hashconfig_general_defaults (hashcat_ctx_t *hashcat_ctx);
|
||||
void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, void *esalt, void *hook_salt);
|
||||
char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx);
|
||||
int hashconfig_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void hashconfig_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
u32 hashconfig_get_kernel_threads (hashcat_ctx_t *hashcat_ctx, const hc_device_param_t *device_param);
|
||||
u32 hashconfig_get_kernel_loops (hashcat_ctx_t *hashcat_ctx);
|
||||
int hashconfig_general_defaults (hashcat_ctx_t *hashcat_ctx);
|
||||
void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, void *esalt, void *hook_salt);
|
||||
const char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx);
|
||||
|
||||
#endif // _INTERFACE_H
|
||||
|
144
include/status.h
144
include/status.h
@ -16,79 +16,79 @@ double get_avg_exec_time (hc_device_param_t *device_param, const int last_num_en
|
||||
void format_timer_display (struct tm *tm, char *buf, size_t len);
|
||||
void format_speed_display (double val, char *buf, size_t len);
|
||||
|
||||
int status_get_device_info_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_device_info_active (const hashcat_ctx_t *hashcat_ctx);
|
||||
bool status_get_skipped_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_session (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_status_string (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_status_number (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mode (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_base (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_base_offset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_base_count (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_guess_base_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_mod (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mod_offset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mod_count (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_guess_mod_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_charset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_hash_type (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_digests_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_digests_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_digests_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_salts_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_salts_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_salts_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_running (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_paused (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_real (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_started_absolute (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_started_relative (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_estimated_relative (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_restore_point (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_restore_total (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_restore_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_progress_mode (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_progress_finished_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_rejected (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_progress_rejected_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_restored (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_cur (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_end (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_ignore (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_cur_relative_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_end_relative_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_hashes_msec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_hashes_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_hashes_msec_dev_benchmark (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_exec_msec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_exec_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_speed_sec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_speed_sec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_cpt_cur_min (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_cur_hour (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_cur_day (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_min (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_hour (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_day (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_cpt (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_hwmon_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_corespeed_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_memoryspeed_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_progress_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_runtime_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_device_info_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_device_info_active (const hashcat_ctx_t *hashcat_ctx);
|
||||
bool status_get_skipped_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_session (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_status_string (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_status_number (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mode (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_base (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_base_offset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_base_count (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_guess_base_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_mod (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mod_offset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mod_count (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_guess_mod_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_charset (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_hash_type (const hashcat_ctx_t *hashcat_ctx);
|
||||
const char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_digests_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_digests_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_digests_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_salts_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_salts_cnt (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_salts_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_running (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_paused (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_msec_real (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_started_absolute (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_started_relative (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_time_estimated_relative (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_restore_point (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_restore_total (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_restore_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_progress_mode (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_progress_finished_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_done (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_rejected (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_progress_rejected_percent (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_restored (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_cur (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_end (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_ignore (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_cur_relative_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
u64 status_get_progress_end_relative_skip (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_hashes_msec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_hashes_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_hashes_msec_dev_benchmark (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_exec_msec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
double status_get_exec_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
char *status_get_speed_sec_all (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_speed_sec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_cpt_cur_min (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_cur_hour (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_cur_day (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_min (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_hour (const hashcat_ctx_t *hashcat_ctx);
|
||||
int status_get_cpt_avg_day (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_cpt (const hashcat_ctx_t *hashcat_ctx);
|
||||
char *status_get_hwmon_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_corespeed_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_memoryspeed_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
int status_get_progress_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
double status_get_runtime_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id);
|
||||
|
||||
int status_progress_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_progress_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_progress_reset (hashcat_ctx_t *hashcat_ctx);
|
||||
int status_progress_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_progress_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_progress_reset (hashcat_ctx_t *hashcat_ctx);
|
||||
|
||||
int status_ctx_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_ctx_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
int status_ctx_init (hashcat_ctx_t *hashcat_ctx);
|
||||
void status_ctx_destroy (hashcat_ctx_t *hashcat_ctx);
|
||||
|
||||
#endif // _STATUS_H
|
||||
|
370
include/types.h
370
include/types.h
@ -745,37 +745,37 @@ typedef struct logfile_ctx
|
||||
|
||||
typedef struct hashes
|
||||
{
|
||||
char *hashfile;
|
||||
const char *hashfile;
|
||||
|
||||
u32 hashlist_mode;
|
||||
u32 hashlist_format;
|
||||
u32 hashlist_mode;
|
||||
u32 hashlist_format;
|
||||
|
||||
u32 digests_cnt;
|
||||
u32 digests_done;
|
||||
u32 digests_saved;
|
||||
u32 digests_cnt;
|
||||
u32 digests_done;
|
||||
u32 digests_saved;
|
||||
|
||||
void *digests_buf;
|
||||
u32 *digests_shown;
|
||||
u32 *digests_shown_tmp;
|
||||
void *digests_buf;
|
||||
u32 *digests_shown;
|
||||
u32 *digests_shown_tmp;
|
||||
|
||||
u32 salts_cnt;
|
||||
u32 salts_done;
|
||||
u32 salts_cnt;
|
||||
u32 salts_done;
|
||||
|
||||
salt_t *salts_buf;
|
||||
u32 *salts_shown;
|
||||
salt_t *salts_buf;
|
||||
u32 *salts_shown;
|
||||
|
||||
void *esalts_buf;
|
||||
void *esalts_buf;
|
||||
|
||||
void *hook_salts_buf;
|
||||
void *hook_salts_buf;
|
||||
|
||||
u32 hashes_cnt_orig;
|
||||
u32 hashes_cnt;
|
||||
hash_t *hashes_buf;
|
||||
u32 hashes_cnt_orig;
|
||||
u32 hashes_cnt;
|
||||
hash_t *hashes_buf;
|
||||
|
||||
hashinfo_t **hash_info;
|
||||
hashinfo_t **hash_info;
|
||||
|
||||
u8 *out_buf; // allocates [HCBUFSIZ_LARGE];
|
||||
u8 *tmp_buf; // allocates [HCBUFSIZ_LARGE];
|
||||
u8 *out_buf; // allocates [HCBUFSIZ_LARGE];
|
||||
u8 *tmp_buf; // allocates [HCBUFSIZ_LARGE];
|
||||
|
||||
} hashes_t;
|
||||
|
||||
@ -1356,13 +1356,13 @@ typedef struct tuning_db_alias
|
||||
|
||||
typedef struct tuning_db_entry
|
||||
{
|
||||
char *device_name;
|
||||
int attack_mode;
|
||||
int hash_type;
|
||||
int workload_profile;
|
||||
int vector_width;
|
||||
int kernel_accel;
|
||||
int kernel_loops;
|
||||
const char *device_name;
|
||||
int attack_mode;
|
||||
int hash_type;
|
||||
int workload_profile;
|
||||
int vector_width;
|
||||
int kernel_accel;
|
||||
int kernel_loops;
|
||||
|
||||
} tuning_db_entry_t;
|
||||
|
||||
@ -1394,115 +1394,115 @@ typedef struct wl_data
|
||||
|
||||
typedef struct user_options
|
||||
{
|
||||
char *hc_bin;
|
||||
const char *hc_bin;
|
||||
|
||||
int hc_argc;
|
||||
char **hc_argv;
|
||||
int hc_argc;
|
||||
char **hc_argv;
|
||||
|
||||
bool attack_mode_chgd;
|
||||
bool hash_mode_chgd;
|
||||
bool increment_max_chgd;
|
||||
bool increment_min_chgd;
|
||||
bool kernel_accel_chgd;
|
||||
bool kernel_loops_chgd;
|
||||
bool nvidia_spin_damp_chgd;
|
||||
bool opencl_vector_width_chgd;
|
||||
bool outfile_format_chgd;
|
||||
bool remove_timer_chgd;
|
||||
bool rp_gen_seed_chgd;
|
||||
bool runtime_chgd;
|
||||
bool workload_profile_chgd;
|
||||
bool segment_size_chgd;
|
||||
bool hccapx_message_pair_chgd;
|
||||
bool attack_mode_chgd;
|
||||
bool hash_mode_chgd;
|
||||
bool increment_max_chgd;
|
||||
bool increment_min_chgd;
|
||||
bool kernel_accel_chgd;
|
||||
bool kernel_loops_chgd;
|
||||
bool nvidia_spin_damp_chgd;
|
||||
bool opencl_vector_width_chgd;
|
||||
bool outfile_format_chgd;
|
||||
bool remove_timer_chgd;
|
||||
bool rp_gen_seed_chgd;
|
||||
bool runtime_chgd;
|
||||
bool workload_profile_chgd;
|
||||
bool segment_size_chgd;
|
||||
bool hccapx_message_pair_chgd;
|
||||
|
||||
bool advice_disable;
|
||||
bool benchmark;
|
||||
bool force;
|
||||
bool gpu_temp_disable;
|
||||
bool hex_charset;
|
||||
bool hex_salt;
|
||||
bool hex_wordlist;
|
||||
bool increment;
|
||||
bool keep_guessing;
|
||||
bool keyspace;
|
||||
bool left;
|
||||
bool logfile_disable;
|
||||
bool loopback;
|
||||
bool machine_readable;
|
||||
bool markov_classic;
|
||||
bool markov_disable;
|
||||
bool opencl_info;
|
||||
bool outfile_autohex;
|
||||
bool potfile_disable;
|
||||
bool powertune_enable;
|
||||
bool quiet;
|
||||
bool remove;
|
||||
bool restore;
|
||||
bool restore_disable;
|
||||
bool show;
|
||||
bool status;
|
||||
bool stdout_flag;
|
||||
bool speed_only;
|
||||
bool progress_only;
|
||||
bool usage;
|
||||
bool username;
|
||||
bool version;
|
||||
char *cpu_affinity;
|
||||
char *custom_charset_1;
|
||||
char *custom_charset_2;
|
||||
char *custom_charset_3;
|
||||
char *custom_charset_4;
|
||||
char *debug_file;
|
||||
char *induction_dir;
|
||||
char *markov_hcstat;
|
||||
char *opencl_devices;
|
||||
char *opencl_device_types;
|
||||
char *opencl_platforms;
|
||||
char *outfile;
|
||||
char *outfile_check_dir;
|
||||
char *potfile_path;
|
||||
char *restore_file_path;
|
||||
char **rp_files;
|
||||
char *rule_buf_l;
|
||||
char *rule_buf_r;
|
||||
char separator;
|
||||
char *session;
|
||||
char *truecrypt_keyfiles;
|
||||
char *veracrypt_keyfiles;
|
||||
u32 attack_mode;
|
||||
u32 bitmap_max;
|
||||
u32 bitmap_min;
|
||||
u32 debug_mode;
|
||||
u32 gpu_temp_abort;
|
||||
u32 gpu_temp_retain;
|
||||
u32 hash_mode;
|
||||
u32 hccapx_message_pair;
|
||||
u32 increment_max;
|
||||
u32 increment_min;
|
||||
u32 kernel_accel;
|
||||
u32 kernel_loops;
|
||||
u32 markov_threshold;
|
||||
u32 nonce_error_corrections;
|
||||
u32 nvidia_spin_damp;
|
||||
u32 opencl_vector_width;
|
||||
u32 outfile_check_timer;
|
||||
u32 outfile_format;
|
||||
u32 remove_timer;
|
||||
u32 restore_timer;
|
||||
u32 rp_files_cnt;
|
||||
u32 rp_gen;
|
||||
u32 rp_gen_func_max;
|
||||
u32 rp_gen_func_min;
|
||||
u32 rp_gen_seed;
|
||||
u32 runtime;
|
||||
u32 scrypt_tmto;
|
||||
u32 segment_size;
|
||||
u32 status_timer;
|
||||
u32 veracrypt_pim;
|
||||
u32 weak_hash_threshold;
|
||||
u32 workload_profile;
|
||||
u64 limit;
|
||||
u64 skip;
|
||||
bool advice_disable;
|
||||
bool benchmark;
|
||||
bool force;
|
||||
bool gpu_temp_disable;
|
||||
bool hex_charset;
|
||||
bool hex_salt;
|
||||
bool hex_wordlist;
|
||||
bool increment;
|
||||
bool keep_guessing;
|
||||
bool keyspace;
|
||||
bool left;
|
||||
bool logfile_disable;
|
||||
bool loopback;
|
||||
bool machine_readable;
|
||||
bool markov_classic;
|
||||
bool markov_disable;
|
||||
bool opencl_info;
|
||||
bool outfile_autohex;
|
||||
bool potfile_disable;
|
||||
bool powertune_enable;
|
||||
bool quiet;
|
||||
bool remove;
|
||||
bool restore;
|
||||
bool restore_disable;
|
||||
bool show;
|
||||
bool status;
|
||||
bool stdout_flag;
|
||||
bool speed_only;
|
||||
bool progress_only;
|
||||
bool usage;
|
||||
bool username;
|
||||
bool version;
|
||||
char *cpu_affinity;
|
||||
char *custom_charset_1;
|
||||
char *custom_charset_2;
|
||||
char *custom_charset_3;
|
||||
char *custom_charset_4;
|
||||
char *debug_file;
|
||||
char *induction_dir;
|
||||
char *markov_hcstat;
|
||||
char *opencl_devices;
|
||||
char *opencl_device_types;
|
||||
char *opencl_platforms;
|
||||
char *outfile;
|
||||
char *outfile_check_dir;
|
||||
char *potfile_path;
|
||||
char *restore_file_path;
|
||||
char **rp_files;
|
||||
char *rule_buf_l;
|
||||
char *rule_buf_r;
|
||||
char separator;
|
||||
const char *session;
|
||||
char *truecrypt_keyfiles;
|
||||
char *veracrypt_keyfiles;
|
||||
u32 attack_mode;
|
||||
u32 bitmap_max;
|
||||
u32 bitmap_min;
|
||||
u32 debug_mode;
|
||||
u32 gpu_temp_abort;
|
||||
u32 gpu_temp_retain;
|
||||
u32 hash_mode;
|
||||
u32 hccapx_message_pair;
|
||||
u32 increment_max;
|
||||
u32 increment_min;
|
||||
u32 kernel_accel;
|
||||
u32 kernel_loops;
|
||||
u32 markov_threshold;
|
||||
u32 nonce_error_corrections;
|
||||
u32 nvidia_spin_damp;
|
||||
u32 opencl_vector_width;
|
||||
u32 outfile_check_timer;
|
||||
u32 outfile_format;
|
||||
u32 remove_timer;
|
||||
u32 restore_timer;
|
||||
u32 rp_files_cnt;
|
||||
u32 rp_gen;
|
||||
u32 rp_gen_func_max;
|
||||
u32 rp_gen_func_min;
|
||||
u32 rp_gen_seed;
|
||||
u32 runtime;
|
||||
u32 scrypt_tmto;
|
||||
u32 segment_size;
|
||||
u32 status_timer;
|
||||
u32 veracrypt_pim;
|
||||
u32 weak_hash_threshold;
|
||||
u32 workload_profile;
|
||||
u64 limit;
|
||||
u64 skip;
|
||||
|
||||
} user_options_t;
|
||||
|
||||
@ -1665,57 +1665,57 @@ typedef struct
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char *hash_target;
|
||||
char *hash_type;
|
||||
int guess_mode;
|
||||
char *guess_base;
|
||||
int guess_base_offset;
|
||||
int guess_base_count;
|
||||
double guess_base_percent;
|
||||
char *guess_mod;
|
||||
int guess_mod_offset;
|
||||
int guess_mod_count;
|
||||
double guess_mod_percent;
|
||||
char *guess_charset;
|
||||
int guess_mask_length;
|
||||
char *session;
|
||||
char *status_string;
|
||||
int status_number;
|
||||
char *time_estimated_absolute;
|
||||
char *time_estimated_relative;
|
||||
char *time_started_absolute;
|
||||
char *time_started_relative;
|
||||
double msec_paused;
|
||||
double msec_running;
|
||||
double msec_real;
|
||||
int digests_cnt;
|
||||
int digests_done;
|
||||
double digests_percent;
|
||||
int salts_cnt;
|
||||
int salts_done;
|
||||
double salts_percent;
|
||||
int progress_mode;
|
||||
double progress_finished_percent;
|
||||
u64 progress_cur;
|
||||
u64 progress_cur_relative_skip;
|
||||
u64 progress_done;
|
||||
u64 progress_end;
|
||||
u64 progress_end_relative_skip;
|
||||
u64 progress_ignore;
|
||||
u64 progress_rejected;
|
||||
double progress_rejected_percent;
|
||||
u64 progress_restored;
|
||||
u64 progress_skip;
|
||||
u64 restore_point;
|
||||
u64 restore_total;
|
||||
double restore_percent;
|
||||
int cpt_cur_min;
|
||||
int cpt_cur_hour;
|
||||
int cpt_cur_day;
|
||||
double cpt_avg_min;
|
||||
double cpt_avg_hour;
|
||||
double cpt_avg_day;
|
||||
char *cpt;
|
||||
const char *hash_target;
|
||||
char *hash_type;
|
||||
int guess_mode;
|
||||
char *guess_base;
|
||||
int guess_base_offset;
|
||||
int guess_base_count;
|
||||
double guess_base_percent;
|
||||
char *guess_mod;
|
||||
int guess_mod_offset;
|
||||
int guess_mod_count;
|
||||
double guess_mod_percent;
|
||||
char *guess_charset;
|
||||
int guess_mask_length;
|
||||
char *session;
|
||||
char *status_string;
|
||||
int status_number;
|
||||
char *time_estimated_absolute;
|
||||
char *time_estimated_relative;
|
||||
char *time_started_absolute;
|
||||
char *time_started_relative;
|
||||
double msec_paused;
|
||||
double msec_running;
|
||||
double msec_real;
|
||||
int digests_cnt;
|
||||
int digests_done;
|
||||
double digests_percent;
|
||||
int salts_cnt;
|
||||
int salts_done;
|
||||
double salts_percent;
|
||||
int progress_mode;
|
||||
double progress_finished_percent;
|
||||
u64 progress_cur;
|
||||
u64 progress_cur_relative_skip;
|
||||
u64 progress_done;
|
||||
u64 progress_end;
|
||||
u64 progress_end_relative_skip;
|
||||
u64 progress_ignore;
|
||||
u64 progress_rejected;
|
||||
double progress_rejected_percent;
|
||||
u64 progress_restored;
|
||||
u64 progress_skip;
|
||||
u64 restore_point;
|
||||
u64 restore_total;
|
||||
double restore_percent;
|
||||
int cpt_cur_min;
|
||||
int cpt_cur_hour;
|
||||
int cpt_cur_day;
|
||||
double cpt_avg_min;
|
||||
double cpt_avg_hour;
|
||||
double cpt_avg_day;
|
||||
char *cpt;
|
||||
|
||||
device_info_t device_info_buf[DEVICES_MAX];
|
||||
int device_info_cnt;
|
||||
|
@ -141,6 +141,7 @@ CFLAGS += -Winit-self
|
||||
CFLAGS += -Werror-implicit-function-declaration
|
||||
CFLAGS += -Wformat
|
||||
CFLAGS += -ftrapv
|
||||
CFLAGS += -Wwrite-strings
|
||||
|
||||
# the following compiler options produce warnings that should be fixed at some time
|
||||
|
||||
@ -148,7 +149,6 @@ CFLAGS += -ftrapv
|
||||
#CFLAGS += -Wcast-align
|
||||
#CFLAGS += -Wcast-qual
|
||||
#CFLAGS += -Wsign-conversion
|
||||
#CFLAGS += -Wwrite-strings
|
||||
#CFLAGS += -pedantic
|
||||
endif
|
||||
|
||||
|
@ -886,7 +886,7 @@ void hashcat_destroy (hashcat_ctx_t *hashcat_ctx)
|
||||
memset (hashcat_ctx, 0, sizeof (hashcat_ctx_t));
|
||||
}
|
||||
|
||||
int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, char *install_folder, char *shared_folder, int argc, char **argv, const int comptime)
|
||||
int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, const char *install_folder, const char *shared_folder, int argc, char **argv, const int comptime)
|
||||
{
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
|
@ -118,7 +118,7 @@ int save_hash (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
char *hashfile = hashes->hashfile;
|
||||
const char *hashfile = hashes->hashfile;
|
||||
|
||||
char new_hashfile[256] = { 0 };
|
||||
char old_hashfile[256] = { 0 };
|
||||
@ -896,7 +896,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
|
||||
}
|
||||
else if (hashlist_mode == HL_MODE_FILE)
|
||||
{
|
||||
char *hashfile = hashes->hashfile;
|
||||
const char *hashfile = hashes->hashfile;
|
||||
|
||||
FILE *fp;
|
||||
|
||||
|
@ -509,7 +509,7 @@ static int hm_SYSFS_get_pp_dpm_pcie (hashcat_ctx_t *hashcat_ctx, const int devic
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hm_SYSFS_set_power_dpm_force_performance_level (hashcat_ctx_t *hashcat_ctx, const int device_id, char *val)
|
||||
static int hm_SYSFS_set_power_dpm_force_performance_level (hashcat_ctx_t *hashcat_ctx, const int device_id, const char *val)
|
||||
{
|
||||
char *syspath = hm_SYSFS_get_syspath_device (hashcat_ctx, device_id);
|
||||
|
||||
|
@ -15223,7 +15223,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
|
||||
salt_t *salts_buf = hashes->salts_buf;
|
||||
void *esalts_buf = hashes->esalts_buf;
|
||||
hashinfo_t **hash_info = hashes->hash_info;
|
||||
char *hashfile = hashes->hashfile;
|
||||
const char *hashfile = hashes->hashfile;
|
||||
|
||||
const u32 hash_type = hashconfig->hash_type;
|
||||
const u32 hash_mode = hashconfig->hash_mode;
|
||||
@ -23256,11 +23256,11 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
||||
}
|
||||
}
|
||||
|
||||
char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx)
|
||||
const char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
|
||||
|
||||
char *mask = NULL;
|
||||
const char *mask = NULL;
|
||||
|
||||
switch (hashconfig->hash_mode)
|
||||
{
|
||||
|
@ -954,8 +954,8 @@ int main (int argc, char **argv)
|
||||
|
||||
// install and shared folder need to be set to recognize "make install" use
|
||||
|
||||
char *install_folder = NULL;
|
||||
char *shared_folder = NULL;
|
||||
const char *install_folder = NULL;
|
||||
const char *shared_folder = NULL;
|
||||
|
||||
#if defined (INSTALL_FOLDER)
|
||||
install_folder = INSTALL_FOLDER;
|
||||
|
@ -240,7 +240,7 @@ char *status_get_hash_type (const hashcat_ctx_t *hashcat_ctx)
|
||||
return strhashtype (hashconfig->hash_mode);
|
||||
}
|
||||
|
||||
char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx)
|
||||
const char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
const hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
|
||||
const hashes_t *hashes = hashcat_ctx->hashes;
|
||||
|
@ -266,7 +266,7 @@ void tuning_db_destroy (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
tuning_db_entry_t *entry = &tuning_db->entry_buf[i];
|
||||
|
||||
hcfree (entry->device_name);
|
||||
hcfree ((void *)entry->device_name);
|
||||
}
|
||||
|
||||
hcfree (tuning_db->alias_buf);
|
||||
|
Loading…
Reference in New Issue
Block a user