changed uint to u32

include/cpu_md5.h

@@ -8,7 +8,7 @@
 
 #include <string.h>
 
-void md5_64 (uint block[16], uint digest[4]);
-void md5_complete_no_limit (uint digest[4], uint *plain, uint plain_len);
+void md5_64 (u32 block[16], u32 digest[4]);
+void md5_complete_no_limit (u32 digest[4], u32 *plain, u32 plain_len);
 
 #endif // _CPU_MD5_H

include/cpu_sha1.h

@@ -6,6 +6,6 @@
 #ifndef _CPU_SHA1_H
 #define _CPU_SHA1_H
 
-void sha1_64 (uint block[16], uint digest[5]);
+void sha1_64 (u32 block[16], u32 digest[5]);
 
 #endif // _CPU_SHA1_H

include/cpu_sha256.h

@@ -6,6 +6,6 @@
 #ifndef _CPU_SHA256_H
 #define _CPU_SHA256_H
 
-void sha256_64 (uint block[16], uint digest[8]);
+void sha256_64 (u32 block[16], u32 digest[8]);
 
 #endif // _CPU_SHA256_H

include/hashes.h

@@ -15,7 +15,7 @@ void save_hash (const user_options_t *user_options, const hashconfig_t *hashconf
 
 void check_hash (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, plain_t *plain);
 
-int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const uint salt_pos);
+int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u32 salt_pos);
 
 int hashes_init_stage1 (hashes_t *hashes, const hashconfig_t *hashconfig, potfile_ctx_t *potfile_ctx, outfile_ctx_t *outfile_ctx, user_options_t *user_options, char *hash_or_file);
 int hashes_init_stage2 (hashes_t *hashes, const hashconfig_t *hashconfig, user_options_t *user_options, status_ctx_t *status_ctx);

include/hlfmt.h

@@ -10,11 +10,11 @@
 
 #define HLFMTS_CNT 11
 
-char *strhlfmt (const uint hashfile_format);
+char *strhlfmt (const u32 hashfile_format);
 
-void hlfmt_hash (uint hashfile_format, char *line_buf, int line_len, char **hashbuf_pos, int *hashbuf_len, const hashconfig_t *hashconfig, const user_options_t *user_options);
-void hlfmt_user (uint hashfile_format, char *line_buf, int line_len, char **userbuf_pos, int *userbuf_len, const hashconfig_t *hashconfig);
+void hlfmt_hash (u32 hashfile_format, char *line_buf, int line_len, char **hashbuf_pos, int *hashbuf_len, const hashconfig_t *hashconfig, const user_options_t *user_options);
+void hlfmt_user (u32 hashfile_format, char *line_buf, int line_len, char **userbuf_pos, int *userbuf_len, const hashconfig_t *hashconfig);
 
-uint hlfmt_detect (FILE *fp, uint max_check, const hashconfig_t *hashconfig);
+u32 hlfmt_detect (FILE *fp, u32 max_check, const hashconfig_t *hashconfig);
 
 #endif // _HLFMT_H

include/hwmon.h

@@ -6,19 +6,19 @@
 #ifndef _HWMON_H
 #define _HWMON_H
 
-int hm_get_threshold_slowdown_with_device_id (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_threshold_shutdown_with_device_id (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_temperature_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_fanpolicy_with_device_id          (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_fanspeed_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_buslanes_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_utilization_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_memoryspeed_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_corespeed_with_device_id          (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_get_throttle_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const uint device_id);
-int hm_set_fanspeed_with_device_id_adl       (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy);
-int hm_set_fanspeed_with_device_id_nvapi     (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy);
-int hm_set_fanspeed_with_device_id_xnvctrl   (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed);
+int hm_get_threshold_slowdown_with_device_id (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_threshold_shutdown_with_device_id (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_temperature_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_fanpolicy_with_device_id          (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_fanspeed_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_buslanes_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_utilization_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_memoryspeed_with_device_id        (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_corespeed_with_device_id          (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_get_throttle_with_device_id           (const hwmon_ctx_t *hwmon_ctx, const opencl_ctx_t *opencl_ctx, const u32 device_id);
+int hm_set_fanspeed_with_device_id_adl       (const hwmon_ctx_t *hwmon_ctx, const u32 device_id, const int fanspeed, const int fanpolicy);
+int hm_set_fanspeed_with_device_id_nvapi     (const hwmon_ctx_t *hwmon_ctx, const u32 device_id, const int fanspeed, const int fanpolicy);
+int hm_set_fanspeed_with_device_id_xnvctrl   (const hwmon_ctx_t *hwmon_ctx, const u32 device_id, const int fanspeed);
 
 int  hwmon_ctx_init    (hwmon_ctx_t *hwmon_ctx, const user_options_t *user_options, const opencl_ctx_t *opencl_ctx);
 void hwmon_ctx_destroy (hwmon_ctx_t *hwmon_ctx, const user_options_t *user_options, const opencl_ctx_t *opencl_ctx);

include/interface.h

@@ -25,7 +25,7 @@
 
 typedef struct rar5
 {
-  uint iv[4];
+  u32 iv[4];
 
 } rar5_t;
 
@@ -37,23 +37,23 @@ typedef struct pdf
 
   int  enc_md;
 
-  uint id_buf[8];
-  uint u_buf[32];
-  uint o_buf[32];
+  u32 id_buf[8];
+  u32 u_buf[32];
+  u32 o_buf[32];
 
   int  id_len;
   int  o_len;
   int  u_len;
 
-  uint rc4key[2];
-  uint rc4data[2];
+  u32 rc4key[2];
+  u32 rc4data[2];
 
 } pdf_t;
 
 typedef struct wpa
 {
-  uint pke[25];
-  uint eapol[64];
+  u32 pke[25];
+  u32 eapol[64];
   int  eapol_size;
   int  keyver;
   u8   orig_mac1[6];
@@ -65,70 +65,70 @@ typedef struct wpa
 
 typedef struct bitcoin_wallet
 {
-  uint cry_master_buf[64];
-  uint ckey_buf[64];
-  uint public_key_buf[64];
+  u32 cry_master_buf[64];
+  u32 ckey_buf[64];
+  u32 public_key_buf[64];
 
-  uint cry_master_len;
-  uint ckey_len;
-  uint public_key_len;
+  u32 cry_master_len;
+  u32 ckey_len;
+  u32 public_key_len;
 
 } bitcoin_wallet_t;
 
 typedef struct sip
 {
-  uint salt_buf[30];
-  uint salt_len;
+  u32 salt_buf[30];
+  u32 salt_len;
 
-  uint esalt_buf[38];
-  uint esalt_len;
+  u32 esalt_buf[38];
+  u32 esalt_len;
 
 } sip_t;
 
 typedef struct androidfde
 {
-  uint data[384];
+  u32 data[384];
 
 } androidfde_t;
 
 typedef struct ikepsk
 {
-  uint nr_buf[16];
-  uint nr_len;
+  u32 nr_buf[16];
+  u32 nr_len;
 
-  uint msg_buf[128];
-  uint msg_len;
+  u32 msg_buf[128];
+  u32 msg_len;
 
 } ikepsk_t;
 
 typedef struct netntlm
 {
-  uint user_len;
-  uint domain_len;
-  uint srvchall_len;
-  uint clichall_len;
+  u32 user_len;
+  u32 domain_len;
+  u32 srvchall_len;
+  u32 clichall_len;
 
-  uint userdomain_buf[64];
-  uint chall_buf[256];
+  u32 userdomain_buf[64];
+  u32 chall_buf[256];
 
 } netntlm_t;
 
 typedef struct krb5pa
 {
-  uint user[16];
-  uint realm[16];
-  uint salt[32];
-  uint timestamp[16];
-  uint checksum[4];
+  u32 user[16];
+  u32 realm[16];
+  u32 salt[32];
+  u32 timestamp[16];
+  u32 checksum[4];
 
 } krb5pa_t;
 
 typedef struct krb5tgs
 {
-  uint account_info[512];
-  uint checksum[4];
-  uint edata2[2560];
-  uint edata2_len;
+  u32 account_info[512];
+  u32 checksum[4];
+  u32 edata2[2560];
+  u32 edata2_len;
 
 } krb5tgs_t;
 
@@ -157,34 +157,34 @@ typedef struct keepass
 
 typedef struct tc
 {
-  uint salt_buf[16];
-  uint data_buf[112];
-  uint keyfile_buf[16];
-  uint signature;
+  u32 salt_buf[16];
+  u32 data_buf[112];
+  u32 keyfile_buf[16];
+  u32 signature;
 
 } tc_t;
 
 typedef struct pbkdf2_md5
 {
-  uint salt_buf[16];
+  u32 salt_buf[16];
 
 } pbkdf2_md5_t;
 
 typedef struct pbkdf2_sha1
 {
-  uint salt_buf[16];
+  u32 salt_buf[16];
 
 } pbkdf2_sha1_t;
 
 typedef struct pbkdf2_sha256
 {
-  uint salt_buf[16];
+  u32 salt_buf[16];
 
 } pbkdf2_sha256_t;
 
 typedef struct pbkdf2_sha512
 {
-  uint salt_buf[32];
+  u32 salt_buf[32];
 
 } pbkdf2_sha512_t;
 
@@ -196,56 +196,56 @@ typedef struct agilekey
 
 typedef struct rakp
 {
-  uint salt_buf[128];
-  uint salt_len;
+  u32 salt_buf[128];
+  u32 salt_len;
 
 } rakp_t;
 
 typedef struct cloudkey
 {
-  uint data_len;
-  uint data_buf[512];
+  u32 data_len;
+  u32 data_buf[512];
 
 } cloudkey_t;
 
 typedef struct office2007
 {
-  uint encryptedVerifier[4];
-  uint encryptedVerifierHash[5];
+  u32 encryptedVerifier[4];
+  u32 encryptedVerifierHash[5];
 
-  uint keySize;
+  u32 keySize;
 
 } office2007_t;
 
 typedef struct office2010
 {
-  uint encryptedVerifier[4];
-  uint encryptedVerifierHash[8];
+  u32 encryptedVerifier[4];
+  u32 encryptedVerifierHash[8];
 
 } office2010_t;
 
 typedef struct office2013
 {
-  uint encryptedVerifier[4];
-  uint encryptedVerifierHash[8];
+  u32 encryptedVerifier[4];
+  u32 encryptedVerifierHash[8];
 
 } office2013_t;
 
 typedef struct oldoffice01
 {
-  uint version;
-  uint encryptedVerifier[4];
-  uint encryptedVerifierHash[4];
-  uint rc4key[2];
+  u32 version;
+  u32 encryptedVerifier[4];
+  u32 encryptedVerifierHash[4];
+  u32 rc4key[2];
 
 } oldoffice01_t;
 
 typedef struct oldoffice34
 {
-  uint version;
-  uint encryptedVerifier[4];
-  uint encryptedVerifierHash[5];
-  uint rc4key[2];
+  u32 version;
+  u32 encryptedVerifier[4];
+  u32 encryptedVerifierHash[5];
+  u32 rc4key[2];
 
 } oldoffice34_t;
 
@@ -277,7 +277,7 @@ typedef struct zip2
 
 typedef struct win8phone
 {
-  uint salt_buf[32];
+  u32 salt_buf[32];
 
 } win8phone_t;
 
@@ -292,8 +292,8 @@ typedef struct psafe3
 
 typedef struct pdf14_tmp
 {
-  uint digest[4];
-  uint out[4];
+  u32 digest[4];
+  u32 out[4];
 
 } pdf14_tmp_t;
 
@@ -301,24 +301,24 @@ typedef struct pdf17l8_tmp
 {
   union
   {
-    uint dgst32[16];
+    u32 dgst32[16];
     u64  dgst64[8];
   } d;
 
-  uint dgst_len;
-  uint W_len;
+  u32 dgst_len;
+  u32 W_len;
 
 } pdf17l8_tmp_t;
 
 typedef struct phpass_tmp
 {
-  uint digest_buf[4];
+  u32 digest_buf[4];
 
 } phpass_tmp_t;
 
 typedef struct md5crypt_tmp
 {
-  uint digest_buf[4];
+  u32 digest_buf[4];
 
 } md5crypt_tmp_t;
 
@@ -333,20 +333,20 @@ typedef struct sha512crypt_tmp
 
 typedef struct sha256crypt_tmp
 {
-  uint alt_result[8];
+  u32 alt_result[8];
 
-  uint p_bytes[4];
-  uint s_bytes[4];
+  u32 p_bytes[4];
+  u32 s_bytes[4];
 
 } sha256crypt_tmp_t;
 
 typedef struct wpa_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[10];
-  uint out[10];
+  u32 dgst[10];
+  u32 out[10];
 
 } wpa_tmp_t;
 
@@ -358,69 +358,69 @@ typedef struct bitcoin_wallet_tmp
 
 typedef struct dcc2_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[5];
-  uint out[4];
+  u32 dgst[5];
+  u32 out[4];
 
 } dcc2_tmp_t;
 
 typedef struct bcrypt_tmp
 {
-  uint E[18];
+  u32 E[18];
 
-  uint P[18];
+  u32 P[18];
 
-  uint S0[256];
-  uint S1[256];
-  uint S2[256];
-  uint S3[256];
+  u32 S0[256];
+  u32 S1[256];
+  u32 S2[256];
+  u32 S3[256];
 
 } bcrypt_tmp_t;
 
 typedef struct pwsafe2_tmp
 {
-  uint digest[2];
+  u32 digest[2];
 
-  uint P[18];
+  u32 P[18];
 
-  uint S0[256];
-  uint S1[256];
-  uint S2[256];
-  uint S3[256];
+  u32 S0[256];
+  u32 S1[256];
+  u32 S2[256];
+  u32 S3[256];
 
 } pwsafe2_tmp_t;
 
 typedef struct pwsafe3_tmp
 {
-  uint digest_buf[8];
+  u32 digest_buf[8];
 
 } pwsafe3_tmp_t;
 
 typedef struct androidpin_tmp
 {
-  uint digest_buf[5];
+  u32 digest_buf[5];
 
 } androidpin_tmp_t;
 
 typedef struct androidfde_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[10];
-  uint out[10];
+  u32 dgst[10];
+  u32 out[10];
 
 } androidfde_tmp_t;
 
 typedef struct tc_tmp
 {
-  uint ipad[16];
-  uint opad[16];
+  u32 ipad[16];
+  u32 opad[16];
 
-  uint dgst[64];
-  uint out[64];
+  u32 dgst[64];
+  u32 out[64];
 
 } tc_tmp_t;
 
@@ -436,44 +436,44 @@ typedef struct tc64_tmp
 
 typedef struct agilekey_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[5];
-  uint out[5];
+  u32 dgst[5];
+  u32 out[5];
 
 } agilekey_tmp_t;
 
 typedef struct mywallet_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst1[5];
-  uint out1[5];
+  u32 dgst1[5];
+  u32 out1[5];
 
-  uint dgst2[5];
-  uint out2[5];
+  u32 dgst2[5];
+  u32 out2[5];
 
 } mywallet_tmp_t;
 
 typedef struct sha1aix_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[5];
-  uint out[5];
+  u32 dgst[5];
+  u32 out[5];
 
 } sha1aix_tmp_t;
 
 typedef struct sha256aix_tmp
 {
-  uint ipad[8];
-  uint opad[8];
+  u32 ipad[8];
+  u32 opad[8];
 
-  uint dgst[8];
-  uint out[8];
+  u32 dgst[8];
+  u32 out[8];
 
 } sha256aix_tmp_t;
 
@@ -489,11 +489,11 @@ typedef struct sha512aix_tmp
 
 typedef struct lastpass_tmp
 {
-  uint ipad[8];
-  uint opad[8];
+  u32 ipad[8];
+  u32 opad[8];
 
-  uint dgst[8];
-  uint out[8];
+  u32 dgst[8];
+  u32 out[8];
 
 } lastpass_tmp_t;
 
@@ -505,23 +505,23 @@ typedef struct drupal7_tmp
 
 typedef struct lotus8_tmp
 {
-  uint ipad[5];
-  uint opad[5];
+  u32 ipad[5];
+  u32 opad[5];
 
-  uint dgst[5];
-  uint out[5];
+  u32 dgst[5];
+  u32 out[5];
 
 } lotus8_tmp_t;
 
 typedef struct office2007_tmp
 {
-  uint out[5];
+  u32 out[5];
 
 } office2007_tmp_t;
 
 typedef struct office2010_tmp
 {
-  uint out[5];
+  u32 out[5];
 
 } office2010_tmp_t;
 
@@ -533,7 +533,7 @@ typedef struct office2013_tmp
 
 typedef struct saph_sha1_tmp
 {
-  uint digest_buf[5];
+  u32 digest_buf[5];
 
 } saph_sha1_tmp_t;
 
@@ -595,50 +595,50 @@ typedef struct oraclet_tmp
 
 typedef struct seven_zip_tmp
 {
-  uint block[16];
+  u32 block[16];
 
-  uint dgst[8];
+  u32 dgst[8];
 
-  uint block_len;
-  uint final_len;
+  u32 block_len;
+  u32 final_len;
 
 } seven_zip_tmp_t;
 
 typedef struct bsdicrypt_tmp
 {
-  uint Kc[16];
-  uint Kd[16];
+  u32 Kc[16];
+  u32 Kd[16];
 
-  uint iv[2];
+  u32 iv[2];
 
 } bsdicrypt_tmp_t;
 
 typedef struct rar3_tmp
 {
-  uint dgst[17][5];
+  u32 dgst[17][5];
 
 } rar3_tmp_t;
 
 typedef struct cram_md5
 {
-  uint user[16];
+  u32 user[16];
 
 } cram_md5_t;
 
 typedef struct seven_zip
 {
-  uint iv_buf[4];
-  uint iv_len;
+  u32 iv_buf[4];
+  u32 iv_len;
 
-  uint salt_buf[4];
-  uint salt_len;
+  u32 salt_buf[4];
+  u32 salt_len;
 
-  uint crc;
+  u32 crc;
 
-  uint data_buf[96];
-  uint data_len;
+  u32 data_buf[96];
+  u32 data_len;
 
-  uint unpack_size;
+  u32 unpack_size;
 
 } seven_zip_t;
 
@@ -1340,174 +1340,174 @@ typedef enum rounds_count
  * input functions
  */
 
-int bcrypt_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int cisco4_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int dcc_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int dcc2_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int descrypt_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int des_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int episerver_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ipb2_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int joomla_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int postgresql_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int netscreen_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int keccak_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int lm_parse_hash                 (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md4_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md4s_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5s_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5half_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5md5_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5pix_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5asa_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5apr1_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5crypt_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mssql2000_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mssql2005_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int netntlmv1_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int netntlmv2_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oracleh_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oracles_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oraclet_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int osc_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int arubaos_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int osx1_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int osx512_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int phpass_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1b64_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1b64s_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1s_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha256_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha256s_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha384_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512s_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512crypt_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int smf_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int vb3_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int vb30_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int wpa_parse_hash                (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int psafe2_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int psafe3_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ikepsk_md5_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ikepsk_sha1_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int androidpin_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ripemd160_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int whirlpool_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int truecrypt_parse_hash_1k       (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int truecrypt_parse_hash_2k       (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int md5aix_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha256aix_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512aix_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int agilekey_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1aix_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int lastpass_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int gost_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha256crypt_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mssql2012_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512osx_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int episerver4_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512grub_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha512b64s_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int hmacsha1_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int hmacsha256_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int hmacsha512_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int hmacmd5_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int krb5pa_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int krb5tgs_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sapb_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sapg_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int drupal7_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sybasease_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mysql323_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int rakp_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int netscaler_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int chap_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int cloudkey_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int nsec3_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int wbb3_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int racf_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int lotus5_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int lotus6_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int lotus8_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int hmailserver_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int phps_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mediawiki_b_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int peoplesoft_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int skype_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int androidfde_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int scrypt_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int juniper_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int cisco8_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int cisco9_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int office2007_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int office2010_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int office2013_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice01_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice01cm1_parse_hash     (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice01cm2_parse_hash     (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice34_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice34cm1_parse_hash     (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int oldoffice34cm2_parse_hash     (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int radmin2_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int djangosha1_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int djangopbkdf2_parse_hash       (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int siphash_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int crammd5_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int saph_sha1_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int redmine_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf11_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf11cm1_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf11cm2_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf14_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf17l3_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pdf17l8_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pbkdf2_sha256_parse_hash      (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int prestashop_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int postgresql_auth_parse_hash    (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mysql_auth_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int bitcoin_wallet_parse_hash     (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sip_auth_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int crc32_parse_hash              (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int seven_zip_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int gost2012sbog_256_parse_hash   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int gost2012sbog_512_parse_hash   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pbkdf2_md5_parse_hash         (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pbkdf2_sha1_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pbkdf2_sha512_parse_hash      (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ecryptfs_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int bsdicrypt_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int rar3hp_parse_hash             (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int rar5_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int cf10_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int mywallet_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int ms_drsr_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int androidfde_samsung_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int axcrypt_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int sha1axcrypt_parse_hash        (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int keepass_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int pstoken_parse_hash            (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int zip2_parse_hash               (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int veracrypt_parse_hash_200000   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int veracrypt_parse_hash_500000   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int veracrypt_parse_hash_327661   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int veracrypt_parse_hash_655331   (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int win8phone_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
-int opencart_parse_hash           (char *input_buf, uint input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int bcrypt_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int cisco4_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int dcc_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int dcc2_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int descrypt_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int des_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int episerver_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ipb2_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int joomla_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int postgresql_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int netscreen_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int keccak_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int lm_parse_hash                 (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md4_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md4s_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5s_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5half_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5md5_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5pix_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5asa_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5apr1_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5crypt_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mssql2000_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mssql2005_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int netntlmv1_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int netntlmv2_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oracleh_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oracles_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oraclet_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int osc_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int arubaos_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int osx1_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int osx512_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int phpass_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1b64_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1b64s_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1s_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha256_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha256s_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha384_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512s_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512crypt_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int smf_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int vb3_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int vb30_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int wpa_parse_hash                (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int psafe2_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int psafe3_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ikepsk_md5_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ikepsk_sha1_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int androidpin_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ripemd160_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int whirlpool_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int truecrypt_parse_hash_1k       (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int truecrypt_parse_hash_2k       (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int md5aix_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha256aix_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512aix_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int agilekey_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1aix_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int lastpass_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int gost_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha256crypt_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mssql2012_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512osx_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int episerver4_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512grub_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha512b64s_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int hmacsha1_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int hmacsha256_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int hmacsha512_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int hmacmd5_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int krb5pa_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int krb5tgs_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sapb_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sapg_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int drupal7_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sybasease_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mysql323_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int rakp_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int netscaler_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int chap_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int cloudkey_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int nsec3_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int wbb3_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int racf_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int lotus5_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int lotus6_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int lotus8_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int hmailserver_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int phps_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mediawiki_b_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int peoplesoft_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int skype_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int androidfde_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int scrypt_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int juniper_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int cisco8_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int cisco9_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int office2007_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int office2010_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int office2013_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice01_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice01cm1_parse_hash     (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice01cm2_parse_hash     (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice34_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice34cm1_parse_hash     (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int oldoffice34cm2_parse_hash     (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int radmin2_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int djangosha1_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int djangopbkdf2_parse_hash       (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int siphash_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int crammd5_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int saph_sha1_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int redmine_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf11_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf11cm1_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf11cm2_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf14_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf17l3_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pdf17l8_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pbkdf2_sha256_parse_hash      (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int prestashop_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int postgresql_auth_parse_hash    (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mysql_auth_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int bitcoin_wallet_parse_hash     (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sip_auth_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int crc32_parse_hash              (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int seven_zip_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int gost2012sbog_256_parse_hash   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int gost2012sbog_512_parse_hash   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pbkdf2_md5_parse_hash         (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pbkdf2_sha1_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pbkdf2_sha512_parse_hash      (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ecryptfs_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int bsdicrypt_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int rar3hp_parse_hash             (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int rar5_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int cf10_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int mywallet_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int ms_drsr_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int androidfde_samsung_parse_hash (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int axcrypt_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int sha1axcrypt_parse_hash        (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int keepass_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int pstoken_parse_hash            (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int zip2_parse_hash               (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int veracrypt_parse_hash_200000   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int veracrypt_parse_hash_500000   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int veracrypt_parse_hash_327661   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int veracrypt_parse_hash_655331   (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int win8phone_parse_hash          (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
+int opencart_parse_hash           (char *input_buf, u32 input_len, hash_t *hash_buf, const hashconfig_t *hashconfig);
 
 /**
  * output functions
  */
 
-char *stroptitype (const uint opti_type);
-char *strhashtype (const uint hash_mode);
-char *strparser   (const uint parser_status);
+char *stroptitype (const u32 opti_type);
+char *strhashtype (const u32 hash_mode);
+char *strparser   (const u32 parser_status);
 
-void to_hccap_t (hccap_t *hccap, const uint salt_pos, const uint digest_pos, const hashconfig_t *hashconfig, const hashes_t *hashes);
+void to_hccap_t (hccap_t *hccap, const u32 salt_pos, const u32 digest_pos, const hashconfig_t *hashconfig, const hashes_t *hashes);
 
-void ascii_digest (char *out_buf, const uint salt_pos, const uint digest_pos, const hashconfig_t *hashconfig, const hashes_t *hashes);
+void ascii_digest (char *out_buf, const u32 salt_pos, const u32 digest_pos, const hashconfig_t *hashconfig, const hashes_t *hashes);
 
 int     hashconfig_init                   (hashconfig_t *hashconfig, const user_options_t *user_options);
 void    hashconfig_destroy                (hashconfig_t *hashconfig);

include/mpsp.h

@@ -20,21 +20,21 @@
 
 #define INCR_MASKS    1000
 
-void  mp_css_to_uniq_tbl (uint css_cnt, cs_t *css, uint uniq_tbls[SP_PW_MAX][CHARSIZ]);
-void  mp_cut_at (char *mask, uint max);
-uint  mp_get_length (char *mask);
+void  mp_css_to_uniq_tbl (u32 css_cnt, cs_t *css, u32 uniq_tbls[SP_PW_MAX][CHARSIZ]);
+void  mp_cut_at (char *mask, u32 max);
+u32  mp_get_length (char *mask);
 void  mp_exec (u64 val, char *buf, cs_t *css, int css_cnt);
-cs_t *mp_gen_css (char *mask_buf, size_t mask_len, cs_t *mp_sys, cs_t *mp_usr, uint *css_cnt, const hashconfig_t *hashconfig, const user_options_t *user_options);
-u64   mp_get_sum (uint css_cnt, cs_t *css);
+cs_t *mp_gen_css (char *mask_buf, size_t mask_len, cs_t *mp_sys, cs_t *mp_usr, u32 *css_cnt, const hashconfig_t *hashconfig, const user_options_t *user_options);
+u64   mp_get_sum (u32 css_cnt, cs_t *css);
 void  mp_setup_sys (cs_t *mp_sys);
-void  mp_setup_usr (cs_t *mp_sys, cs_t *mp_usr, char *buf, uint index, const hashconfig_t *hashconfig, const user_options_t *user_options);
-void  mp_reset_usr (cs_t *mp_usr, uint index);
+void  mp_setup_usr (cs_t *mp_sys, cs_t *mp_usr, char *buf, u32 index, const hashconfig_t *hashconfig, const user_options_t *user_options);
+void  mp_reset_usr (cs_t *mp_usr, u32 index);
 
-u64   sp_get_sum (uint start, uint stop, cs_t *root_css_buf);
-void  sp_exec (u64 ctx, char *pw_buf, cs_t *root_css_buf, cs_t *markov_css_buf, uint start, uint stop);
+u64   sp_get_sum (u32 start, u32 stop, cs_t *root_css_buf);
+void  sp_exec (u64 ctx, char *pw_buf, cs_t *root_css_buf, cs_t *markov_css_buf, u32 start, u32 stop);
 int   sp_comp_val (const void *p1, const void *p2);
-void  sp_setup_tbl (const char *install_dir, char *hcstat, uint disable, uint classic, hcstat_table_t *root_table_buf, hcstat_table_t *markov_table_buf);
-void  sp_tbl_to_css (hcstat_table_t *root_table_buf, hcstat_table_t *markov_table_buf, cs_t *root_css_buf, cs_t *markov_css_buf, uint threshold, uint uniq_tbls[SP_PW_MAX][CHARSIZ]);
+void  sp_setup_tbl (const char *install_dir, char *hcstat, u32 disable, u32 classic, hcstat_table_t *root_table_buf, hcstat_table_t *markov_table_buf);
+void  sp_tbl_to_css (hcstat_table_t *root_table_buf, hcstat_table_t *markov_table_buf, cs_t *root_css_buf, cs_t *markov_css_buf, u32 threshold, u32 uniq_tbls[SP_PW_MAX][CHARSIZ]);
 void  sp_stretch_markov (hcstat_table_t *in, hcstat_table_t *out);
 void  sp_stretch_root (hcstat_table_t *in, hcstat_table_t *out);
 

include/opencl.h

@@ -20,18 +20,18 @@ static const char CL_VENDOR_POCL[]          = "The pocl project";
 
 int gidd_to_pw_t (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const u64 gidd, pw_t *pw);
 
-int choose_kernel (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const user_options_t *user_options, const straight_ctx_t *straight_ctx, const combinator_ctx_t *combinator_ctx, const mask_ctx_t *mask_ctx, hashconfig_t *hashconfig, const hashes_t *hashes, const outfile_ctx_t *outfile_ctx, status_ctx_t *status_ctx, const uint highest_pw_len, const uint pws_cnt, const uint fast_iteration, const uint salt_pos);
+int choose_kernel (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const user_options_t *user_options, const straight_ctx_t *straight_ctx, const combinator_ctx_t *combinator_ctx, const mask_ctx_t *mask_ctx, hashconfig_t *hashconfig, const hashes_t *hashes, const outfile_ctx_t *outfile_ctx, status_ctx_t *status_ctx, const u32 highest_pw_len, const u32 pws_cnt, const u32 fast_iteration, const u32 salt_pos);
 
-int run_kernel (const uint kern_run, opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const uint num, const uint event_update, const uint iteration, hashconfig_t *hashconfig, const user_options_t *user_options, status_ctx_t *status_ctx);
-int run_kernel_mp (const uint kern_run, opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const uint num);
+int run_kernel (const u32 kern_run, opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const u32 num, const u32 event_update, const u32 iteration, hashconfig_t *hashconfig, const user_options_t *user_options, status_ctx_t *status_ctx);
+int run_kernel_mp (const u32 kern_run, opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const u32 num);
 int run_kernel_tm (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param);
-int run_kernel_amp (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const uint num);
-int run_kernel_memset (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, cl_mem buf, const uint value, const uint num);
+int run_kernel_amp (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const u32 num);
+int run_kernel_memset (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, cl_mem buf, const u32 value, const u32 num);
 int run_kernel_bzero (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, cl_mem buf, const size_t size);
 
-int run_copy (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, hashconfig_t *hashconfig, const user_options_t *user_options, const user_options_extra_t *user_options_extra, const combinator_ctx_t *combinator_ctx, const uint pws_cnt);
+int run_copy (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, hashconfig_t *hashconfig, const user_options_t *user_options, const user_options_extra_t *user_options_extra, const combinator_ctx_t *combinator_ctx, const u32 pws_cnt);
 
-int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const uint pws_cnt);
+int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u32 pws_cnt);
 
 int  opencl_ctx_init                  (opencl_ctx_t *opencl_ctx, const user_options_t *user_options);
 void opencl_ctx_destroy               (opencl_ctx_t *opencl_ctx);

include/outfile.h

@@ -12,10 +12,10 @@
 
 void outfile_init           (outfile_ctx_t *outfile_ctx, const user_options_t *user_options);
 void outfile_destroy        (outfile_ctx_t *outfile_ctx);
-void outfile_format_plain   (outfile_ctx_t *outfile_ctx, const unsigned char *plain_ptr, const uint plain_len);
+void outfile_format_plain   (outfile_ctx_t *outfile_ctx, const unsigned char *plain_ptr, const u32 plain_len);
 void outfile_write_open     (outfile_ctx_t *outfile_ctx);
 void outfile_write_close    (outfile_ctx_t *outfile_ctx);
-void outfile_write          (outfile_ctx_t *outfile_ctx, const char *out_buf, const unsigned char *plain_ptr, const uint plain_len, const u64 crackpos, const unsigned char *username, const uint user_len, const hashconfig_t *hashconfig);
+void outfile_write          (outfile_ctx_t *outfile_ctx, const char *out_buf, const unsigned char *plain_ptr, const u32 plain_len, const u64 crackpos, const unsigned char *username, const u32 user_len, const hashconfig_t *hashconfig);
 int  outfile_and_hashfile   (outfile_ctx_t *outfile_ctx, const char *hashfile);
 
 #endif // _OUTFILE_H

include/potfile.h

@@ -21,14 +21,14 @@ void  hc_qsort_r (void *base, size_t nmemb, size_t size, int (*compar) (const vo
 void *hc_bsearch_r (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *, void *), void *arg);
 
 void potfile_init             (potfile_ctx_t *potfile_ctx, const user_options_t *user_options, const folder_config_t *folder_config);
-void potfile_format_plain     (potfile_ctx_t *potfile_ctx, const unsigned char *plain_ptr, const uint plain_len);
+void potfile_format_plain     (potfile_ctx_t *potfile_ctx, const unsigned char *plain_ptr, const u32 plain_len);
 int  potfile_read_open        (potfile_ctx_t *potfile_ctx);
 void potfile_read_parse       (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig);
 void potfile_read_close       (potfile_ctx_t *potfile_ctx);
 int  potfile_write_open       (potfile_ctx_t *potfile_ctx);
 void potfile_write_close      (potfile_ctx_t *potfile_ctx);
 void potfile_write_append     (potfile_ctx_t *potfile_ctx, const char *out_buf, u8 *plain_ptr, unsigned int plain_len);
-void potfile_hash_alloc       (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const uint num);
+void potfile_hash_alloc       (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const u32 num);
 void potfile_hash_free        (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig);
 void potfile_show_request     (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, outfile_ctx_t *outfile_ctx, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *, void *));
 void potfile_left_request     (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, outfile_ctx_t *outfile_ctx, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *, void *));

include/rp.h

@@ -25,7 +25,7 @@ int conv_itoc (const u8 c);
 
 int generate_random_rule (char rule_buf[RP_RULE_BUFSIZ], const u32 rp_gen_func_min, const u32 rp_gen_func_max);
 
-int cpu_rule_to_kernel_rule (char *rule_buf, uint rule_len, kernel_rule_t *rule);
+int cpu_rule_to_kernel_rule (char *rule_buf, u32 rule_len, kernel_rule_t *rule);
 int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule);
 
 bool kernel_rules_has_noop (const kernel_rule_t *kernel_rules_buf, const u32 kernel_rules_cnt);

include/stdout.h

@@ -20,6 +20,6 @@
 #include <pwd.h>
 #endif // _POSIX
 
-void process_stdout (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const user_options_t *user_options, const hashconfig_t *hashconfig, const straight_ctx_t *straight_ctx, const combinator_ctx_t *combinator_ctx, const mask_ctx_t *mask_ctx, const outfile_ctx_t *outfile_ctx, const uint pws_cnt);
+void process_stdout (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, const user_options_t *user_options, const hashconfig_t *hashconfig, const straight_ctx_t *straight_ctx, const combinator_ctx_t *combinator_ctx, const mask_ctx_t *mask_ctx, const outfile_ctx_t *outfile_ctx, const u32 pws_cnt);
 
 #endif // _STDOUT_H

include/thread.h

@@ -19,7 +19,7 @@
 #if defined (_WIN)
 
 #define hc_thread_create(t,f,a)     t = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &f, a, 0, NULL)
-#define hc_thread_wait(n,a)         for (uint i = 0; i < n; i++) WaitForSingleObject ((a)[i], INFINITE)
+#define hc_thread_wait(n,a)         for (u32 i = 0; i < n; i++) WaitForSingleObject ((a)[i], INFINITE)
 #define hc_thread_exit(t)           ExitThread (t)
 
 #define hc_thread_mutex_lock(m)     EnterCriticalSection      (&m)
@@ -30,7 +30,7 @@
 #elif defined (_POSIX)
 
 #define hc_thread_create(t,f,a)     pthread_create (&t, NULL, f, a)
-#define hc_thread_wait(n,a)         for (uint i = 0; i < n; i++) pthread_join ((a)[i], NULL)
+#define hc_thread_wait(n,a)         for (u32 i = 0; i < n; i++) pthread_join ((a)[i], NULL)
 #define hc_thread_exit(t)           pthread_exit (&t)
 
 #define hc_thread_mutex_lock(m)     pthread_mutex_lock     (&m)

include/types.h

@@ -37,8 +37,6 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 
-typedef uint32_t uint; // we need to get rid of this sooner or later, for consistency
-
 #include "ext_OpenCL.h"
 #include "ext_ADL.h"
 #include "ext_nvapi.h"

include/weak_hash.h

@@ -6,6 +6,6 @@
 #ifndef _WEAK_HASH_H
 #define _WEAK_HASH_H
 
-void weak_hash_check (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const uint salt_pos);
+void weak_hash_check (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u32 salt_pos);
 
 #endif // _WEAK_HASH_H

include/wordlist.h

@@ -9,7 +9,7 @@
 #include <time.h>
 #include <inttypes.h>
 
-uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options);
+u32 convert_from_hex (char *line_buf, const u32 line_len, const user_options_t *user_options);
 
 void load_segment (wl_data_t *wl_data, FILE *fd);
 
@@ -17,7 +17,7 @@ void get_next_word_lm  (char *buf, u64 sz, u64 *len, u64 *off);
 void get_next_word_uc  (char *buf, u64 sz, u64 *len, u64 *off);
 void get_next_word_std (char *buf, u64 sz, u64 *len, u64 *off);
 
-void get_next_word (wl_data_t *wl_data, const user_options_t *user_options, const user_options_extra_t *user_options_extra, FILE *fd, char **out_buf, uint *out_len);
+void get_next_word (wl_data_t *wl_data, const user_options_t *user_options, const user_options_extra_t *user_options_extra, FILE *fd, char **out_buf, u32 *out_len);
 
 void pw_add (hc_device_param_t *device_param, const u8 *pw_buf, const int pw_len);