From 02b1a7930bf7c8f7e3263c22a07395ca9804b516 Mon Sep 17 00:00:00 2001
From: Dylan Evans <62859381+fin3ss3g0d@users.noreply.github.com>
Date: Mon, 10 Jun 2024 11:10:09 -0400
Subject: [PATCH] PR comments polish 3

---
 OpenCL/m12150-pure.cl      |  6 ------
 src/modules/module_12150.c | 15 +--------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/OpenCL/m12150-pure.cl b/OpenCL/m12150-pure.cl
index e6d8f56f0..2768ee295 100644
--- a/OpenCL/m12150-pure.cl
+++ b/OpenCL/m12150-pure.cl
@@ -19,12 +19,6 @@
 
 #define SHA512_DIGEST_LENGTH 64
 
-typedef struct shiro1_sha512
-{
-  u32 salt_buf[4];
-  u32 iterations;
-} shiro1_sha512_t;
-
 typedef struct shiro1_sha512_tmp
 {
   u64 dgst[8];
diff --git a/src/modules/module_12150.c b/src/modules/module_12150.c
index 82fb91abe..9f6bd39dd 100644
--- a/src/modules/module_12150.c
+++ b/src/modules/module_12150.c
@@ -47,12 +47,6 @@ u32 module_salt_type         (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 const char *module_st_hash   (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH;         }
 const char *module_st_pass   (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS;         }
 
-typedef struct shiro1_sha512
-{
-  u32 salt_buf[4];
-  u32 iterations;
-} shiro1_sha512_t;
-
 typedef struct shiro1_sha512_tmp
 {
   u64 dgst[8];
@@ -61,13 +55,6 @@ typedef struct shiro1_sha512_tmp
 
 static const char *SIGNATURE_SHIRO1_SHA512 = "$shiro1$SHA-512$";
 
-u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
-{
-  const u64 esalt_size = (const u64) sizeof (shiro1_sha512_t);
-
-  return esalt_size;
-}
-
 u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
 {
   const u64 tmp_size = (const u64) sizeof (shiro1_sha512_tmp_t);
@@ -184,7 +171,7 @@ void module_init (module_ctx_t *module_ctx)
   module_ctx->module_dgst_pos3                = module_dgst_pos3;
   module_ctx->module_dgst_size                = module_dgst_size;
   module_ctx->module_dictstat_disable         = MODULE_DEFAULT;
-  module_ctx->module_esalt_size               = module_esalt_size;
+  module_ctx->module_esalt_size               = MODULE_DEFAULT;
   module_ctx->module_extra_buffer_size        = MODULE_DEFAULT;
   module_ctx->module_extra_tmp_size           = MODULE_DEFAULT;
   module_ctx->module_extra_tuningdb_block     = MODULE_DEFAULT;