arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Hash-Info: don't show Salt.Len.Min, Salt.Len.Max and Hashes.w/.Same.Salt if salt_type is not SALT_TYPE_GENERIC or SALT_TYPE_EMBEDDED

Browse Source
pull/3724/head
Gabriele Gristina 1 year ago
parent 1ea8ff2ec2
commit 760720f84b
1 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File

82
src/terminal.c
Unescape View File

@ -724,21 +724,25 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
const char *t_salt_desc = (t == SALT_TYPE_EMBEDDED) ? "embedded" : (t == SALT_TYPE_GENERIC) ? "generic" : "virtual";
u32 t_salt_min = hashconfig->salt_min;
u32 t_salt_max = hashconfig->salt_max;
printf ("\"salt_type\": \"%s\", ", t_salt_desc);
if (user_options->hash_info > 1)
if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
{
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
u32 t_salt_min = hashconfig->salt_min;
u32 t_salt_max = hashconfig->salt_max;
if (user_options->hash_info > 1)
{
t_salt_min *= 2;
t_salt_max *= 2;
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
{
t_salt_min *= 2;
t_salt_max *= 2;
}
}
}
printf ("\"salt_type\": \"%s\", ", t_salt_desc);
printf ("\"salt_len_min\": %u, ", t_salt_min);
printf ("\"salt_len_max\": %u, ", t_salt_max);
printf ("\"salt_len_min\": %u, ", t_salt_min);
printf ("\"salt_len_max\": %u, ", t_salt_max);
}
}
if ((hashconfig->has_pure_kernel) && (hashconfig->has_optimized_kernel))
@ -771,17 +775,20 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
printf ("\"hashes_count_min\": %d, ", hashconfig->hashes_count_min);
printf ("\"hashes_count_max\": %d, ", hashconfig->hashes_count_max);
bool multi_hash_same_salt = true;
if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
{
if (hashconfig->attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL)
bool multi_hash_same_salt = true;
if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
{
multi_hash_same_salt = false;
if (hashconfig->attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL)
{
multi_hash_same_salt = false;
}
}
}
printf ("\"hashes_with_same_salt\": %s, ", (multi_hash_same_salt == true) ? "true" : "false");
printf ("\"hashes_with_same_salt\": %s, ", (multi_hash_same_salt == true) ? "true" : "false");
}
}
if ((hashconfig->st_hash != NULL) && (hashconfig->st_pass != NULL))
@ -951,21 +958,25 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
const char *t_salt_desc = (t == SALT_TYPE_EMBEDDED) ? "Embedded\0" : (t == SALT_TYPE_GENERIC) ? "Generic\0" : "Virtual\0";
u32 t_salt_min = hashconfig->salt_min;
u32 t_salt_max = hashconfig->salt_max;
event_log_info (hashcat_ctx, " Salt.Type...........: %s", t_salt_desc);
if (user_options->hash_info > 1)
if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
{
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
u32 t_salt_min = hashconfig->salt_min;
u32 t_salt_max = hashconfig->salt_max;
if (user_options->hash_info > 1)
{
t_salt_min *= 2;
t_salt_max *= 2;
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
{
t_salt_min *= 2;
t_salt_max *= 2;
}
}
}
event_log_info (hashcat_ctx, " Salt.Type...........: %s", t_salt_desc);
event_log_info (hashcat_ctx, " Salt.Len.Min........: %u", t_salt_min);
event_log_info (hashcat_ctx, " Salt.Len.Max........: %u", t_salt_max);
event_log_info (hashcat_ctx, " Salt.Len.Min........: %u", t_salt_min);
event_log_info (hashcat_ctx, " Salt.Len.Max........: %u", t_salt_max);
}
}
if ((hashconfig->has_pure_kernel) && (hashconfig->has_optimized_kernel))
@ -998,17 +1009,20 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
event_log_info (hashcat_ctx, " Hashes.Count.Min....: %d", hashconfig->hashes_count_min);
event_log_info (hashcat_ctx, " Hashes.Count.Max....: %d", hashconfig->hashes_count_max);
bool multi_hash_same_salt = true;
if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
{
if (hashconfig->attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL)
bool multi_hash_same_salt = true;
if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
{
multi_hash_same_salt = false;
if (hashconfig->attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL)
{
multi_hash_same_salt = false;
}
}
}
event_log_info (hashcat_ctx, " Hashes.w/.Same.Salt.: %s", (multi_hash_same_salt == true) ? "Allowed" : "Not allowed");
event_log_info (hashcat_ctx, " Hashes.w/.Same.Salt.: %s", (multi_hash_same_salt == true) ? "Allowed" : "Not allowed");
}
}
if ((hashconfig->st_hash != NULL) && (hashconfig->st_pass != NULL))

Write Preview
Loading…
Cancel
Save