arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 12:29:35 +00:00
Code Issues Releases Wiki Activity

Move words_progress_* down one level

Browse Source
This commit is contained in:
jsteube 2016-09-27 11:03:45 +02:00
parent eeccb01998
commit 0edc781861
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hashcat.c
View File

@ -1139,18 +1139,6 @@ static int inner1_loop (user_options_t *user_options, user_options_extra_t *user
} }
} }
/**
* keep track of the progress
*/
u64 *words_progress_done = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
u64 *words_progress_rejected = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
u64 *words_progress_restored = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
data.words_progress_done = words_progress_done;
data.words_progress_rejected = words_progress_rejected;
data.words_progress_restored = words_progress_restored;
/** /**
* main inner loop * main inner loop
*/ */
@ -1657,9 +1645,6 @@ static int inner1_loop (user_options_t *user_options, user_options_extra_t *user
// free memory // free memory
myfree (words_progress_done);
myfree (words_progress_rejected);
myfree (words_progress_restored);
return 0; return 0;
} }
@ -1909,6 +1894,14 @@ static int outer_loop (user_options_t *user_options, user_options_extra_t *user_
if (user_options->quiet == false) log_info_nn ("Initializing device kernels and memory..."); if (user_options->quiet == false) log_info_nn ("Initializing device kernels and memory...");
u64 *words_progress_done = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
u64 *words_progress_rejected = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
u64 *words_progress_restored = (u64 *) mycalloc (hashes->salts_cnt, sizeof (u64));
data.words_progress_done = words_progress_done;
data.words_progress_rejected = words_progress_rejected;
data.words_progress_restored = words_progress_restored;
/* /*
session_ctx_t *session_ctx = (session_ctx_t *) mymalloc (sizeof (session_ctx_t)); session_ctx_t *session_ctx = (session_ctx_t *) mymalloc (sizeof (session_ctx_t));
@ -2139,6 +2132,10 @@ static int outer_loop (user_options_t *user_options, user_options_extra_t *user_
* Clean up * Clean up
*/ */
myfree (words_progress_done);
myfree (words_progress_rejected);
myfree (words_progress_restored);
opencl_session_destroy (opencl_ctx); opencl_session_destroy (opencl_ctx);
potfile_write_close (potfile_ctx); potfile_write_close (potfile_ctx);