arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 14:48:12 +00:00
Code Issues Releases Wiki Activity

Update combinator.c function parameters

Browse Source
This commit is contained in:
jsteube 2016-10-06 10:10:04 +02:00
parent 0155c9d44a
commit d9c1c89a57
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/combinator.h
View File

@ -9,7 +9,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
int combinator_ctx_init (combinator_ctx_t *combinator_ctx, user_options_t *user_options, user_options_extra_t *user_options_extra, const straight_ctx_t *straight_ctx, dictstat_ctx_t *dictstat_ctx, wl_data_t *wl_data); int combinator_ctx_init (hashcat_ctx_t *hashcat_ctx);
void combinator_ctx_destroy (combinator_ctx_t *combinator_ctx); void combinator_ctx_destroy (hashcat_ctx_t *hashcat_ctx);
#endif // _COMBINATOR_H #endif // _COMBINATOR_H

13
src/combinator.c
View File

@ -10,8 +10,15 @@
#include "combinator.h" #include "combinator.h"
#include "wordlist.h" #include "wordlist.h"
int combinator_ctx_init (combinator_ctx_t *combinator_ctx, user_options_t *user_options, user_options_extra_t *user_options_extra, const straight_ctx_t *straight_ctx, dictstat_ctx_t *dictstat_ctx, wl_data_t *wl_data) int combinator_ctx_init (hashcat_ctx_t *hashcat_ctx)
{ {
combinator_ctx_t *combinator_ctx = hashcat_ctx->combinator_ctx;
dictstat_ctx_t *dictstat_ctx = hashcat_ctx->dictstat_ctx;
straight_ctx_t *straight_ctx = hashcat_ctx->straight_ctx;
user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
user_options_t *user_options = hashcat_ctx->user_options;
wl_data_t *wl_data = hashcat_ctx->wl_data;
combinator_ctx->enabled = false; combinator_ctx->enabled = false;
if (user_options->left == true) return 0; if (user_options->left == true) return 0;
@ -173,8 +180,10 @@ int combinator_ctx_init (combinator_ctx_t *combinator_ctx, user_options_t *user_
return 0; return 0;
} }
void combinator_ctx_destroy (combinator_ctx_t *combinator_ctx) void combinator_ctx_destroy (hashcat_ctx_t *hashcat_ctx)
{ {
combinator_ctx_t *combinator_ctx = hashcat_ctx->combinator_ctx;
if (combinator_ctx->enabled == false) return; if (combinator_ctx->enabled == false) return;
myfree (combinator_ctx->scratch_buf); myfree (combinator_ctx->scratch_buf);

10
src/hashcat.c
View File

@ -761,8 +761,6 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
{ {
bitmap_ctx_t *bitmap_ctx = hashcat_ctx->bitmap_ctx; bitmap_ctx_t *bitmap_ctx = hashcat_ctx->bitmap_ctx;
cpt_ctx_t *cpt_ctx = hashcat_ctx->cpt_ctx; cpt_ctx_t *cpt_ctx = hashcat_ctx->cpt_ctx;
combinator_ctx_t *combinator_ctx = hashcat_ctx->combinator_ctx;
dictstat_ctx_t *dictstat_ctx = hashcat_ctx->dictstat_ctx;
folder_config_t *folder_config = hashcat_ctx->folder_config; folder_config_t *folder_config = hashcat_ctx->folder_config;
hashconfig_t *hashconfig = hashcat_ctx->hashconfig; hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
hashes_t *hashes = hashcat_ctx->hashes; hashes_t *hashes = hashcat_ctx->hashes;
@ -909,7 +907,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
* bitmaps * bitmaps
*/ */
bitmap_ctx_init (bitmap_ctx, user_options, hashconfig, hashes); bitmap_ctx_init (hashcat_ctx);
/** /**
* cracks-per-time allocate buffer * cracks-per-time allocate buffer
@ -935,7 +933,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
* straight mode init * straight mode init
*/ */
const int rc_combinator_init = combinator_ctx_init (combinator_ctx, user_options, user_options_extra, straight_ctx, dictstat_ctx, wl_data); const int rc_combinator_init = combinator_ctx_init (hashcat_ctx);
if (rc_combinator_init == -1) return -1; if (rc_combinator_init == -1) return -1;
@ -1220,11 +1218,11 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
potfile_write_close (potfile_ctx); potfile_write_close (potfile_ctx);
bitmap_ctx_destroy (bitmap_ctx); bitmap_ctx_destroy (hashcat_ctx);
mask_ctx_destroy (mask_ctx); mask_ctx_destroy (mask_ctx);
combinator_ctx_destroy (combinator_ctx); combinator_ctx_destroy (hashcat_ctx);
straight_ctx_destroy (straight_ctx); straight_ctx_destroy (straight_ctx);