diff --git a/include/backend.h b/include/backend.h index de74cb511..393b31440 100644 --- a/include/backend.h +++ b/include/backend.h @@ -174,8 +174,6 @@ int gidd_to_pw_t (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, c int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u32 highest_pw_len, const u64 pws_pos, const u64 pws_cnt, const u32 fast_iteration, const u32 salt_pos); -void rebuild_pws_compressed_append (hc_device_param_t *device_param, const u64 pws_cnt, const u8 chr); - int run_cuda_kernel_atinit (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, CUdeviceptr buf, const u64 num); int run_cuda_kernel_utf8toutf16le (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, CUdeviceptr buf, const u64 num); int run_cuda_kernel_memset (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, CUdeviceptr buf, const u64 offset, const u8 value, const u64 size); diff --git a/include/types.h b/include/types.h index 0a9ac6f92..92c4b2e85 100644 --- a/include/types.h +++ b/include/types.h @@ -1075,8 +1075,6 @@ typedef struct hc_fp gzFile gfp; // gzip fp unzFile ufp; // zip fp - bool is_gzip; - bool is_zip; int bom_size; const char *mode; diff --git a/src/backend.c b/src/backend.c index 65336dd5e..c4f6a1941 100644 --- a/src/backend.c +++ b/src/backend.c @@ -41,6 +41,9 @@ static double TARGET_MSEC_PROFILE[4] = { 2, 12, 96, 480 }; HC_ALIGN(16) static const u32 bzeros[4] = { 0, 0, 0, 0 }; +/* forward declarations */ +static void rebuild_pws_compressed_append (hc_device_param_t *device_param, const u64 pws_cnt, const u8 chr); + static bool is_same_device (const hc_device_param_t *src, const hc_device_param_t *dst) { // First check by PCI address @@ -161,8 +164,6 @@ static int backend_ctx_find_alias_devices (hashcat_ctx_t *hashcat_ctx) static bool is_same_device_type (const hc_device_param_t *src, const hc_device_param_t *dst) { - if (strcmp (src->device_name, dst->device_name) != 0) return false; - if (src->is_cuda != dst->is_cuda) return false; if (src->is_hip != dst->is_hip) return false; if (src->is_opencl != dst->is_opencl) return false; @@ -4829,7 +4830,7 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, return 0; } -void rebuild_pws_compressed_append (hc_device_param_t *device_param, const u64 pws_cnt, const u8 chr) +static void rebuild_pws_compressed_append (hc_device_param_t *device_param, const u64 pws_cnt, const u8 chr) { // this function is used if we have to modify the compressed pws buffer in order to // append some data to each password candidate @@ -4873,11 +4874,11 @@ void rebuild_pws_compressed_append (hc_device_param_t *device_param, const u64 p pw_idx_dst_next->off = pw_idx_dst->off + pw_idx_dst->cnt; } - memcpy (device_param->pws_comp, tmp_pws_comp, device_param->size_pws_comp); - memcpy (device_param->pws_idx, tmp_pws_idx, device_param->size_pws_idx); + hcfree (device_param->pws_comp); + hcfree (device_param->pws_idx); - hcfree (tmp_pws_comp); - hcfree (tmp_pws_idx); + device_param->pws_comp = tmp_pws_comp; + device_param->pws_idx = tmp_pws_idx; } int run_cuda_kernel_atinit (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, CUdeviceptr buf, const u64 num) @@ -5281,29 +5282,26 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con { CUfunction cuda_function = NULL; - if (device_param->is_cuda == true) + switch (kern_run) { - switch (kern_run) - { - case KERN_RUN_1: cuda_function = device_param->cuda_function1; break; - case KERN_RUN_12: cuda_function = device_param->cuda_function12; break; - case KERN_RUN_2P: cuda_function = device_param->cuda_function2p; break; - case KERN_RUN_2: cuda_function = device_param->cuda_function2; break; - case KERN_RUN_2E: cuda_function = device_param->cuda_function2e; break; - case KERN_RUN_23: cuda_function = device_param->cuda_function23; break; - case KERN_RUN_3: cuda_function = device_param->cuda_function3; break; - case KERN_RUN_4: cuda_function = device_param->cuda_function4; break; - case KERN_RUN_INIT2: cuda_function = device_param->cuda_function_init2; break; - case KERN_RUN_LOOP2P: cuda_function = device_param->cuda_function_loop2p; break; - case KERN_RUN_LOOP2: cuda_function = device_param->cuda_function_loop2; break; - case KERN_RUN_AUX1: cuda_function = device_param->cuda_function_aux1; break; - case KERN_RUN_AUX2: cuda_function = device_param->cuda_function_aux2; break; - case KERN_RUN_AUX3: cuda_function = device_param->cuda_function_aux3; break; - case KERN_RUN_AUX4: cuda_function = device_param->cuda_function_aux4; break; - } - - if (hc_cuFuncSetAttribute (hashcat_ctx, cuda_function, CU_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; - } + case KERN_RUN_1: cuda_function = device_param->cuda_function1; break; + case KERN_RUN_12: cuda_function = device_param->cuda_function12; break; + case KERN_RUN_2P: cuda_function = device_param->cuda_function2p; break; + case KERN_RUN_2: cuda_function = device_param->cuda_function2; break; + case KERN_RUN_2E: cuda_function = device_param->cuda_function2e; break; + case KERN_RUN_23: cuda_function = device_param->cuda_function23; break; + case KERN_RUN_3: cuda_function = device_param->cuda_function3; break; + case KERN_RUN_4: cuda_function = device_param->cuda_function4; break; + case KERN_RUN_INIT2: cuda_function = device_param->cuda_function_init2; break; + case KERN_RUN_LOOP2P: cuda_function = device_param->cuda_function_loop2p; break; + case KERN_RUN_LOOP2: cuda_function = device_param->cuda_function_loop2; break; + case KERN_RUN_AUX1: cuda_function = device_param->cuda_function_aux1; break; + case KERN_RUN_AUX2: cuda_function = device_param->cuda_function_aux2; break; + case KERN_RUN_AUX3: cuda_function = device_param->cuda_function_aux3; break; + case KERN_RUN_AUX4: cuda_function = device_param->cuda_function_aux4; break; + } + + if (hc_cuFuncSetAttribute (hashcat_ctx, cuda_function, CU_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; if (kernel_threads == 0) kernel_threads = 1; @@ -5353,8 +5351,6 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con if (hc_cuEventSynchronize (hashcat_ctx, device_param->cuda_event2) == -1) return -1; - if (hc_cuEventSynchronize (hashcat_ctx, device_param->cuda_event1) == -1) return -1; - float exec_ms; if (hc_cuEventElapsedTime (hashcat_ctx, &exec_ms, device_param->cuda_event1, device_param->cuda_event2) == -1) return -1; @@ -5380,29 +5376,26 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con { hipFunction_t hip_function = NULL; - if (device_param->is_hip == true) + switch (kern_run) { - switch (kern_run) - { - case KERN_RUN_1: hip_function = device_param->hip_function1; break; - case KERN_RUN_12: hip_function = device_param->hip_function12; break; - case KERN_RUN_2P: hip_function = device_param->hip_function2p; break; - case KERN_RUN_2: hip_function = device_param->hip_function2; break; - case KERN_RUN_2E: hip_function = device_param->hip_function2e; break; - case KERN_RUN_23: hip_function = device_param->hip_function23; break; - case KERN_RUN_3: hip_function = device_param->hip_function3; break; - case KERN_RUN_4: hip_function = device_param->hip_function4; break; - case KERN_RUN_INIT2: hip_function = device_param->hip_function_init2; break; - case KERN_RUN_LOOP2P: hip_function = device_param->hip_function_loop2p; break; - case KERN_RUN_LOOP2: hip_function = device_param->hip_function_loop2; break; - case KERN_RUN_AUX1: hip_function = device_param->hip_function_aux1; break; - case KERN_RUN_AUX2: hip_function = device_param->hip_function_aux2; break; - case KERN_RUN_AUX3: hip_function = device_param->hip_function_aux3; break; - case KERN_RUN_AUX4: hip_function = device_param->hip_function_aux4; break; - } - - //if (hc_hipFuncSetAttribute (hashcat_ctx, hip_function, HIP_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; - } + case KERN_RUN_1: hip_function = device_param->hip_function1; break; + case KERN_RUN_12: hip_function = device_param->hip_function12; break; + case KERN_RUN_2P: hip_function = device_param->hip_function2p; break; + case KERN_RUN_2: hip_function = device_param->hip_function2; break; + case KERN_RUN_2E: hip_function = device_param->hip_function2e; break; + case KERN_RUN_23: hip_function = device_param->hip_function23; break; + case KERN_RUN_3: hip_function = device_param->hip_function3; break; + case KERN_RUN_4: hip_function = device_param->hip_function4; break; + case KERN_RUN_INIT2: hip_function = device_param->hip_function_init2; break; + case KERN_RUN_LOOP2P: hip_function = device_param->hip_function_loop2p; break; + case KERN_RUN_LOOP2: hip_function = device_param->hip_function_loop2; break; + case KERN_RUN_AUX1: hip_function = device_param->hip_function_aux1; break; + case KERN_RUN_AUX2: hip_function = device_param->hip_function_aux2; break; + case KERN_RUN_AUX3: hip_function = device_param->hip_function_aux3; break; + case KERN_RUN_AUX4: hip_function = device_param->hip_function_aux4; break; + } + + //if (hc_hipFuncSetAttribute (hashcat_ctx, hip_function, HIP_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; if (kernel_threads == 0) kernel_threads = 1; @@ -5477,26 +5470,23 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con { cl_kernel opencl_kernel = NULL; - if (device_param->is_opencl == true) + switch (kern_run) { - switch (kern_run) - { - case KERN_RUN_1: opencl_kernel = device_param->opencl_kernel1; break; - case KERN_RUN_12: opencl_kernel = device_param->opencl_kernel12; break; - case KERN_RUN_2P: opencl_kernel = device_param->opencl_kernel2p; break; - case KERN_RUN_2: opencl_kernel = device_param->opencl_kernel2; break; - case KERN_RUN_2E: opencl_kernel = device_param->opencl_kernel2e; break; - case KERN_RUN_23: opencl_kernel = device_param->opencl_kernel23; break; - case KERN_RUN_3: opencl_kernel = device_param->opencl_kernel3; break; - case KERN_RUN_4: opencl_kernel = device_param->opencl_kernel4; break; - case KERN_RUN_INIT2: opencl_kernel = device_param->opencl_kernel_init2; break; - case KERN_RUN_LOOP2P: opencl_kernel = device_param->opencl_kernel_loop2p; break; - case KERN_RUN_LOOP2: opencl_kernel = device_param->opencl_kernel_loop2; break; - case KERN_RUN_AUX1: opencl_kernel = device_param->opencl_kernel_aux1; break; - case KERN_RUN_AUX2: opencl_kernel = device_param->opencl_kernel_aux2; break; - case KERN_RUN_AUX3: opencl_kernel = device_param->opencl_kernel_aux3; break; - case KERN_RUN_AUX4: opencl_kernel = device_param->opencl_kernel_aux4; break; - } + case KERN_RUN_1: opencl_kernel = device_param->opencl_kernel1; break; + case KERN_RUN_12: opencl_kernel = device_param->opencl_kernel12; break; + case KERN_RUN_2P: opencl_kernel = device_param->opencl_kernel2p; break; + case KERN_RUN_2: opencl_kernel = device_param->opencl_kernel2; break; + case KERN_RUN_2E: opencl_kernel = device_param->opencl_kernel2e; break; + case KERN_RUN_23: opencl_kernel = device_param->opencl_kernel23; break; + case KERN_RUN_3: opencl_kernel = device_param->opencl_kernel3; break; + case KERN_RUN_4: opencl_kernel = device_param->opencl_kernel4; break; + case KERN_RUN_INIT2: opencl_kernel = device_param->opencl_kernel_init2; break; + case KERN_RUN_LOOP2P: opencl_kernel = device_param->opencl_kernel_loop2p; break; + case KERN_RUN_LOOP2: opencl_kernel = device_param->opencl_kernel_loop2; break; + case KERN_RUN_AUX1: opencl_kernel = device_param->opencl_kernel_aux1; break; + case KERN_RUN_AUX2: opencl_kernel = device_param->opencl_kernel_aux2; break; + case KERN_RUN_AUX3: opencl_kernel = device_param->opencl_kernel_aux3; break; + case KERN_RUN_AUX4: opencl_kernel = device_param->opencl_kernel_aux4; break; } for (u32 i = 0; i <= 23; i++) @@ -6529,7 +6519,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co if (device_param->is_opencl == true) { - if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_combs_c, CL_TRUE, 0, innerloop_left * sizeof (pw_t), device_param->combs_buf, 0, NULL, NULL) == -1) return -1; + if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_combs_c, CL_FALSE, 0, innerloop_left * sizeof (pw_t), device_param->combs_buf, 0, NULL, NULL) == -1) return -1; } } else if (user_options->attack_mode == ATTACK_MODE_HYBRID1) @@ -15674,6 +15664,8 @@ int backend_session_update_mp (hashcat_ctx_t *hashcat_ctx) if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_root_css_buf, CL_FALSE, 0, device_param->size_root_css, mask_ctx->root_css_buf, 0, NULL, NULL) == -1) return -1; if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_markov_css_buf, CL_FALSE, 0, device_param->size_markov_css, mask_ctx->markov_css_buf, 0, NULL, NULL) == -1) return -1; + + if (hc_clFlush (hashcat_ctx, device_param->opencl_command_queue) == -1) return -1; } } @@ -15745,6 +15737,8 @@ int backend_session_update_mp_rl (hashcat_ctx_t *hashcat_ctx, const u32 css_cnt_ if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_root_css_buf, CL_FALSE, 0, device_param->size_root_css, mask_ctx->root_css_buf, 0, NULL, NULL) == -1) return -1; if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_markov_css_buf, CL_FALSE, 0, device_param->size_markov_css, mask_ctx->markov_css_buf, 0, NULL, NULL) == -1) return -1; + + if (hc_clFlush (hashcat_ctx, device_param->opencl_command_queue) == -1) return -1; } } diff --git a/src/debugfile.c b/src/debugfile.c index aaaed1822..b23fad791 100644 --- a/src/debugfile.c +++ b/src/debugfile.c @@ -133,9 +133,15 @@ int debugfile_init (hashcat_ctx_t *hashcat_ctx) } else { - debugfile_ctx->fp.is_gzip = false; - debugfile_ctx->fp.pfp = stdout; - debugfile_ctx->fp.fd = fileno (stdout); + HCFILE *fp = &debugfile_ctx->fp; + + fp->fd = fileno (stdout); + fp->pfp = stdout; + fp->gfp = NULL; + fp->ufp = NULL; + fp->bom_size = 0; + fp->path = NULL; + fp->mode = NULL; } return 0; diff --git a/src/filehandling.c b/src/filehandling.c index 9edd1cb35..f23c13024 100644 --- a/src/filehandling.c +++ b/src/filehandling.c @@ -23,7 +23,16 @@ int _wopen (const char *path, int oflag, ...) bool hc_fopen (HCFILE *fp, const char *path, const char *mode) { - if (path == NULL || mode == NULL) return false; + if (fp == NULL || path == NULL || mode == NULL) return false; + + /* cleanup */ + fp->fd = -1; + fp->pfp = NULL; + fp->gfp = NULL; + fp->ufp = NULL; + fp->bom_size = 0; + fp->path = NULL; + fp->mode = NULL; int oflag = -1; @@ -60,13 +69,11 @@ bool hc_fopen (HCFILE *fp, const char *path, const char *mode) return false; } - fp->pfp = NULL; - fp->is_gzip = false; - fp->is_zip = false; - fp->bom_size = 0; - unsigned char check[8] = { 0 }; + bool is_gzip = false; + bool is_zip = false; + int fd_tmp = open (path, O_RDONLY); if (fd_tmp != -1) @@ -75,12 +82,12 @@ bool hc_fopen (HCFILE *fp, const char *path, const char *mode) if (read (fd_tmp, check, sizeof (check)) > 0) { - if (check[0] == 0x1f && check[1] == 0x8b && check[2] == 0x08) fp->is_gzip = true; - if (check[0] == 0x50 && check[1] == 0x4b && check[2] == 0x03 && check[3] == 0x04) fp->is_zip = true; + if (check[0] == 0x1f && check[1] == 0x8b && check[2] == 0x08) is_gzip = true; + if (check[0] == 0x50 && check[1] == 0x4b && check[2] == 0x03 && check[3] == 0x04) is_zip = true; // compressed files with BOM will be undetected! - if ((fp->is_gzip == false) && (fp->is_zip == false)) + if (is_gzip == false && is_zip == false) { fp->bom_size = hc_string_bom_size (check); } @@ -89,39 +96,42 @@ bool hc_fopen (HCFILE *fp, const char *path, const char *mode) close (fd_tmp); } - if (fmode == -1) - { - fp->fd = open (path, oflag); - } - else + if (is_zip == false) { - fp->fd = open (path, oflag, fmode); - } + if (fmode == -1) + { + fp->fd = open (path, oflag); + } + else + { + fp->fd = open (path, oflag, fmode); + } - if (fp->fd == -1 && fp->is_zip == false) return false; + if (fp->fd == -1) return false; - if (fp->is_gzip) - { - if ((fp->gfp = gzdopen (fp->fd, mode)) == NULL) return false; - } - else if (fp->is_zip) - { - if ((fp->ufp = unzOpen64 (path)) == NULL) return false; + if (is_gzip) + { + if ((fp->gfp = gzdopen (fp->fd, mode)) == NULL) return false; + } + else + { + if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false; - if (unzOpenCurrentFile (fp->ufp) != UNZ_OK) return false; + if (fp->bom_size) + { + // atm just skip bom + + const int nread = fread (check, sizeof (char), fp->bom_size, fp->pfp); + + if (nread != fp->bom_size) return false; + } + } } else { - if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false; - - if (fp->bom_size) - { - // atm just skip bom - - const int nread = fread (check, sizeof (char), fp->bom_size, fp->pfp); + if ((fp->ufp = unzOpen64 (path)) == NULL) return false; - if (nread != fp->bom_size) return false; - } + if (unzOpenCurrentFile (fp->ufp) != UNZ_OK) return false; } fp->path = path; @@ -132,7 +142,16 @@ bool hc_fopen (HCFILE *fp, const char *path, const char *mode) bool hc_fopen_raw (HCFILE *fp, const char *path, const char *mode) { - if (path == NULL || mode == NULL) return false; + if (fp == NULL || path == NULL || mode == NULL) return false; + + /* cleanup */ + fp->fd = -1; + fp->pfp = NULL; + fp->gfp = NULL; + fp->ufp = NULL; + fp->bom_size = 0; + fp->path = NULL; + fp->mode = NULL; int oflag = -1; @@ -169,11 +188,6 @@ bool hc_fopen_raw (HCFILE *fp, const char *path, const char *mode) return false; } - fp->pfp = NULL; - fp->is_gzip = false; - fp->is_zip = false; - fp->bom_size = 0; - if (fmode == -1) { fp->fd = open (path, oflag); @@ -183,9 +197,9 @@ bool hc_fopen_raw (HCFILE *fp, const char *path, const char *mode) fp->fd = open (path, oflag, fmode); } - if (fp->fd == -1 && fp->is_zip == false) return false; + if (fp->fd == -1) return false; - if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false; + if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false; fp->path = path; fp->mode = mode; @@ -199,17 +213,17 @@ size_t hc_fread (void *ptr, size_t size, size_t nmemb, HCFILE *fp) if (fp == NULL) return n; - if (fp->is_gzip) + if (fp->gfp) { n = gzfread (ptr, size, nmemb, fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { unsigned s = size * nmemb; n = unzReadCurrentFile (fp->ufp, ptr, s); } - else + else if (fp->pfp) { #if defined (_WIN) @@ -263,14 +277,14 @@ size_t hc_fwrite (const void *ptr, size_t size, size_t nmemb, HCFILE *fp) if (fp == NULL) return n; - if (fp->is_gzip) + if (fp->gfp) { n = gzfwrite (ptr, size, nmemb, fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { } - else + else if (fp->pfp) { #if defined (_WIN) @@ -324,11 +338,11 @@ int hc_fseek (HCFILE *fp, off_t offset, int whence) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzseek (fp->gfp, offset, whence); } - else if (fp->is_zip) + else if (fp->ufp) { /* // untested and not used in wordlist engine @@ -349,7 +363,7 @@ int hc_fseek (HCFILE *fp, off_t offset, int whence) // r = unzSetOffset (fp->ufp, offset); */ } - else + else if (fp->pfp) { r = fseeko (fp->pfp, offset, whence); } @@ -361,15 +375,15 @@ void hc_rewind (HCFILE *fp) { if (fp == NULL) return; - if (fp->is_gzip) + if (fp->gfp) { gzrewind (fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { unzGoToFirstFile (fp->ufp); } - else + else if (fp->pfp) { rewind (fp->pfp); } @@ -381,15 +395,15 @@ off_t hc_ftell (HCFILE *fp) if (fp == NULL) return -1; - if (fp->is_gzip) + if (fp->gfp) { n = (off_t) gztell (fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { n = unztell (fp->ufp); } - else + else if (fp->pfp) { n = ftello (fp->pfp); } @@ -403,14 +417,14 @@ int hc_fputc (int c, HCFILE *fp) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzputc (fp->gfp, c); } - else if (fp->is_zip) + else if (fp->ufp) { } - else + else if (fp->pfp) { r = fputc (c, fp->pfp); } @@ -424,17 +438,17 @@ int hc_fgetc (HCFILE *fp) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzgetc (fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { unsigned char c = 0; if (unzReadCurrentFile (fp->ufp, &c, 1) == 1) r = (int) c; } - else + else if (fp->pfp) { r = fgetc (fp->pfp); } @@ -448,15 +462,15 @@ char *hc_fgets (char *buf, int len, HCFILE *fp) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzgets (fp->gfp, buf, len); } - else if (fp->is_zip) + else if (fp->ufp) { if (unzReadCurrentFile (fp->ufp, buf, len) > 0) r = buf; } - else + else if (fp->pfp) { r = fgets (buf, len, fp->pfp); } @@ -470,14 +484,14 @@ int hc_vfprintf (HCFILE *fp, const char *format, va_list ap) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzvprintf (fp->gfp, format, ap); } - else if (fp->is_zip) + else if (fp->ufp) { } - else + else if (fp->pfp) { r = vfprintf (fp->pfp, format, ap); } @@ -495,14 +509,14 @@ int hc_fprintf (HCFILE *fp, const char *format, ...) va_start (ap, format); - if (fp->is_gzip) + if (fp->gfp) { r = gzvprintf (fp->gfp, format, ap); } - else if (fp->is_zip) + else if (fp->ufp) { } - else + else if (fp->pfp) { r = vfprintf (fp->pfp, format, ap); } @@ -516,23 +530,17 @@ int hc_fscanf (HCFILE *fp, const char *format, void *ptr) { if (fp == NULL) return -1; - char *buf = (char *) hcmalloc (HCBUFSIZ_TINY); - - if (buf == NULL) return -1; + char buf[HCBUFSIZ_TINY]; char *b = hc_fgets (buf, HCBUFSIZ_TINY - 1, fp); if (b == NULL) { - hcfree (buf); - return -1; } sscanf (b, format, ptr); - hcfree (buf); - return 1; } @@ -549,15 +557,15 @@ int hc_feof (HCFILE *fp) if (fp == NULL) return r; - if (fp->is_gzip) + if (fp->gfp) { r = gzeof (fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { r = unzeof (fp->ufp); } - else + else if (fp->pfp) { r = feof (fp->pfp); } @@ -569,14 +577,14 @@ void hc_fflush (HCFILE *fp) { if (fp == NULL) return; - if (fp->is_gzip) + if (fp->gfp) { gzflush (fp->gfp, Z_SYNC_FLUSH); } - else if (fp->is_zip) + else if (fp->ufp) { } - else + else if (fp->pfp) { fflush (fp->pfp); } @@ -586,25 +594,25 @@ void hc_fclose (HCFILE *fp) { if (fp == NULL) return; - if (fp->is_gzip) + if (fp->gfp) { gzclose (fp->gfp); } - else if (fp->is_zip) + else if (fp->ufp) { unzCloseCurrentFile (fp->ufp); unzClose (fp->ufp); } - else + else if (fp->pfp) { fclose (fp->pfp); } fp->fd = -1; fp->pfp = NULL; - fp->is_gzip = false; - fp->is_zip = false; + fp->gfp = NULL; + fp->ufp = NULL; fp->path = NULL; fp->mode = NULL; @@ -664,7 +672,7 @@ size_t fgetl (HCFILE *fp, char *line_buf, const size_t line_sz) line_buf[line_len] = 0; - return (line_len); + return line_len; } u64 count_lines (HCFILE *fp) @@ -681,9 +689,7 @@ u64 count_lines (HCFILE *fp) if (nread < 1) continue; - size_t i; - - for (i = 0; i < nread; i++) + for (size_t i = 0; i < nread; i++) { if (prev == '\n') cnt++; diff --git a/src/potfile.c b/src/potfile.c index 18a2883b5..fe8448066 100644 --- a/src/potfile.c +++ b/src/potfile.c @@ -128,9 +128,8 @@ int potfile_init (hashcat_ctx_t *hashcat_ctx) if (user_options->potfile_path == NULL) { - potfile_ctx->fp.pfp = NULL; - hc_asprintf (&potfile_ctx->filename, "%s/hashcat.potfile", folder_config->profile_dir); + potfile_ctx->fp.pfp = NULL; } else { @@ -173,25 +172,26 @@ int potfile_init (hashcat_ctx_t *hashcat_ctx) void potfile_destroy (hashcat_ctx_t *hashcat_ctx) { - hashconfig_t *hashconfig = hashcat_ctx->hashconfig; potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; if (potfile_ctx->enabled == false) return; - if (hashconfig->potfile_disable == true) return; - - hcfree (potfile_ctx->out_buf); hcfree (potfile_ctx->tmp_buf); + hcfree (potfile_ctx->out_buf); + hcfree (potfile_ctx->filename); memset (potfile_ctx, 0, sizeof (potfile_ctx_t)); } int potfile_read_open (hashcat_ctx_t *hashcat_ctx) { - potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; + const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; if (potfile_ctx->enabled == false) return 0; + if (hashconfig->potfile_disable == true) return 0; + if (hc_fopen (&potfile_ctx->fp, potfile_ctx->filename, "rb") == false) { event_log_error (hashcat_ctx, "%s: %s", potfile_ctx->filename, strerror (errno)); @@ -204,24 +204,25 @@ int potfile_read_open (hashcat_ctx_t *hashcat_ctx) void potfile_read_close (hashcat_ctx_t *hashcat_ctx) { - hashconfig_t *hashconfig = hashcat_ctx->hashconfig; - potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; + const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; if (potfile_ctx->enabled == false) return; if (hashconfig->potfile_disable == true) return; - if (potfile_ctx->fp.pfp == NULL) return; - hc_fclose (&potfile_ctx->fp); } int potfile_write_open (hashcat_ctx_t *hashcat_ctx) { - potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; + const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; if (potfile_ctx->enabled == false) return 0; + if (hashconfig->potfile_disable == true) return 0; + if (hc_fopen (&potfile_ctx->fp, potfile_ctx->filename, "ab") == false) { event_log_error (hashcat_ctx, "%s: %s", potfile_ctx->filename, strerror (errno)); @@ -234,8 +235,8 @@ int potfile_write_open (hashcat_ctx_t *hashcat_ctx) void potfile_write_close (hashcat_ctx_t *hashcat_ctx) { - hashconfig_t *hashconfig = hashcat_ctx->hashconfig; - potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; + const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; if (potfile_ctx->enabled == false) return; diff --git a/src/stdout.c b/src/stdout.c index 1fd7542bc..1d52881cd 100644 --- a/src/stdout.c +++ b/src/stdout.c @@ -83,9 +83,15 @@ int process_stdout (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, } else { - out.fp.is_gzip = false; - out.fp.pfp = stdout; - out.fp.fd = fileno (stdout); + HCFILE *fp = &out.fp; + + fp->fd = fileno (stdout); + fp->pfp = stdout; + fp->gfp = NULL; + fp->ufp = NULL; + fp->bom_size = 0; + fp->path = NULL; + fp->mode = NULL; } out.len = 0;