projects
/
hashcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added option --stdout to print candidates instead of trying to crack a hash
[hashcat.git]
/
include
/
types.h
diff --git
a/include/types.h
b/include/types.h
index
3b4b8e2
..
2135f1f
100644
(file)
--- a/
include/types.h
+++ b/
include/types.h
@@
-283,6
+283,12
@@
typedef struct
} zip2_t;
} zip2_t;
+typedef struct
+{
+ uint salt_buf[32];
+
+} win8phone_t;
+
typedef struct
{
uint P[256];
typedef struct
{
uint P[256];
@@
-643,8
+649,7
@@
typedef struct
typedef struct
{
typedef struct
{
- u32 KEK[5];
-
+ u32 KEK[4];
u32 lsb[4];
u32 cipher[4];
u32 lsb[4];
u32 cipher[4];
@@
-947,7
+952,7
@@
struct __hc_device_param
uint kernel_accel_min;
uint kernel_accel_max;
uint kernel_power;
uint kernel_accel_min;
uint kernel_accel_max;
uint kernel_power;
- uint kernel_power_user;
+ uint hardware_power;
size_t size_pws;
size_t size_tmps;
size_t size_pws;
size_t size_tmps;
@@
-984,6
+989,12
@@
struct __hc_device_param
uint exec_pos;
double exec_ms[EXEC_CACHE];
uint exec_pos;
double exec_ms[EXEC_CACHE];
+ // workaround cpu spinning
+
+ double exec_us_prev1[EXPECTED_ITERATIONS];
+ double exec_us_prev2[EXPECTED_ITERATIONS];
+ double exec_us_prev3[EXPECTED_ITERATIONS];
+
// this is "current" speed
uint speed_pos;
// this is "current" speed
uint speed_pos;
@@
-1016,13
+1027,13
@@
struct __hc_device_param
cl_kernel kernel_amp;
cl_kernel kernel_tm;
cl_kernel kernel_weak;
cl_kernel kernel_amp;
cl_kernel kernel_tm;
cl_kernel kernel_weak;
+ cl_kernel kernel_memset;
cl_context context;
cl_program program;
cl_program program_mp;
cl_program program_amp;
cl_context context;
cl_program program;
cl_program program_mp;
cl_program program_amp;
- cl_program program_weak;
cl_command_queue command_queue;
cl_command_queue command_queue;
@@
-1064,6
+1075,7
@@
struct __hc_device_param
void *kernel_params_mp_l[PARAMCNT];
void *kernel_params_amp[PARAMCNT];
void *kernel_params_tm[PARAMCNT];
void *kernel_params_mp_l[PARAMCNT];
void *kernel_params_amp[PARAMCNT];
void *kernel_params_tm[PARAMCNT];
+ void *kernel_params_memset[PARAMCNT];
u32 kernel_params_buf32[PARAMCNT];
u32 kernel_params_buf32[PARAMCNT];
@@
-1077,6
+1089,7
@@
struct __hc_device_param
u64 kernel_params_mp_l_buf64[PARAMCNT];
u32 kernel_params_amp_buf32[PARAMCNT];
u64 kernel_params_mp_l_buf64[PARAMCNT];
u32 kernel_params_amp_buf32[PARAMCNT];
+ u32 kernel_params_memset_buf32[PARAMCNT];
};
typedef struct __hc_device_param hc_device_param_t;
};
typedef struct __hc_device_param hc_device_param_t;
@@
-1084,23
+1097,14
@@
typedef struct __hc_device_param hc_device_param_t;
#ifdef HAVE_HWMON
typedef struct
{
#ifdef HAVE_HWMON
typedef struct
{
- union
- {
- #ifdef HAVE_ADL
- HM_ADAPTER_AMD amd;
- #endif
+ HM_ADAPTER_ADL adl;
+ HM_ADAPTER_NVML nvml;
+ HM_ADAPTER_NVAPI nvapi;
- #if defined(HAVE_NVML) || defined(HAVE_NVAPI)
- HM_ADAPTER_NV nv;
- #endif
+ int od_version;
- } adapter_index;
-
- int od_version;
- int fan_supported;
-
- // int busid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs
- // int devid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs
+ int fan_get_supported;
+ int fan_set_supported;
} hm_attrs_t;
#endif // HAVE_HWMON
} hm_attrs_t;
#endif // HAVE_HWMON
@@
-1121,8
+1125,9
@@
typedef struct
* workload specific
*/
* workload specific
*/
+ uint hardware_power_all;
uint kernel_power_all;
uint kernel_power_all;
- float kernel_power_div;
+ u64 kernel_power_final; // we save that so that all divisions are done from the same base
/**
* attack specific
/**
* attack specific
@@
-1167,8
+1172,9
@@
typedef struct
*/
#ifdef HAVE_HWMON
*/
#ifdef HAVE_HWMON
- void *hm_nv;
- void *hm_amd;
+ void *hm_adl;
+ void *hm_nvml;
+ void *hm_nvapi;
hm_attrs_t hm_device[DEVICES_MAX];
#endif
hm_attrs_t hm_device[DEVICES_MAX];
#endif
@@
-1242,11
+1248,10
@@
typedef struct
uint restore_disable;
uint status;
uint status_timer;
uint restore_disable;
uint status;
uint status_timer;
- uint status_automat;
+ uint machine_readable;
uint quiet;
uint force;
uint benchmark;
uint quiet;
uint force;
uint benchmark;
- uint benchmark_repeats;
uint runtime;
uint remove;
uint remove_timer;
uint runtime;
uint remove;
uint remove_timer;
@@
-1342,3
+1347,4
@@
typedef struct
extern hc_global_data_t data;
#endif
extern hc_global_data_t data;
#endif
+