diff --git a/src/shared.c b/src/shared.c
index 59175696a..b6c82c688 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 eea8da41d..7ad8ecdf6 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));
     }