arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00
Code Issues Releases Wiki Activity

added device type

Browse Source
This commit is contained in:
Dávid Bolvanský 2022-03-18 11:37:35 +01:00
parent 100cd5fea4
commit 50aea559c5
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/status.h
View File

@ -88,6 +88,7 @@ int status_get_innerloop_left_dev (const hashcat_ctx_t *hash
int status_get_iteration_pos_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); int status_get_iteration_pos_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx);
int status_get_iteration_left_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); int status_get_iteration_left_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx);
char *status_get_device_name (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx); char *status_get_device_name (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx);
cl_device_type status_get_device_type (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx);
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
int status_get_brain_session (const hashcat_ctx_t *hashcat_ctx); int status_get_brain_session (const hashcat_ctx_t *hashcat_ctx);
int status_get_brain_attack (const hashcat_ctx_t *hashcat_ctx); int status_get_brain_attack (const hashcat_ctx_t *hashcat_ctx);

1
include/types.h
View File

@ -2587,6 +2587,7 @@ typedef struct device_info
int iteration_pos_dev; int iteration_pos_dev;
int iteration_left_dev; int iteration_left_dev;
char *device_name; char *device_name;
cl_device_type device_type;
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
int brain_link_client_id_dev; int brain_link_client_id_dev;
int brain_link_status_dev; int brain_link_status_dev;

1
src/hashcat.c
View File

@ -2018,6 +2018,7 @@ int hashcat_get_status (hashcat_ctx_t *hashcat_ctx, hashcat_status_t *hashcat_st
device_info->iteration_pos_dev = status_get_iteration_pos_dev (hashcat_ctx, device_id); device_info->iteration_pos_dev = status_get_iteration_pos_dev (hashcat_ctx, device_id);
device_info->iteration_left_dev = status_get_iteration_left_dev (hashcat_ctx, device_id); device_info->iteration_left_dev = status_get_iteration_left_dev (hashcat_ctx, device_id);
device_info->device_name = status_get_device_name (hashcat_ctx, device_id); device_info->device_name = status_get_device_name (hashcat_ctx, device_id);
device_info->device_type = status_get_device_type (hashcat_ctx, device_id);
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
device_info->brain_link_client_id_dev = status_get_brain_link_client_id_dev (hashcat_ctx, device_id); device_info->brain_link_client_id_dev = status_get_brain_link_client_id_dev (hashcat_ctx, device_id);
device_info->brain_link_status_dev = status_get_brain_link_status_dev (hashcat_ctx, device_id); device_info->brain_link_status_dev = status_get_brain_link_status_dev (hashcat_ctx, device_id);

9
src/status.c
View File

@ -1838,6 +1838,15 @@ char *status_get_device_name (const hashcat_ctx_t *hashcat_ctx, const int backen
return device_param->device_name; return device_param->device_name;
} }
cl_device_type status_get_device_type (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx)
{
const backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
return device_param->opencl_device_type;
}
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
int status_get_brain_link_client_id_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx) int status_get_brain_link_client_id_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx)
{ {

7
src/terminal.c
View File

@ -1660,7 +1660,12 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
} }
printf (" { \"device_id\": %d,", device_id + 1); printf (" { \"device_id\": %d,", device_id + 1);
printf (" { \"device_name\": \"%s\",", device_info->device_name); printf (" \"device_name\": \"%s\",", device_info->device_name);
const char *device_type_desc = ((device_info->device_type & CL_DEVICE_TYPE_CPU) ? "CPU" :
((device_info->device_type & CL_DEVICE_TYPE_GPU) ? "GPU" : "Accelerator"));
printf(" \"device_type\": \"%s\",", device_type_desc);
printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000)); printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000));
if (hwmon_ctx->enabled == true) if (hwmon_ctx->enabled == true)