|
|
|
@ -944,8 +944,7 @@ void hash_info (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
{
|
|
|
|
|
char *modulefile = (char *) hcmalloc (HCBUFSIZ_TINY);
|
|
|
|
|
|
|
|
|
|
if (user_options->machine_readable == true)
|
|
|
|
|
printf("{ ");
|
|
|
|
|
if (user_options->machine_readable == true) printf ("{ ");
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < MODULE_HASH_MODES_MAXIMUM; i++)
|
|
|
|
|
{
|
|
|
|
@ -970,8 +969,7 @@ void hash_info (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->machine_readable == true)
|
|
|
|
|
printf(" }");
|
|
|
|
|
if (user_options->machine_readable == true) printf (" }");
|
|
|
|
|
|
|
|
|
|
hcfree (modulefile);
|
|
|
|
|
}
|
|
|
|
@ -1789,17 +1787,28 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
printf ("{ \"session\": \"%s\",", hashcat_status->session);
|
|
|
|
|
printf (" \"guess\": {");
|
|
|
|
|
if (hashcat_status->guess_base)
|
|
|
|
|
{
|
|
|
|
|
printf (" \"guess_base\": \"%s\",", hashcat_status->guess_base);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf (" \"guess_base\": null,");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf (" \"guess_base_count\": %u,", hashcat_status->guess_base_count);
|
|
|
|
|
printf (" \"guess_base_offset\": %u,", hashcat_status->guess_base_offset);
|
|
|
|
|
printf (" \"guess_base_percent\": %.02f,", hashcat_status->guess_base_percent);
|
|
|
|
|
printf (" \"guess_mask_length\": %u,", hashcat_status->guess_mask_length);
|
|
|
|
|
|
|
|
|
|
if (hashcat_status->guess_mod)
|
|
|
|
|
{
|
|
|
|
|
printf (" \"guess_mod\": \"%s\",", hashcat_status->guess_mod);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf (" \"guess_mod\": null,");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf (" \"guess_mod_count\": %u,", hashcat_status->guess_mod_count);
|
|
|
|
|
printf (" \"guess_mod_offset\": %u,", hashcat_status->guess_mod_offset);
|
|
|
|
|
printf (" \"guess_mod_percent\": %.02f,", hashcat_status->guess_mod_percent);
|
|
|
|
|