From 286bde422ba00541f13daa3a3ffc1f93fcab3c97 Mon Sep 17 00:00:00 2001 From: philsmd Date: Sun, 27 Dec 2015 09:48:52 +0100 Subject: [PATCH] limit the salt length of -m 22 = Juniper Netscreen/SSG (ScreenOS) to 10 --- src/shared.c | 3 ++- tools/test.pl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared.c b/src/shared.c index 5917569..b6c82c6 100644 --- a/src/shared.c +++ b/src/shared.c @@ -9622,7 +9622,8 @@ 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); - if (salt_len == UINT_MAX) return (PARSER_SALT_LENGTH); + // max. salt length: salt_buf[32] => 32 - 22 (":Administration Tools:") = 10 + if (salt_len > 10) return (PARSER_SALT_LENGTH); salt->salt_len = salt_len; diff --git a/tools/test.pl b/tools/test.pl index eea8da4..7ad8ecd 100755 --- a/tools/test.pl +++ b/tools/test.pl @@ -2516,7 +2516,7 @@ sub passthrough } elsif ($mode == 22) { - my $salt_len = get_random_num (1, 15); + my $salt_len = get_random_num (1, 11); $tmp_hash = gen_hash ($mode, $word_buf, substr ($salt_buf, 0, $salt_len)); } -- 2.25.1