From a02f6f5ad6ee154be1074c234a81738ee7c6515f Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 1 Oct 2016 11:54:00 +0200 Subject: [PATCH] Give all those anonymous structures a name, makes it easier to load the project into VS --- include/ext_ADL.h | 4 +- include/ext_OpenCL.h | 2 +- include/ext_nvapi.h | 10 +-- include/ext_nvml.h | 2 +- include/ext_xnvctrl.h | 2 +- include/interface.h | 142 +++++++++++++++++++++--------------------- include/types.h | 106 +++++++++++++++---------------- 7 files changed, 134 insertions(+), 134 deletions(-) diff --git a/include/ext_ADL.h b/include/ext_ADL.h index 3764c0e28..cc2b56c6b 100644 --- a/include/ext_ADL.h +++ b/include/ext_ADL.h @@ -259,7 +259,7 @@ typedef void* (ADL_API_CALL *ADL_MAIN_MALLOC_CALLBACK )( int ); typedef int HM_ADAPTER_ADL; -typedef struct +typedef struct struct_ADLOD6MemClockState { ADLOD6StateInfo state; ADLOD6PerformanceLevel level; @@ -307,7 +307,7 @@ typedef void *ADL_LIB; typedef HINSTANCE ADL_LIB; #endif -typedef struct +typedef struct hm_adl_lib { ADL_LIB lib; diff --git a/include/ext_OpenCL.h b/include/ext_OpenCL.h index d3e8ac98d..9b56dbaf2 100644 --- a/include/ext_OpenCL.h +++ b/include/ext_OpenCL.h @@ -66,7 +66,7 @@ typedef void *OCL_LIB; typedef HINSTANCE OCL_LIB; #endif -typedef struct +typedef struct hc_opencl_lib { OCL_LIB lib; diff --git a/include/ext_nvapi.h b/include/ext_nvapi.h index 8a2be3804..e4f0fb449 100644 --- a/include/ext_nvapi.h +++ b/include/ext_nvapi.h @@ -156,7 +156,7 @@ typedef enum _NvAPI_Status NVAPI_FIRMWARE_REVISION_NOT_SUPPORTED = -200, // The device's firmware is not supported. } NvAPI_Status; -typedef struct +typedef struct struct_NV_GPU_PERF_POLICIES_INFO_PARAMS_V1 { // total size (of memset) is always: 76 = 0x4c @@ -169,7 +169,7 @@ typedef struct } NV_GPU_PERF_POLICIES_INFO_PARAMS_V1; -typedef struct +typedef struct struct_NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1 { // total size (of memset) is always: 1360 = 0x550 @@ -185,14 +185,14 @@ typedef struct } NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1; -typedef struct +typedef struct struct_NvLevel { NvS32 Level; NvS32 Policy; } NvLevel; -typedef struct +typedef struct struct_NV_GPU_COOLER_LEVELS { NvU32 Version; NvLevel Levels[NVAPI_MAX_COOLER_PER_GPU]; @@ -237,7 +237,7 @@ typedef void *NVAPI_LIB; typedef HINSTANCE NVAPI_LIB; #endif -typedef struct +typedef struct hm_nvapi_lib { NVAPI_LIB lib; diff --git a/include/ext_nvml.h b/include/ext_nvml.h index 61ea35484..ce7df5993 100644 --- a/include/ext_nvml.h +++ b/include/ext_nvml.h @@ -192,7 +192,7 @@ typedef void *NVML_LIB; typedef HINSTANCE NVML_LIB; #endif -typedef struct +typedef struct hm_nvml_lib { NVML_LIB lib; diff --git a/include/ext_xnvctrl.h b/include/ext_xnvctrl.h index f623fc4c6..6ff1e3caf 100644 --- a/include/ext_xnvctrl.h +++ b/include/ext_xnvctrl.h @@ -55,7 +55,7 @@ typedef void *XNVCTRL_LIB; typedef HINSTANCE XNVCTRL_LIB; #endif -typedef struct +typedef struct hm_xnvctrl_lib { void *dpy; diff --git a/include/interface.h b/include/interface.h index 070d3cc2f..9f9ebff1d 100644 --- a/include/interface.h +++ b/include/interface.h @@ -23,13 +23,13 @@ * algo specific */ -typedef struct +typedef struct rar5 { uint iv[4]; } rar5_t; -typedef struct +typedef struct pdf { int V; int R; @@ -50,7 +50,7 @@ typedef struct } pdf_t; -typedef struct +typedef struct wpa { uint pke[25]; uint eapol[64]; @@ -63,7 +63,7 @@ typedef struct } wpa_t; -typedef struct +typedef struct bitcoin_wallet { uint cry_master_buf[64]; uint ckey_buf[64]; @@ -75,7 +75,7 @@ typedef struct } bitcoin_wallet_t; -typedef struct +typedef struct sip { uint salt_buf[30]; uint salt_len; @@ -85,13 +85,13 @@ typedef struct } sip_t; -typedef struct +typedef struct androidfde { uint data[384]; } androidfde_t; -typedef struct +typedef struct ikepsk { uint nr_buf[16]; uint nr_len; @@ -101,7 +101,7 @@ typedef struct } ikepsk_t; -typedef struct +typedef struct netntlm { uint user_len; uint domain_len; @@ -113,7 +113,7 @@ typedef struct } netntlm_t; -typedef struct +typedef struct krb5pa { uint user[16]; uint realm[16]; @@ -123,7 +123,7 @@ typedef struct } krb5pa_t; -typedef struct +typedef struct krb5tgs { uint account_info[512]; uint checksum[4]; @@ -132,7 +132,7 @@ typedef struct } krb5tgs_t; -typedef struct +typedef struct keepass { u32 version; u32 algorithm; @@ -155,7 +155,7 @@ typedef struct } keepass_t; -typedef struct +typedef struct tc { uint salt_buf[16]; uint data_buf[112]; @@ -164,51 +164,51 @@ typedef struct } tc_t; -typedef struct +typedef struct pbkdf2_md5 { uint salt_buf[16]; } pbkdf2_md5_t; -typedef struct +typedef struct pbkdf2_sha1 { uint salt_buf[16]; } pbkdf2_sha1_t; -typedef struct +typedef struct pbkdf2_sha256 { uint salt_buf[16]; } pbkdf2_sha256_t; -typedef struct +typedef struct pbkdf2_sha512 { uint salt_buf[32]; } pbkdf2_sha512_t; -typedef struct +typedef struct agilekey { u8 cipher[1040]; } agilekey_t; -typedef struct +typedef struct rakp { uint salt_buf[128]; uint salt_len; } rakp_t; -typedef struct +typedef struct cloudkey { uint data_len; uint data_buf[512]; } cloudkey_t; -typedef struct +typedef struct office2007 { uint encryptedVerifier[4]; uint encryptedVerifierHash[5]; @@ -217,21 +217,21 @@ typedef struct } office2007_t; -typedef struct +typedef struct office2010 { uint encryptedVerifier[4]; uint encryptedVerifierHash[8]; } office2010_t; -typedef struct +typedef struct office2013 { uint encryptedVerifier[4]; uint encryptedVerifierHash[8]; } office2013_t; -typedef struct +typedef struct oldoffice01 { uint version; uint encryptedVerifier[4]; @@ -240,7 +240,7 @@ typedef struct } oldoffice01_t; -typedef struct +typedef struct oldoffice34 { uint version; uint encryptedVerifier[4]; @@ -249,7 +249,7 @@ typedef struct } oldoffice34_t; -typedef struct +typedef struct pstoken { u32 salt_buf[128]; u32 salt_len; @@ -259,7 +259,7 @@ typedef struct } pstoken_t; -typedef struct +typedef struct zip2 { u32 type; u32 mode; @@ -275,13 +275,13 @@ typedef struct } zip2_t; -typedef struct +typedef struct win8phone { uint salt_buf[32]; } win8phone_t; -typedef struct +typedef struct psafe3 { char signature[4]; u32 salt_buf[8]; @@ -290,14 +290,14 @@ typedef struct } psafe3_t; -typedef struct +typedef struct pdf14_tmp { uint digest[4]; uint out[4]; } pdf14_tmp_t; -typedef struct +typedef struct pdf17l8_tmp { union { @@ -310,19 +310,19 @@ typedef struct } pdf17l8_tmp_t; -typedef struct +typedef struct phpass_tmp { uint digest_buf[4]; } phpass_tmp_t; -typedef struct +typedef struct md5crypt_tmp { uint digest_buf[4]; } md5crypt_tmp_t; -typedef struct +typedef struct sha512crypt_tmp { u64 l_alt_result[8]; @@ -331,7 +331,7 @@ typedef struct } sha512crypt_tmp_t; -typedef struct +typedef struct sha256crypt_tmp { uint alt_result[8]; @@ -340,7 +340,7 @@ typedef struct } sha256crypt_tmp_t; -typedef struct +typedef struct wpa_tmp { uint ipad[5]; uint opad[5]; @@ -350,13 +350,13 @@ typedef struct } wpa_tmp_t; -typedef struct +typedef struct bitcoin_wallet_tmp { u64 dgst[8]; } bitcoin_wallet_tmp_t; -typedef struct +typedef struct dcc2_tmp { uint ipad[5]; uint opad[5]; @@ -366,7 +366,7 @@ typedef struct } dcc2_tmp_t; -typedef struct +typedef struct bcrypt_tmp { uint E[18]; @@ -379,7 +379,7 @@ typedef struct } bcrypt_tmp_t; -typedef struct +typedef struct pwsafe2_tmp { uint digest[2]; @@ -392,19 +392,19 @@ typedef struct } pwsafe2_tmp_t; -typedef struct +typedef struct pwsafe3_tmp { uint digest_buf[8]; } pwsafe3_tmp_t; -typedef struct +typedef struct androidpin_tmp { uint digest_buf[5]; } androidpin_tmp_t; -typedef struct +typedef struct androidfde_tmp { uint ipad[5]; uint opad[5]; @@ -414,7 +414,7 @@ typedef struct } androidfde_tmp_t; -typedef struct +typedef struct tc_tmp { uint ipad[16]; uint opad[16]; @@ -424,7 +424,7 @@ typedef struct } tc_tmp_t; -typedef struct +typedef struct tc64_tmp { u64 ipad[8]; u64 opad[8]; @@ -434,7 +434,7 @@ typedef struct } tc64_tmp_t; -typedef struct +typedef struct agilekey_tmp { uint ipad[5]; uint opad[5]; @@ -444,7 +444,7 @@ typedef struct } agilekey_tmp_t; -typedef struct +typedef struct mywallet_tmp { uint ipad[5]; uint opad[5]; @@ -457,7 +457,7 @@ typedef struct } mywallet_tmp_t; -typedef struct +typedef struct sha1aix_tmp { uint ipad[5]; uint opad[5]; @@ -467,7 +467,7 @@ typedef struct } sha1aix_tmp_t; -typedef struct +typedef struct sha256aix_tmp { uint ipad[8]; uint opad[8]; @@ -477,7 +477,7 @@ typedef struct } sha256aix_tmp_t; -typedef struct +typedef struct sha512aix_tmp { u64 ipad[8]; u64 opad[8]; @@ -487,7 +487,7 @@ typedef struct } sha512aix_tmp_t; -typedef struct +typedef struct lastpass_tmp { uint ipad[8]; uint opad[8]; @@ -497,13 +497,13 @@ typedef struct } lastpass_tmp_t; -typedef struct +typedef struct drupal7_tmp { u64 digest_buf[8]; } drupal7_tmp_t; -typedef struct +typedef struct lotus8_tmp { uint ipad[5]; uint opad[5]; @@ -513,31 +513,31 @@ typedef struct } lotus8_tmp_t; -typedef struct +typedef struct office2007_tmp { uint out[5]; } office2007_tmp_t; -typedef struct +typedef struct office2010_tmp { uint out[5]; } office2010_tmp_t; -typedef struct +typedef struct office2013_tmp { u64 out[8]; } office2013_tmp_t; -typedef struct +typedef struct saph_sha1_tmp { uint digest_buf[5]; } saph_sha1_tmp_t; -typedef struct +typedef struct pbkdf2_md5_tmp { u32 ipad[4]; u32 opad[4]; @@ -547,7 +547,7 @@ typedef struct } pbkdf2_md5_tmp_t; -typedef struct +typedef struct pbkdf2_sha1_tmp { u32 ipad[5]; u32 opad[5]; @@ -557,7 +557,7 @@ typedef struct } pbkdf2_sha1_tmp_t; -typedef struct +typedef struct pbkdf2_sha256_tmp { u32 ipad[8]; u32 opad[8]; @@ -567,7 +567,7 @@ typedef struct } pbkdf2_sha256_tmp_t; -typedef struct +typedef struct pbkdf2_sha512_tmp { u64 ipad[8]; u64 opad[8]; @@ -577,13 +577,13 @@ typedef struct } pbkdf2_sha512_tmp_t; -typedef struct +typedef struct ecryptfs_tmp { u64 out[8]; } ecryptfs_tmp_t; -typedef struct +typedef struct oraclet_tmp { u64 ipad[8]; u64 opad[8]; @@ -593,7 +593,7 @@ typedef struct } oraclet_tmp_t; -typedef struct +typedef struct seven_zip_tmp { uint block[16]; @@ -604,7 +604,7 @@ typedef struct } seven_zip_tmp_t; -typedef struct +typedef struct bsdicrypt_tmp { uint Kc[16]; uint Kd[16]; @@ -613,19 +613,19 @@ typedef struct } bsdicrypt_tmp_t; -typedef struct +typedef struct rar3_tmp { uint dgst[17][5]; } rar3_tmp_t; -typedef struct +typedef struct cram_md5 { uint user[16]; } cram_md5_t; -typedef struct +typedef struct seven_zip { uint iv_buf[4]; uint iv_len; @@ -642,7 +642,7 @@ typedef struct } seven_zip_t; -typedef struct +typedef struct axcrypt_tmp { u32 KEK[4]; u32 lsb[4]; @@ -650,13 +650,13 @@ typedef struct } axcrypt_tmp_t; -typedef struct +typedef struct keepass_tmp { u32 tmp_digest[8]; } keepass_tmp_t; -typedef struct +typedef struct struct_psafe2_hdr { u32 random[2]; u32 hash[5]; @@ -665,7 +665,7 @@ typedef struct } psafe2_hdr; -typedef struct +typedef struct hccap { char essid[36]; diff --git a/include/types.h b/include/types.h index b9379f836..4bb462e97 100644 --- a/include/types.h +++ b/include/types.h @@ -373,7 +373,7 @@ typedef enum parser_rc * structs */ -typedef struct +typedef struct salt { u32 salt_buf[16]; u32 salt_buf_pc[8]; @@ -396,21 +396,21 @@ typedef struct } salt_t; -typedef struct +typedef struct user { char *user_name; u32 user_len; } user_t; -typedef struct +typedef struct hashinfo { user_t *user; char *orighash; } hashinfo_t; -typedef struct +typedef struct hash { void *digest; salt_t *salt; @@ -420,7 +420,7 @@ typedef struct } hash_t; -typedef struct +typedef struct outfile_data { char *file_name; long seek; @@ -428,7 +428,7 @@ typedef struct } outfile_data_t; -typedef struct +typedef struct logfile_ctx { bool enabled; @@ -438,7 +438,7 @@ typedef struct } logfile_ctx_t; -typedef struct +typedef struct hashes { char *hashfile; @@ -468,7 +468,7 @@ typedef struct } hashes_t; -struct _hashconfig +struct hashconfig { char separator; @@ -493,12 +493,12 @@ struct _hashconfig u32 pw_min; u32 pw_max; - int (*parse_func) (char *, u32, hash_t *, const struct _hashconfig *); + int (*parse_func) (char *, u32, hash_t *, const struct hashconfig *); }; -typedef struct _hashconfig hashconfig_t; +typedef struct hashconfig hashconfig_t; -typedef struct +typedef struct pw { u32 i[16]; @@ -510,19 +510,19 @@ typedef struct } pw_t; -typedef struct +typedef struct bf { u32 i; } bf_t; -typedef struct +typedef struct bs_word { u32 b[32]; } bs_word_t; -typedef struct +typedef struct comb { u32 i[8]; @@ -530,14 +530,14 @@ typedef struct } comb_t; -typedef struct +typedef struct cpt { u32 cracked; time_t timestamp; } cpt_t; -typedef struct +typedef struct plain { u32 salt_pos; u32 digest_pos; @@ -547,13 +547,13 @@ typedef struct } plain_t; -typedef struct +typedef struct wordl { u32 word_buf[16]; } wordl_t; -typedef struct +typedef struct wordr { u32 word_buf[1]; @@ -738,7 +738,7 @@ struct __hc_device_param u32 kernel_params_memset_buf32[PARAMCNT]; }; -typedef struct +typedef struct opencl_ctx { bool enabled; @@ -795,7 +795,7 @@ typedef struct aes_context typedef aes_context_t aes_ctx; -typedef struct +typedef struct debugfile_ctx { bool enabled; @@ -805,7 +805,7 @@ typedef struct } debugfile_ctx_t; -typedef struct +typedef struct dictstat { u64 cnt; @@ -819,7 +819,7 @@ typedef struct } dictstat_t; -typedef struct +typedef struct dictstat_ctx { bool enabled; @@ -835,7 +835,7 @@ typedef struct } dictstat_ctx_t; -typedef struct +typedef struct hm_attrs { HM_ADAPTER_ADL adl; HM_ADAPTER_NVML nvml; @@ -849,7 +849,7 @@ typedef struct } hm_attrs_t; -typedef struct +typedef struct loopback_ctx { bool enabled; @@ -858,28 +858,28 @@ typedef struct } loopback_ctx_t; -typedef struct +typedef struct cs { u32 cs_buf[0x100]; u32 cs_len; } cs_t; -typedef struct +typedef struct mf { char mf_buf[0x100]; int mf_len; } mf_t; -typedef struct +typedef struct hcstat_table { u32 key; u64 val; } hcstat_table_t; -typedef struct +typedef struct outfile_ctx { char *filename; @@ -890,7 +890,7 @@ typedef struct } outfile_ctx_t; -typedef struct +typedef struct pot { char plain_buf[HCBUFSIZ_TINY]; int plain_len; @@ -899,7 +899,7 @@ typedef struct } pot_t; -typedef struct +typedef struct potfile_ctx { bool enabled; @@ -914,7 +914,7 @@ typedef struct } potfile_ctx_t; -typedef struct +typedef struct restore_data { int version; char cwd[256]; @@ -930,7 +930,7 @@ typedef struct } restore_data_t; -typedef struct +typedef struct restore_ctx { bool enabled; @@ -944,7 +944,7 @@ typedef struct } restore_ctx_t; -typedef struct +typedef struct cpu_rule { u32 len; @@ -952,13 +952,13 @@ typedef struct } cpu_rule_t; -typedef struct +typedef struct kernel_rule { u32 cmds[32]; } kernel_rule_t; -typedef struct +typedef struct out { FILE *fp; @@ -967,14 +967,14 @@ typedef struct } out_t; -typedef struct +typedef struct tuning_db_alias { char *device_name; char *alias_name; } tuning_db_alias_t; -typedef struct +typedef struct tuning_db_entry { char *device_name; int attack_mode; @@ -986,7 +986,7 @@ typedef struct } tuning_db_entry_t; -typedef struct +typedef struct tuning_db { bool enabled; @@ -998,7 +998,7 @@ typedef struct } tuning_db_t; -typedef struct +typedef struct wl_data { bool enabled; @@ -1012,7 +1012,7 @@ typedef struct } wl_data_t; -typedef struct +typedef struct user_options { bool usage; bool version; @@ -1113,7 +1113,7 @@ typedef struct } user_options_t; -typedef struct +typedef struct user_options_extra { u32 attack_kern; @@ -1126,7 +1126,7 @@ typedef struct } user_options_extra_t; -typedef struct +typedef struct bitmap_ctx { bool enabled; @@ -1148,7 +1148,7 @@ typedef struct } bitmap_ctx_t; -typedef struct +typedef struct folder_config { char *cwd; char *install_dir; @@ -1159,7 +1159,7 @@ typedef struct } folder_config_t; -typedef struct +typedef struct induct_ctx { bool enabled; @@ -1171,7 +1171,7 @@ typedef struct } induct_ctx_t; -typedef struct +typedef struct outcheck_ctx { bool enabled; @@ -1179,7 +1179,7 @@ typedef struct } outcheck_ctx_t; -typedef struct +typedef struct straight_ctx { bool enabled; @@ -1195,7 +1195,7 @@ typedef struct } straight_ctx_t; -typedef struct +typedef struct combinator_ctx { bool enabled; @@ -1207,7 +1207,7 @@ typedef struct } combinator_ctx_t; -typedef struct +typedef struct mask_ctx { bool enabled; @@ -1238,7 +1238,7 @@ typedef struct } mask_ctx_t; -typedef struct +typedef struct hwmon_ctx { bool enabled; @@ -1255,7 +1255,7 @@ typedef struct } hwmon_ctx_t; -typedef struct +typedef struct cpt_ctx { bool enabled; @@ -1266,7 +1266,7 @@ typedef struct } cpt_ctx_t; -typedef struct +typedef struct status_ctx { /** * main status @@ -1328,7 +1328,7 @@ typedef struct } status_ctx_t; -typedef struct +typedef struct hashcat_ctx { bitmap_ctx_t *bitmap_ctx; combinator_ctx_t *combinator_ctx; @@ -1357,7 +1357,7 @@ typedef struct } hashcat_ctx_t; -typedef struct +typedef struct thread_param { u32 tid;