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

Merge pull request #2108 from matrix/dispatch_1

Browse Source 
(dispatch) remove unused *rc* vars and cleanup
This commit is contained in:
Jens Steube 2019-07-29 15:05:05 +02:00 committed by GitHub
commit 90b9e08fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/dispatch.c
View File

@ -226,9 +226,7 @@ static int calc_stdin (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_par
char *iconv_ptr = iconv_tmp; char *iconv_ptr = iconv_tmp;
size_t iconv_sz = HCBUFSIZ_TINY; size_t iconv_sz = HCBUFSIZ_TINY;
const size_t iconv_rc = iconv (iconv_ctx, &line_buf, &line_len, &iconv_ptr, &iconv_sz); if (iconv (iconv_ctx, &line_buf, &line_len, &iconv_ptr, &iconv_sz) == (size_t) -1) continue;
if (iconv_rc == (size_t) -1) continue;
line_buf = iconv_tmp; line_buf = iconv_tmp;
line_len = HCBUFSIZ_TINY - iconv_sz; line_len = HCBUFSIZ_TINY - iconv_sz;
@ -293,20 +291,14 @@ static int calc_stdin (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_par
// flush // flush
int CL_rc; if (run_copy (hashcat_ctx, device_param, device_param->pws_cnt) == -1)
CL_rc = run_copy (hashcat_ctx, device_param, device_param->pws_cnt);
if (CL_rc == -1)
{ {
hcfree (buf); hcfree (buf);
return -1; return -1;
} }
CL_rc = run_cracker (hashcat_ctx, device_param, device_param->pws_cnt); if (run_cracker (hashcat_ctx, device_param, device_param->pws_cnt) == -1)
if (CL_rc == -1)
{ {
hcfree (buf); hcfree (buf);
@ -343,7 +335,6 @@ HC_API_CALL void *thread_calc_stdin (void *p)
thread_param_t *thread_param = (thread_param_t *) p; thread_param_t *thread_param = (thread_param_t *) p;
hashcat_ctx_t *hashcat_ctx = thread_param->hashcat_ctx; hashcat_ctx_t *hashcat_ctx = thread_param->hashcat_ctx;
backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx; backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
if (backend_ctx->enabled == false) return NULL; if (backend_ctx->enabled == false) return NULL;
@ -356,14 +347,10 @@ HC_API_CALL void *thread_calc_stdin (void *p)
if (device_param->is_cuda == true) if (device_param->is_cuda == true)
{ {
const int rc_cuCtxSetCurrent = hc_cuCtxSetCurrent (hashcat_ctx, device_param->cuda_context); if (hc_cuCtxSetCurrent (hashcat_ctx, device_param->cuda_context) == -1) return NULL;
if (rc_cuCtxSetCurrent == -1) return NULL;
} }
const int rc_calc = calc_stdin (hashcat_ctx, device_param); if (calc_stdin (hashcat_ctx, device_param) == -1)
if (rc_calc == -1)
{ {
status_ctx_t *status_ctx = hashcat_ctx->status_ctx; status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
@ -449,9 +436,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t)); hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t));
const int rc_wl_data_init = wl_data_init (hashcat_ctx_tmp); if (wl_data_init (hashcat_ctx_tmp) == -1)
if (rc_wl_data_init == -1)
{ {
hc_fclose (&extra_info_straight.fp); hc_fclose (&extra_info_straight.fp);
@ -521,11 +506,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
} }
words_extra = overlap; words_extra = overlap;
words_extra_total += overlap; words_extra_total += overlap;
words_off += overlap; words_off += overlap;
work -= overlap; work -= overlap;
} }
} }
@ -658,29 +640,21 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (pws_cnt) if (pws_cnt)
{ {
int CL_rc; if (run_copy (hashcat_ctx, device_param, pws_cnt) == -1)
CL_rc = run_copy (hashcat_ctx, device_param, pws_cnt);
if (CL_rc == -1)
{ {
hc_fclose (&extra_info_straight.fp); hc_fclose (&extra_info_straight.fp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
return -1; return -1;
} }
CL_rc = run_cracker (hashcat_ctx, device_param, pws_cnt); if (run_cracker (hashcat_ctx, device_param, pws_cnt) == -1)
if (CL_rc == -1)
{ {
hc_fclose (&extra_info_straight.fp); hc_fclose (&extra_info_straight.fp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
return -1; return -1;
@ -704,7 +678,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
#endif #endif
device_param->pws_cnt = 0; device_param->pws_cnt = 0;
device_param->pws_base_cnt = 0; device_param->pws_base_cnt = 0;
} }
@ -727,7 +700,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
wl_data_destroy (hashcat_ctx_tmp); wl_data_destroy (hashcat_ctx_tmp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
} }
else if (attack_mode == ATTACK_MODE_COMBI) else if (attack_mode == ATTACK_MODE_COMBI)
@ -776,9 +748,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t)); hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t));
const int rc_wl_data_init = wl_data_init (hashcat_ctx_tmp); if (wl_data_init (hashcat_ctx_tmp) == -1)
if (rc_wl_data_init == -1)
{ {
hc_fclose (&extra_info_combi.base_fp); hc_fclose (&extra_info_combi.base_fp);
hc_fclose (&extra_info_combi.combs_fp); hc_fclose (&extra_info_combi.combs_fp);
@ -850,11 +820,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
} }
words_extra = overlap; words_extra = overlap;
words_extra_total += overlap; words_extra_total += overlap;
words_off += overlap; words_off += overlap;
work -= overlap; work -= overlap;
} }
} }
@ -985,11 +952,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (pws_cnt) if (pws_cnt)
{ {
int CL_rc; if (run_copy (hashcat_ctx, device_param, pws_cnt) == -1)
CL_rc = run_copy (hashcat_ctx, device_param, pws_cnt);
if (CL_rc == -1)
{ {
hc_fclose (&extra_info_combi.base_fp); hc_fclose (&extra_info_combi.base_fp);
hc_fclose (&extra_info_combi.combs_fp); hc_fclose (&extra_info_combi.combs_fp);
@ -1000,9 +963,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
return -1; return -1;
} }
CL_rc = run_cracker (hashcat_ctx, device_param, pws_cnt); if (run_cracker (hashcat_ctx, device_param, pws_cnt) == -1)
if (CL_rc == -1)
{ {
hc_fclose (&extra_info_combi.base_fp); hc_fclose (&extra_info_combi.base_fp);
hc_fclose (&extra_info_combi.combs_fp); hc_fclose (&extra_info_combi.combs_fp);
@ -1031,7 +992,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
#endif #endif
device_param->pws_cnt = 0; device_param->pws_cnt = 0;
device_param->pws_base_cnt = 0; device_param->pws_base_cnt = 0;
} }
@ -1125,18 +1085,14 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
} }
words_extra = overlap; words_extra = overlap;
words_extra_total += overlap; words_extra_total += overlap;
words_off += overlap; words_off += overlap;
work -= overlap; work -= overlap;
} }
} }
#endif #endif
words_fin = words_off + work; words_fin = words_off + work;
words_cur = words_off; words_cur = words_off;
for (u64 i = words_cur; i < words_fin; i++) for (u64 i = words_cur; i < words_fin; i++)
@ -1245,21 +1201,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (pws_cnt) if (pws_cnt)
{ {
int CL_rc; if (run_copy (hashcat_ctx, device_param, pws_cnt) == -1) return -1;
if (run_cracker (hashcat_ctx, device_param, pws_cnt) == -1) return -1;
CL_rc = run_copy (hashcat_ctx, device_param, pws_cnt);
if (CL_rc == -1)
{
return -1;
}
CL_rc = run_cracker (hashcat_ctx, device_param, pws_cnt);
if (CL_rc == -1)
{
return -1;
}
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
if (user_options->brain_client == true) if (user_options->brain_client == true)
@ -1330,15 +1273,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
device_param->pws_cnt = work; device_param->pws_cnt = work;
int CL_rc; if (run_copy (hashcat_ctx, device_param, device_param->pws_cnt) == -1) return -1;
if (run_cracker (hashcat_ctx, device_param, device_param->pws_cnt) == -1) return -1;
CL_rc = run_copy (hashcat_ctx, device_param, device_param->pws_cnt);
if (CL_rc == -1) return -1;
CL_rc = run_cracker (hashcat_ctx, device_param, device_param->pws_cnt);
if (CL_rc == -1) return -1;
device_param->pws_cnt = 0; device_param->pws_cnt = 0;
@ -1408,16 +1344,13 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t)); hashcat_ctx_tmp->wl_data = (wl_data_t *) hcmalloc (sizeof (wl_data_t));
const int rc_wl_data_init = wl_data_init (hashcat_ctx_tmp); if (wl_data_init (hashcat_ctx_tmp) == -1)
if (rc_wl_data_init == -1)
{ {
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp); if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp);
hc_fclose (&fp); hc_fclose (&fp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
return -1; return -1;
@ -1429,9 +1362,7 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
{ {
u64 words_off = 0; u64 words_off = 0;
u64 words_fin = 0; u64 words_fin = 0;
u64 words_extra = -1u; u64 words_extra = -1u;
u64 words_extra_total = 0; u64 words_extra_total = 0;
memset (device_param->pws_comp, 0, device_param->size_pws_comp); memset (device_param->pws_comp, 0, device_param->size_pws_comp);
@ -1538,33 +1469,25 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (pws_cnt) if (pws_cnt)
{ {
int CL_rc; if (run_copy (hashcat_ctx, device_param, pws_cnt) == -1)
CL_rc = run_copy (hashcat_ctx, device_param, pws_cnt);
if (CL_rc == -1)
{ {
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp); if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp);
hc_fclose (&fp); hc_fclose (&fp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
return -1; return -1;
} }
CL_rc = run_cracker (hashcat_ctx, device_param, pws_cnt); if (run_cracker (hashcat_ctx, device_param, pws_cnt) == -1)
if (CL_rc == -1)
{ {
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp); if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (&device_param->combs_fp);
hc_fclose (&fp); hc_fclose (&fp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
return -1; return -1;
@ -1622,7 +1545,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
wl_data_destroy (hashcat_ctx_tmp); wl_data_destroy (hashcat_ctx_tmp);
hcfree (hashcat_ctx_tmp->wl_data); hcfree (hashcat_ctx_tmp->wl_data);
hcfree (hashcat_ctx_tmp); hcfree (hashcat_ctx_tmp);
} }
} }
@ -1641,7 +1563,6 @@ HC_API_CALL void *thread_calc (void *p)
thread_param_t *thread_param = (thread_param_t *) p; thread_param_t *thread_param = (thread_param_t *) p;
hashcat_ctx_t *hashcat_ctx = thread_param->hashcat_ctx; hashcat_ctx_t *hashcat_ctx = thread_param->hashcat_ctx;
backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx; backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
if (backend_ctx->enabled == false) return NULL; if (backend_ctx->enabled == false) return NULL;
@ -1654,14 +1575,10 @@ HC_API_CALL void *thread_calc (void *p)
if (device_param->is_cuda == true) if (device_param->is_cuda == true)
{ {
const int rc_cuCtxSetCurrent = hc_cuCtxSetCurrent (hashcat_ctx, device_param->cuda_context); if (hc_cuCtxSetCurrent (hashcat_ctx, device_param->cuda_context) == -1) return NULL;
if (rc_cuCtxSetCurrent == -1) return NULL;
} }
const int rc_calc = calc (hashcat_ctx, device_param); if (calc (hashcat_ctx, device_param) == -1)
if (rc_calc == -1)
{ {
status_ctx_t *status_ctx = hashcat_ctx->status_ctx; status_ctx_t *status_ctx = hashcat_ctx->status_ctx;