diff --git a/OpenCL/m27800_a0-optimized.cl b/OpenCL/m27800_a0-optimized.cl index 72963a900..97aca0314 100644 --- a/OpenCL/m27800_a0-optimized.cl +++ b/OpenCL/m27800_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -inline u32 Murmur32_Scramble(u32 k) +DECLSPEC u32 Murmur32_Scramble(u32 k) { k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); return (k * 0x1B873593); diff --git a/OpenCL/m27800_a1-optimized.cl b/OpenCL/m27800_a1-optimized.cl index 37be3487c..69833f53f 100644 --- a/OpenCL/m27800_a1-optimized.cl +++ b/OpenCL/m27800_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -inline u32 Murmur32_Scramble(u32 k) +DECLSPEC u32 Murmur32_Scramble(u32 k) { k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); return (k * 0x1B873593); diff --git a/OpenCL/m27800_a3-optimized.cl b/OpenCL/m27800_a3-optimized.cl index bca5818bf..92afdc899 100644 --- a/OpenCL/m27800_a3-optimized.cl +++ b/OpenCL/m27800_a3-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -inline u32x Murmur32_Scramble(u32x k) +DECLSPEC u32x Murmur32_Scramble(u32x k) { k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); return (k * 0x1B873593); diff --git a/src/modules/module_25700.c b/src/modules/module_25700.c index 7573e81ce..b8aa24ad2 100644 --- a/src/modules/module_25700.c +++ b/src/modules/module_25700.c @@ -43,16 +43,16 @@ const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, u32 module_salt_max (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 u32 pw_max = 4; + const u32 salt_max = 4; - return pw_max; + return salt_max; } u32 module_salt_min (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 u32 pw_min = 4; + const u32 salt_min = 4; - return pw_min; + return salt_min; } int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) diff --git a/src/modules/module_27800.c b/src/modules/module_27800.c index a7a33201b..d72e9157b 100644 --- a/src/modules/module_27800.c +++ b/src/modules/module_27800.c @@ -21,7 +21,7 @@ static const char *HASH_NAME = "MurmurHash3"; static const u64 KERN_TYPE = 27800; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE - |OPTS_TYPE_SUGGEST_KG; + | OPTS_TYPE_SUGGEST_KG; static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; static const char *ST_PASS = "hashcat"; static const char *ST_HASH = "23e93f65:00000000"; @@ -43,16 +43,16 @@ const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, u32 module_salt_max (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 u32 pw_max = 4; + const u32 salt_max = 4; - return pw_max; + return salt_max; } u32 module_salt_min (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 u32 pw_min = 4; + const u32 salt_min = 4; - return pw_min; + return salt_min; } int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)