mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-26 01:50:10 +00:00
Merge branch 'hashcat:master' into master
This commit is contained in:
commit
f6e9f5414d
@ -7093,7 +7093,7 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
if (hip_runtimeVersion < 404)
|
||||
{
|
||||
event_log_warning (hashcat_ctx, "Unsupported AMD HIP runtime version '%d' detected! Falling back to OpenCL...", hip_runtimeVersion);
|
||||
event_log_warning (hashcat_ctx, "Unsupported AMD HIP runtime version '%d.%d' detected! Falling back to OpenCL...", hip_runtimeVersion / 100, hip_runtimeVersion % 10);
|
||||
event_log_warning (hashcat_ctx, NULL);
|
||||
|
||||
rc_hip_init = -1;
|
||||
@ -7116,7 +7116,11 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
|
||||
// we need to wait for 4.4 to be released to continue here
|
||||
// ignore this backend
|
||||
|
||||
event_log_warning (hashcat_ctx, "Unsupported AMD HIP runtime version '%d' detected! Falling back to OpenCL...", hip_runtimeVersion);
|
||||
int hip_version_major = (hip_runtimeVersion - 0) / 10000000;
|
||||
int hip_version_minor = (hip_runtimeVersion - (hip_version_major * 10000000)) / 100000;
|
||||
int hip_version_patch = (hip_runtimeVersion - (hip_version_major * 10000000) - (hip_version_minor * 100000));
|
||||
|
||||
event_log_warning (hashcat_ctx, "Unsupported AMD HIP runtime version '%d.%d.%d' detected! Falling back to OpenCL...", hip_version_major, hip_version_minor, hip_version_patch);
|
||||
event_log_warning (hashcat_ctx, NULL);
|
||||
|
||||
rc_hip_init = -1;
|
||||
|
20
src/main.c
20
src/main.c
@ -1059,10 +1059,30 @@ static void main_selftest_finished (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, MAY
|
||||
event_log_info_nn (hashcat_ctx, "Finished self-test");
|
||||
}
|
||||
|
||||
static void main_autotune_starting (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, MAYBE_UNUSED const void *buf, MAYBE_UNUSED const size_t len)
|
||||
{
|
||||
const user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
if (user_options->quiet == true) return;
|
||||
|
||||
event_log_info_nn (hashcat_ctx, "Starting autotune. Please be patient...");
|
||||
}
|
||||
|
||||
static void main_autotune_finished (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, MAYBE_UNUSED const void *buf, MAYBE_UNUSED const size_t len)
|
||||
{
|
||||
const user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
if (user_options->quiet == true) return;
|
||||
|
||||
event_log_info_nn (hashcat_ctx, "Finished autotune");
|
||||
}
|
||||
|
||||
static void event (const u32 id, hashcat_ctx_t *hashcat_ctx, const void *buf, const size_t len)
|
||||
{
|
||||
switch (id)
|
||||
{
|
||||
case EVENT_AUTOTUNE_FINISHED: main_autotune_finished (hashcat_ctx, buf, len); break;
|
||||
case EVENT_AUTOTUNE_STARTING: main_autotune_starting (hashcat_ctx, buf, len); break;
|
||||
case EVENT_SELFTEST_FINISHED: main_selftest_finished (hashcat_ctx, buf, len); break;
|
||||
case EVENT_SELFTEST_STARTING: main_selftest_starting (hashcat_ctx, buf, len); break;
|
||||
case EVENT_AUTODETECT_FINISHED: main_autodetect_finished (hashcat_ctx, buf, len); break;
|
||||
|
@ -117,7 +117,7 @@ void goodbye_screen (hashcat_ctx_t *hashcat_ctx, const time_t proc_start, const
|
||||
if (user_options->identify == true) return;
|
||||
|
||||
char start_buf[32]; memset (start_buf, 0, sizeof (start_buf));
|
||||
char stop_buf[32]; memset (start_buf, 0, sizeof (stop_buf));
|
||||
char stop_buf[32]; memset (stop_buf, 0, sizeof (stop_buf));
|
||||
|
||||
event_log_info_nn (hashcat_ctx, "Started: %s", ctime_r (&proc_start, start_buf));
|
||||
event_log_info_nn (hashcat_ctx, "Stopped: %s", ctime_r (&proc_stop, stop_buf));
|
||||
|
Loading…
Reference in New Issue
Block a user