From 29942f5fb333d483e2781fef956d42e55978dddc Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 6 Oct 2016 21:03:10 +0200 Subject: [PATCH] Update rp.c function parameters --- include/rp.h | 6 +++--- src/rp.c | 8 ++++++-- src/straight.c | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/rp.h b/include/rp.h index 98dc5e23d..5b1f66cc1 100644 --- a/include/rp.h +++ b/include/rp.h @@ -12,7 +12,7 @@ #define INCR_RULES 10000 -#define RULES_MAX 32 +#define RULES_MAX 32 #define MAX_KERNEL_RULES (RULES_MAX - 1) bool class_num (const u8 c); @@ -30,7 +30,7 @@ int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule); bool kernel_rules_has_noop (const kernel_rule_t *kernel_rules_buf, const u32 kernel_rules_cnt); -int kernel_rules_load (kernel_rule_t **out_buf, u32 *out_cnt, const user_options_t *user_options); -int kernel_rules_generate (kernel_rule_t **out_buf, u32 *out_cnt, const user_options_t *user_options); +int kernel_rules_load (hashcat_ctx_t *hashcat_ctx, kernel_rule_t **out_buf, u32 *out_cnt); +int kernel_rules_generate (hashcat_ctx_t *hashcat_ctx, kernel_rule_t **out_buf, u32 *out_cnt); #endif // _RP_H diff --git a/src/rp.c b/src/rp.c index ca537823b..82c4224ae 100644 --- a/src/rp.c +++ b/src/rp.c @@ -714,8 +714,10 @@ bool kernel_rules_has_noop (const kernel_rule_t *kernel_rules_buf, const u32 ker return false; } -int kernel_rules_load (kernel_rule_t **out_buf, u32 *out_cnt, const user_options_t *user_options) +int kernel_rules_load (hashcat_ctx_t *hashcat_ctx, kernel_rule_t **out_buf, u32 *out_cnt) { + const user_options_t *user_options = hashcat_ctx->user_options; + /** * load rules */ @@ -872,8 +874,10 @@ int kernel_rules_load (kernel_rule_t **out_buf, u32 *out_cnt, const user_options return 0; } -int kernel_rules_generate (kernel_rule_t **out_buf, u32 *out_cnt, const user_options_t *user_options) +int kernel_rules_generate (hashcat_ctx_t *hashcat_ctx, kernel_rule_t **out_buf, u32 *out_cnt) { + const user_options_t *user_options = hashcat_ctx->user_options; + u32 kernel_rules_cnt = 0; kernel_rule_t *kernel_rules_buf = mycalloc (user_options->rp_gen, sizeof (kernel_rule_t)); diff --git a/src/straight.c b/src/straight.c index 06e108fc3..636dd75d6 100644 --- a/src/straight.c +++ b/src/straight.c @@ -67,13 +67,13 @@ int straight_ctx_init (hashcat_ctx_t *hashcat_ctx) { if (user_options->rp_files_cnt) { - const int rc_kernel_load = kernel_rules_load (&straight_ctx->kernel_rules_buf, &straight_ctx->kernel_rules_cnt, user_options); + const int rc_kernel_load = kernel_rules_load (hashcat_ctx, &straight_ctx->kernel_rules_buf, &straight_ctx->kernel_rules_cnt); if (rc_kernel_load == -1) return -1; } else if (user_options->rp_gen) { - const int rc_kernel_generate = kernel_rules_generate (&straight_ctx->kernel_rules_buf, &straight_ctx->kernel_rules_cnt, user_options); + const int rc_kernel_generate = kernel_rules_generate (hashcat_ctx, &straight_ctx->kernel_rules_buf, &straight_ctx->kernel_rules_cnt); if (rc_kernel_generate == -1) return -1; }