Merge pull request #2934 from jtojanen/fix_extra_tmp_size

Assume hashconfig->tmp_size is the element size
3 years ago · 6b485dd3fd
parent 53aec89b09 5c0820b8d3
commit 6b485dd3fd
3 changed files with 2 additions and 3 deletions
--- a/include/types.h
+++ b/include/types.h
@ -987,7 +987,6 @@ typedef struct hashconfig
  u64   hook_extra_param_size;
  u64   hook_salt_size;
  u64   tmp_size;
-  u64   extra_tmp_size;
  u64   hook_size;

  // password length limit
--- a/src/backend.c
+++ b/src/backend.c
@ -14581,7 +14581,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)

      // size_tmps

-      size_tmps = kernel_power_max * (hashconfig->tmp_size + hashconfig->extra_tmp_size);
+      size_tmps = kernel_power_max * hashconfig->tmp_size;

      // size_hooks

--- a/src/hashes.c
+++ b/src/hashes.c
@ -1997,7 +1997,7 @@ int hashes_init_stage4 (hashcat_ctx_t *hashcat_ctx)
      return -1;
    }

-    hashconfig->extra_tmp_size = extra_tmp_size;
+    hashconfig->tmp_size = extra_tmp_size;
  }

  // at this point we no longer need hash_t* structure