arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 11:28:15 +00:00
Code Issues Releases Wiki Activity

#234: increase max. salt length to 28 for -m 22 = Juniper Netscreen/SSG (ScreenOS)

Browse Source
This commit is contained in:
philsmd 2016-03-07 15:52:50 +01:00
parent 64897e78a6
commit 3c1e05aaf3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/shared.h
View File

@ -718,9 +718,9 @@ extern hc_thread_mutex_t mux_display;
#define DISPLAY_LEN_MIN_21H 32 + 1 + 2 #define DISPLAY_LEN_MIN_21H 32 + 1 + 2
#define DISPLAY_LEN_MAX_21H 32 + 1 + 30 #define DISPLAY_LEN_MAX_21H 32 + 1 + 30
#define DISPLAY_LEN_MIN_22 30 + 1 + 1 #define DISPLAY_LEN_MIN_22 30 + 1 + 1
#define DISPLAY_LEN_MAX_22 30 + 1 + 15 #define DISPLAY_LEN_MAX_22 30 + 1 + 28
#define DISPLAY_LEN_MIN_22H 30 + 1 + 2 #define DISPLAY_LEN_MIN_22H 30 + 1 + 2
#define DISPLAY_LEN_MAX_22H 30 + 1 + 30 #define DISPLAY_LEN_MAX_22H 30 + 1 + 56
#define DISPLAY_LEN_MIN_23 32 + 1 + 0 #define DISPLAY_LEN_MIN_23 32 + 1 + 0
#define DISPLAY_LEN_MAX_23 32 + 1 + 23 #define DISPLAY_LEN_MAX_23 32 + 1 + 23
#define DISPLAY_LEN_MIN_101 5 + 28 #define DISPLAY_LEN_MIN_101 5 + 28

6
src/shared.c
View File

@ -9880,8 +9880,10 @@ int netscreen_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
salt_len = parse_and_store_salt (salt_buf_ptr, salt_buf, salt_len); salt_len = parse_and_store_salt (salt_buf_ptr, salt_buf, salt_len);
// max. salt length: salt_buf[32] => 32 - 22 (":Administration Tools:") = 10 // max. salt length: 55 (max for MD5) - 22 (":Administration Tools:") - 1 (0x80) = 32
if (salt_len > 10) return (PARSER_SALT_LENGTH); // 32 - 4 bytes (to fit w0lr for all attack modes) = 28
if (salt_len > 28) return (PARSER_SALT_LENGTH);
salt->salt_len = salt_len; salt->salt_len = salt_len;