X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=include%2Fshared.h;h=34824d366745c27d3f266d916191fa94ef4ad0aa;hb=9a970c095551bc563c6cc93c8c5860c7ce1e374e;hp=03316e8f9f620974734c49bc481e7986b753e88a;hpb=53a4e0cbb795c4a8556802a2027bc48f9a3bacde;p=hashcat.git diff --git a/include/shared.h b/include/shared.h index 03316e8..34824d3 100644 --- a/include/shared.h +++ b/include/shared.h @@ -114,13 +114,10 @@ static inline int CPU_ISSET (int num, cpu_set_t *cs) { return (cs->count & (1 < * temperature management */ -#if _WIN #include "ext_ADL.h" #include "ext_nvapi.h" -#else -#include "ext_ADL.h" #include "ext_nvml.h" -#endif +#include "ext_xnvctrl.h" /** * shared stuff @@ -358,6 +355,7 @@ extern hc_thread_mutex_t mux_display; #define HT_13400 "Keepass 1 (AES/Twofish) and Keepass 2 (AES)" #define HT_13500 "PeopleSoft PS_TOKEN" #define HT_13600 "WinZip" +#define HT_13800 "Windows 8+ phone PIN/Password" #define HT_00011 "Joomla < 2.5.18" #define HT_00012 "PostgreSQL" @@ -722,6 +720,8 @@ extern hc_thread_mutex_t mux_display; #define DISPLAY_LEN_MAX_13500 40 + 1 + 1024 #define DISPLAY_LEN_MIN_13600 6 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 16 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 20 + 1 + 7 #define DISPLAY_LEN_MAX_13600 6 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 32 + 1 + 4 + 1 + 4 + 1 + 8192 + 1 + 20 + 1 + 7 +#define DISPLAY_LEN_MIN_13800 64 + 1 + 256 +#define DISPLAY_LEN_MAX_13800 64 + 1 + 256 #define DISPLAY_LEN_MIN_11 32 + 1 + 16 #define DISPLAY_LEN_MAX_11 32 + 1 + 32 @@ -838,6 +838,7 @@ extern hc_thread_mutex_t mux_display; #define HASH_TYPE_BSDICRYPT 48 #define HASH_TYPE_RAR3HP 49 #define HASH_TYPE_KRB5TGS 50 +#define HASH_TYPE_STDOUT 51 #define KERN_TYPE_MD5 0 #define KERN_TYPE_MD5_PWSLT 10 @@ -992,6 +993,7 @@ extern hc_thread_mutex_t mux_display; #define KERN_TYPE_KEEPASS 13400 #define KERN_TYPE_PSTOKEN 13500 #define KERN_TYPE_ZIP2 13600 +#define KERN_TYPE_WIN8PHONE 13800 /** * signatures @@ -1125,6 +1127,7 @@ extern hc_thread_mutex_t mux_display; #define ROUNDS_AXCRYPT 10000 #define ROUNDS_KEEPASS 6000 #define ROUNDS_ZIP2 1000 +#define ROUNDS_STDOUT 0 /** * salt types @@ -1216,7 +1219,6 @@ extern hc_thread_mutex_t mux_display; * digests */ -#define DGST_SIZE_0 0 #define DGST_SIZE_4_2 (2 * sizeof (uint)) // 8 #define DGST_SIZE_4_4 (4 * sizeof (uint)) // 16 #define DGST_SIZE_4_5 (5 * sizeof (uint)) // 20 @@ -1434,36 +1436,36 @@ void fsync (int fd); #ifdef HAVE_HWMON -#if defined(HAVE_NVML) || defined(HAVE_NVAPI) -int hm_get_adapter_index_nv (HM_ADAPTER_NV nvGPUHandle[DEVICES_MAX]); -#endif +int get_adapters_num_adl (void *adl, int *iNumberAdapters); + +int hm_get_adapter_index_adl (hm_attrs_t *hm_device, u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo); -#ifdef HAVE_ADL -int get_adapters_num_amd (void *adl, int *iNumberAdapters); +int hm_get_adapter_index_nvapi (HM_ADAPTER_NVAPI nvapiGPUHandle[DEVICES_MAX]); -int hm_get_adapter_index_amd (hm_attrs_t *hm_device, u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo); +int hm_get_adapter_index_nvml (HM_ADAPTER_NVML nvmlGPUHandle[DEVICES_MAX]); -LPAdapterInfo hm_get_adapter_info_amd (void *adl, int iNumberAdapters); +LPAdapterInfo hm_get_adapter_info_adl (void *adl, int iNumberAdapters); u32 *hm_get_list_valid_adl_adapters (int iNumberAdapters, int *num_adl_adapters, LPAdapterInfo lpAdapterInfo); int hm_get_overdrive_version (void *adl, hm_attrs_t *hm_device, u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo); int hm_check_fanspeed_control (void *adl, hm_attrs_t *hm_device, u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo); -// int hm_get_device_num (void *adl, HM_ADAPTER_AMD hm_adapter_index, int *hm_device_num); +// int hm_get_device_num (void *adl, HM_ADAPTER_ADL hm_adapter_index, int *hm_device_num); // void hm_get_opencl_busid_devid (hm_attrs_t *hm_device, uint opencl_num_devices, cl_device_id *devices); -#endif // HAVE_ADL int hm_get_threshold_slowdown_with_device_id (const uint device_id); +int hm_get_threshold_shutdown_with_device_id (const uint device_id); int hm_get_temperature_with_device_id (const uint device_id); int hm_get_fanspeed_with_device_id (const uint device_id); -int hm_get_maxbuslanes_with_device_id (const uint device_id); -int hm_get_currentbuslanes_with_device_id (const uint device_id); +int hm_get_fanpolicy_with_device_id (const uint device_id); +int hm_get_buslanes_with_device_id (const uint device_id); int hm_get_utilization_with_device_id (const uint device_id); int hm_get_memoryspeed_with_device_id (const uint device_id); int hm_get_corespeed_with_device_id (const uint device_id); - -int hm_set_fanspeed_with_device_id_amd (const uint device_id, const int fanspeed); +int hm_get_throttle_with_device_id (const uint device_id); +int hm_set_fanspeed_with_device_id_adl (const uint device_id, const int fanspeed, const int fanpolicy); +int hm_set_fanspeed_with_device_id_xnvctrl (const uint device_id, const int fanspeed); void hm_device_val_to_str (char *target_buf, int max_buf_size, char *suffix, int value); #endif // HAVE_HWMON @@ -1653,6 +1655,7 @@ int veracrypt_parse_hash_200000 (char *input_buf, uint input_len, hash_t *hash int veracrypt_parse_hash_500000 (char *input_buf, uint input_len, hash_t *hash_buf); int veracrypt_parse_hash_327661 (char *input_buf, uint input_len, hash_t *hash_buf); int veracrypt_parse_hash_655331 (char *input_buf, uint input_len, hash_t *hash_buf); +int win8phone_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf); void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources); void writeProgramBin (char *dst, u8 *binary, size_t binary_size);