arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-22 13:40:56 +00:00
Code Issues Releases Wiki Activity

Fix function declaration in -m 27800 kernel and some typos in MurMur based modules

Browse Source
This commit is contained in:
Jens Steube 2021-11-02 08:40:03 +01:00
parent 89cd5bd78b
commit 518ddeb53a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCL/m27800_a0-optimized.cl
View File

@ -15,7 +15,7 @@
#include "inc_simd.cl" #include "inc_simd.cl"
#endif #endif
inline u32 Murmur32_Scramble(u32 k) DECLSPEC u32 Murmur32_Scramble(u32 k)
{ {
k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17);
return (k * 0x1B873593); return (k * 0x1B873593);

2
OpenCL/m27800_a1-optimized.cl
View File

@ -13,7 +13,7 @@
#include "inc_simd.cl" #include "inc_simd.cl"
#endif #endif
inline u32 Murmur32_Scramble(u32 k) DECLSPEC u32 Murmur32_Scramble(u32 k)
{ {
k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17);
return (k * 0x1B873593); return (k * 0x1B873593);

2
OpenCL/m27800_a3-optimized.cl
View File

@ -13,7 +13,7 @@
#include "inc_simd.cl" #include "inc_simd.cl"
#endif #endif
inline u32x Murmur32_Scramble(u32x k) DECLSPEC u32x Murmur32_Scramble(u32x k)
{ {
k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17); k = (k * 0x16A88000) | ((k * 0xCC9E2D51) >> 17);
return (k * 0x1B873593); return (k * 0x1B873593);

8
src/modules/module_25700.c
View File

@ -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) 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) 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) 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)

10
src/modules/module_27800.c
View File

@ -21,7 +21,7 @@ static const char *HASH_NAME = "MurmurHash3";
static const u64 KERN_TYPE = 27800; static const u64 KERN_TYPE = 27800;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE;
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE 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 u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
static const char *ST_PASS = "hashcat"; static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "23e93f65:00000000"; 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) 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) 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) 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)