arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-13 03:08:58 +00:00
Code Issues Releases Wiki Activity

fix for autodetect (1)

Browse Source
This commit is contained in:
Gabriele Gristina 2021-06-06 12:29:07 +02:00
parent ced9b0c6f8
commit 75d135bf7d
4 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -189,7 +189,6 @@ endif
## because LZMA SDK
ifeq ($(CC),clang)
CFLAGS += -Wno-enum-conversion
CFLAGS += -Wno-typedef-redefinition
endif
## because ZLIB

51
src/hashcat.c
View File

@ -1444,11 +1444,18 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
int *modes_buf = (int *) hccalloc (MODULE_HASH_MODES_MAXIMUM, sizeof (int));
if (!modes_buf) return -1;
if (modes_buf == NULL) return -1;
const int modes_cnt = autodetect_hashmodes (hashcat_ctx, modes_buf);
if (modes_cnt > 0)
if (modes_cnt <= 0)
{
if (user_options->show == false) event_log_error (hashcat_ctx, "No hash-mode matches the structure of the input hash.");
return -1;
}
if (modes_cnt > 1)
{
event_log_info (hashcat_ctx, "The following %d hash-mode match the structure of your input hash:", modes_cnt);
event_log_info (hashcat_ctx, NULL);
@ -1463,35 +1470,33 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
{
event_log_info (hashcat_ctx, "%7u | %-51s | %s", hashcat_ctx->hashconfig->hash_mode, hashcat_ctx->hashconfig->hash_name, strhashcategory (hashcat_ctx->hashconfig->hash_category));
if (modes_cnt != 1) hashconfig_destroy (hashcat_ctx); // keep for later
hashconfig_destroy (hashcat_ctx);
}
}
event_log_info (hashcat_ctx, NULL);
if (modes_cnt > 1)
{
event_log_error (hashcat_ctx, "Please specify the hash-mode by argument (-m).");
return -1;
}
else // 1
{
event_log_warning (hashcat_ctx, "You have not specified -m to select the correct hash-mode.");
event_log_warning (hashcat_ctx, "It was automatically selected by hashcat because it was the only hash-mode matching your input hash.");
event_log_warning (hashcat_ctx, "Under no circumstances it is not to be understood as a guarantee this is the right hash-mode.");
event_log_warning (hashcat_ctx, "Do not report hashcat issues if you do not know exactly how the hash was extracted.");
event_log_warning (hashcat_ctx, NULL);
user_options->autodetect = false;
}
}
else
{
if (user_options->show == false) event_log_error (hashcat_ctx, "No hash-mode matches the structure of the input hash.");
event_log_error (hashcat_ctx, "Please specify the hash-mode by argument (-m).");
return -1;
}
// modes_cnt == 1
user_options->hash_mode = modes_buf[0];
if (hashconfig_init (hashcat_ctx) != 0) return -1;
event_log_warning (hashcat_ctx, "You have not specified -m to select the correct hash-mode.");
event_log_warning (hashcat_ctx, "It was automatically selected by hashcat because it was the only hash-mode matching your input hash:");
event_log_warning (hashcat_ctx, "\n%u | %s | %s\n", hashcat_ctx->hashconfig->hash_mode, hashcat_ctx->hashconfig->hash_name, strhashcategory (hashcat_ctx->hashconfig->hash_category));
event_log_warning (hashcat_ctx, "Under no circumstances it is not to be understood as a guarantee this is the right hash-mode.");
event_log_warning (hashcat_ctx, "Do not report hashcat issues if you do not know exactly how the hash was extracted.");
event_log_warning (hashcat_ctx, NULL);
hashconfig_destroy (hashcat_ctx);
user_options->autodetect = false;
}
/**

2
src/terminal.c
View File

@ -68,7 +68,7 @@ void welcome_screen (hashcat_ctx_t *hashcat_ctx, const char *version_tag)
event_log_info (hashcat_ctx, "%s (%s) starting in progress-only mode...", PROGNAME, version_tag);
event_log_info (hashcat_ctx, NULL);
}
else if (user_options->autodetect == true)
else if (user_options->hash_mode == 0 && user_options->hash_mode_chgd == false)
{
event_log_info (hashcat_ctx, "%s (%s) starting in autodetect mode...", PROGNAME, version_tag);
event_log_info (hashcat_ctx, NULL);

13
src/user_options.c
View File

@ -665,11 +665,6 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1;
}
if (user_options->hash_mode == 0 && user_options->hash_mode_chgd == false)
{
user_options->autodetect = true;
}
if (user_options->outfile_format == 0)
{
event_log_error (hashcat_ctx, "Invalid --outfile-format value specified.");
@ -1898,6 +1893,14 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
{
user_options->potfile_disable = true;
}
if (user_options->stdout_flag == false)
{
if (user_options->hash_mode == 0 && user_options->hash_mode_chgd == false)
{
user_options->autodetect = true;
}
}
}
void user_options_postprocess (hashcat_ctx_t *hashcat_ctx)