1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-02 10:51:16 +00:00

synchronize host and opencl types

This commit is contained in:
Jens Steube 2017-06-04 21:51:19 +02:00
parent 6345fb53f9
commit 9a1951d61c

View File

@ -666,13 +666,13 @@ inline u32 amd_bytealign_S (const u32 a, const u32 b, const u32 c)
#endif #endif
typedef struct typedef struct digest
{ {
u32 digest_buf[DGST_ELEM]; u32 digest_buf[DGST_ELEM];
} digest_t; } digest_t;
typedef struct typedef struct salt
{ {
u32 salt_buf[16]; u32 salt_buf[16];
u32 salt_buf_pc[16]; u32 salt_buf_pc[16];
@ -752,7 +752,7 @@ typedef struct itunes_backup
} itunes_backup_t; } itunes_backup_t;
typedef struct typedef struct blake2
{ {
u64 h[8]; u64 h[8];
u64 t[2]; u64 t[2];
@ -788,7 +788,7 @@ typedef struct chacha20
} chacha20_t; } chacha20_t;
typedef struct typedef struct pdf
{ {
int V; int V;
int R; int R;
@ -830,7 +830,7 @@ typedef struct wpa
} wpa_t; } wpa_t;
typedef struct typedef struct bitcoin_wallet
{ {
u32 cry_master_buf[64]; u32 cry_master_buf[64];
u32 ckey_buf[64]; u32 ckey_buf[64];
@ -842,7 +842,7 @@ typedef struct
} bitcoin_wallet_t; } bitcoin_wallet_t;
typedef struct typedef struct sip
{ {
u32 salt_buf[30]; u32 salt_buf[30];
u32 salt_len; u32 salt_len;
@ -852,13 +852,13 @@ typedef struct
} sip_t; } sip_t;
typedef struct typedef struct androidfde
{ {
u32 data[384]; u32 data[384];
} androidfde_t; } androidfde_t;
typedef struct typedef struct ikepsk
{ {
u32 nr_buf[16]; u32 nr_buf[16];
u32 nr_len; u32 nr_len;
@ -868,7 +868,7 @@ typedef struct
} ikepsk_t; } ikepsk_t;
typedef struct typedef struct netntlm
{ {
u32 user_len; u32 user_len;
u32 domain_len; u32 domain_len;
@ -880,7 +880,7 @@ typedef struct
} netntlm_t; } netntlm_t;
typedef struct typedef struct krb5pa
{ {
u32 user[16]; u32 user[16];
u32 realm[16]; u32 realm[16];
@ -890,7 +890,7 @@ typedef struct
} krb5pa_t; } krb5pa_t;
typedef struct typedef struct krb5tgs
{ {
u32 account_info[512]; u32 account_info[512];
u32 checksum[4]; u32 checksum[4];
@ -899,7 +899,7 @@ typedef struct
} krb5tgs_t; } krb5tgs_t;
typedef struct typedef struct tc
{ {
u32 salt_buf[16]; u32 salt_buf[16];
u32 data_buf[112]; u32 data_buf[112];
@ -908,45 +908,45 @@ typedef struct
} tc_t; } tc_t;
typedef struct typedef struct pbkdf2_md5
{ {
u32 salt_buf[16]; u32 salt_buf[16];
} pbkdf2_md5_t; } pbkdf2_md5_t;
typedef struct typedef struct pbkdf2_sha1
{ {
u32 salt_buf[16]; u32 salt_buf[16];
} pbkdf2_sha1_t; } pbkdf2_sha1_t;
typedef struct typedef struct pbkdf2_sha256
{ {
u32 salt_buf[16]; u32 salt_buf[16];
} pbkdf2_sha256_t; } pbkdf2_sha256_t;
typedef struct typedef struct pbkdf2_sha512
{ {
u32 salt_buf[32]; u32 salt_buf[32];
} pbkdf2_sha512_t; } pbkdf2_sha512_t;
typedef struct typedef struct rakp
{ {
u32 salt_buf[128]; u32 salt_buf[128];
u32 salt_len; u32 salt_len;
} rakp_t; } rakp_t;
typedef struct typedef struct cloudkey
{ {
u32 data_len; u32 data_len;
u32 data_buf[512]; u32 data_buf[512];
} cloudkey_t; } cloudkey_t;
typedef struct typedef struct office2007
{ {
u32 encryptedVerifier[4]; u32 encryptedVerifier[4];
u32 encryptedVerifierHash[5]; u32 encryptedVerifierHash[5];
@ -955,21 +955,21 @@ typedef struct
} office2007_t; } office2007_t;
typedef struct typedef struct office2010
{ {
u32 encryptedVerifier[4]; u32 encryptedVerifier[4];
u32 encryptedVerifierHash[8]; u32 encryptedVerifierHash[8];
} office2010_t; } office2010_t;
typedef struct typedef struct office2013
{ {
u32 encryptedVerifier[4]; u32 encryptedVerifier[4];
u32 encryptedVerifierHash[8]; u32 encryptedVerifierHash[8];
} office2013_t; } office2013_t;
typedef struct typedef struct oldoffice01
{ {
u32 version; u32 version;
u32 encryptedVerifier[4]; u32 encryptedVerifier[4];
@ -978,7 +978,7 @@ typedef struct
} oldoffice01_t; } oldoffice01_t;
typedef struct typedef struct oldoffice34
{ {
u32 version; u32 version;
u32 encryptedVerifier[4]; u32 encryptedVerifier[4];
@ -987,7 +987,7 @@ typedef struct
} oldoffice34_t; } oldoffice34_t;
typedef struct typedef struct pstoken
{ {
u32 salt_buf[128]; u32 salt_buf[128];
u32 salt_len; u32 salt_len;
@ -997,7 +997,7 @@ typedef struct
} pstoken_t; } pstoken_t;
typedef struct typedef struct zip2
{ {
u32 type; u32 type;
u32 mode; u32 mode;
@ -1013,13 +1013,13 @@ typedef struct
} zip2_t; } zip2_t;
typedef struct typedef struct win8phone
{ {
u32 salt_buf[32]; u32 salt_buf[32];
} win8phone_t; } win8phone_t;
typedef struct typedef struct keepass
{ {
u32 version; u32 version;
u32 algorithm; u32 algorithm;
@ -1042,7 +1042,7 @@ typedef struct
} keepass_t; } keepass_t;
typedef struct typedef struct dpapimk
{ {
u32 version; u32 version;
u32 context; u32 context;
@ -1054,8 +1054,8 @@ typedef struct
/* here only for possible /* here only for possible
forward compatibiliy forward compatibiliy
*/ */
//char cipher_algo[16]; // u8 cipher_algo[16];
//char hash_algo[16]; // u8 hash_algo[16];
u32 iv[4]; u32 iv[4];
u32 contents_len; u32 contents_len;
@ -1077,14 +1077,14 @@ typedef struct ethereum_scrypt
} ethereum_scrypt_t; } ethereum_scrypt_t;
typedef struct typedef struct pdf14_tmp
{ {
u32 digest[4]; u32 digest[4];
u32 out[4]; u32 out[4];
} pdf14_tmp_t; } pdf14_tmp_t;
typedef struct typedef struct pdf17l8_tmp
{ {
union union
{ {
@ -1097,19 +1097,19 @@ typedef struct
} pdf17l8_tmp_t; } pdf17l8_tmp_t;
typedef struct typedef struct phpass_tmp
{ {
u32 digest_buf[4]; u32 digest_buf[4];
} phpass_tmp_t; } phpass_tmp_t;
typedef struct typedef struct md5crypt_tmp
{ {
u32 digest_buf[4]; u32 digest_buf[4];
} md5crypt_tmp_t; } md5crypt_tmp_t;
typedef struct typedef struct sha256crypt_tmp
{ {
u32 alt_result[8]; u32 alt_result[8];
@ -1118,7 +1118,7 @@ typedef struct
} sha256crypt_tmp_t; } sha256crypt_tmp_t;
typedef struct typedef struct sha512crypt_tmp
{ {
u64 l_alt_result[8]; u64 l_alt_result[8];
@ -1127,7 +1127,7 @@ typedef struct
} sha512crypt_tmp_t; } sha512crypt_tmp_t;
typedef struct typedef struct wpa_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1137,13 +1137,13 @@ typedef struct
} wpa_tmp_t; } wpa_tmp_t;
typedef struct typedef struct bitcoin_wallet_tmp
{ {
u64 dgst[8]; u64 dgst[8];
} bitcoin_wallet_tmp_t; } bitcoin_wallet_tmp_t;
typedef struct typedef struct dcc2_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1153,7 +1153,7 @@ typedef struct
} dcc2_tmp_t; } dcc2_tmp_t;
typedef struct typedef struct bcrypt_tmp
{ {
u32 E[18]; u32 E[18];
@ -1166,7 +1166,7 @@ typedef struct
} bcrypt_tmp_t; } bcrypt_tmp_t;
typedef struct typedef struct pwsafe2_tmp
{ {
u32 digest[2]; u32 digest[2];
@ -1179,19 +1179,19 @@ typedef struct
} pwsafe2_tmp_t; } pwsafe2_tmp_t;
typedef struct typedef struct pwsafe3_tmp
{ {
u32 digest_buf[8]; u32 digest_buf[8];
} pwsafe3_tmp_t; } pwsafe3_tmp_t;
typedef struct typedef struct androidpin_tmp
{ {
u32 digest_buf[5]; u32 digest_buf[5];
} androidpin_tmp_t; } androidpin_tmp_t;
typedef struct typedef struct androidfde_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1201,7 +1201,7 @@ typedef struct
} androidfde_tmp_t; } androidfde_tmp_t;
typedef struct typedef struct tc_tmp
{ {
u32 ipad[16]; u32 ipad[16];
u32 opad[16]; u32 opad[16];
@ -1211,7 +1211,7 @@ typedef struct
} tc_tmp_t; } tc_tmp_t;
typedef struct typedef struct tc64_tmp
{ {
u64 ipad[8]; u64 ipad[8];
u64 opad[8]; u64 opad[8];
@ -1221,7 +1221,7 @@ typedef struct
} tc64_tmp_t; } tc64_tmp_t;
typedef struct typedef struct pbkdf1_sha1_tmp
{ {
// pbkdf1-sha1 is limited to 160 bits // pbkdf1-sha1 is limited to 160 bits
@ -1232,7 +1232,7 @@ typedef struct
} pbkdf1_sha1_tmp_t; } pbkdf1_sha1_tmp_t;
typedef struct typedef struct pbkdf2_md5_tmp
{ {
u32 ipad[4]; u32 ipad[4];
u32 opad[4]; u32 opad[4];
@ -1242,7 +1242,7 @@ typedef struct
} pbkdf2_md5_tmp_t; } pbkdf2_md5_tmp_t;
typedef struct typedef struct pbkdf2_sha1_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1252,7 +1252,7 @@ typedef struct
} pbkdf2_sha1_tmp_t; } pbkdf2_sha1_tmp_t;
typedef struct typedef struct pbkdf2_sha256_tmp
{ {
u32 ipad[8]; u32 ipad[8];
u32 opad[8]; u32 opad[8];
@ -1262,7 +1262,7 @@ typedef struct
} pbkdf2_sha256_tmp_t; } pbkdf2_sha256_tmp_t;
typedef struct typedef struct pbkdf2_sha512_tmp
{ {
u64 ipad[8]; u64 ipad[8];
u64 opad[8]; u64 opad[8];
@ -1272,13 +1272,13 @@ typedef struct
} pbkdf2_sha512_tmp_t; } pbkdf2_sha512_tmp_t;
typedef struct typedef struct ecryptfs_tmp
{ {
u64 out[8]; u64 out[8];
} ecryptfs_tmp_t; } ecryptfs_tmp_t;
typedef struct typedef struct oraclet_tmp
{ {
u64 ipad[8]; u64 ipad[8];
u64 opad[8]; u64 opad[8];
@ -1288,7 +1288,7 @@ typedef struct
} oraclet_tmp_t; } oraclet_tmp_t;
typedef struct typedef struct agilekey_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1298,7 +1298,7 @@ typedef struct
} agilekey_tmp_t; } agilekey_tmp_t;
typedef struct typedef struct mywallet_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1311,7 +1311,7 @@ typedef struct
} mywallet_tmp_t; } mywallet_tmp_t;
typedef struct typedef struct sha1aix_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1321,7 +1321,7 @@ typedef struct
} sha1aix_tmp_t; } sha1aix_tmp_t;
typedef struct typedef struct sha256aix_tmp
{ {
u32 ipad[8]; u32 ipad[8];
u32 opad[8]; u32 opad[8];
@ -1331,7 +1331,7 @@ typedef struct
} sha256aix_tmp_t; } sha256aix_tmp_t;
typedef struct typedef struct sha512aix_tmp
{ {
u64 ipad[8]; u64 ipad[8];
u64 opad[8]; u64 opad[8];
@ -1341,7 +1341,7 @@ typedef struct
} sha512aix_tmp_t; } sha512aix_tmp_t;
typedef struct typedef struct lastpass_tmp
{ {
u32 ipad[8]; u32 ipad[8];
u32 opad[8]; u32 opad[8];
@ -1351,13 +1351,13 @@ typedef struct
} lastpass_tmp_t; } lastpass_tmp_t;
typedef struct typedef struct drupal7_tmp
{ {
u64 digest_buf[8]; u64 digest_buf[8];
} drupal7_tmp_t; } drupal7_tmp_t;
typedef struct typedef struct lotus8_tmp
{ {
u32 ipad[5]; u32 ipad[5];
u32 opad[5]; u32 opad[5];
@ -1367,31 +1367,31 @@ typedef struct
} lotus8_tmp_t; } lotus8_tmp_t;
typedef struct typedef struct office2007_tmp
{ {
u32 out[5]; u32 out[5];
} office2007_tmp_t; } office2007_tmp_t;
typedef struct typedef struct office2010_tmp
{ {
u32 out[5]; u32 out[5];
} office2010_tmp_t; } office2010_tmp_t;
typedef struct typedef struct office2013_tmp
{ {
u64 out[8]; u64 out[8];
} office2013_tmp_t; } office2013_tmp_t;
typedef struct typedef struct saph_sha1_tmp
{ {
u32 digest_buf[5]; u32 digest_buf[5];
} saph_sha1_tmp_t; } saph_sha1_tmp_t;
typedef struct typedef struct seven_zip_tmp
{ {
u32 block[16]; u32 block[16];
@ -1402,7 +1402,7 @@ typedef struct
} seven_zip_tmp_t; } seven_zip_tmp_t;
typedef struct typedef struct axcrypt_tmp
{ {
u32 KEK[4]; u32 KEK[4];
u32 lsb[4]; u32 lsb[4];
@ -1410,13 +1410,13 @@ typedef struct
} axcrypt_tmp_t; } axcrypt_tmp_t;
typedef struct typedef struct keepass_tmp
{ {
u32 tmp_digest[8]; u32 tmp_digest[8];
} keepass_tmp_t; } keepass_tmp_t;
typedef struct typedef struct dpapimk_tmp
{ {
/* dedicated to hmac-sha1 */ /* dedicated to hmac-sha1 */
u32 ipad[5]; u32 ipad[5];
@ -1434,7 +1434,7 @@ typedef struct
} dpapimk_tmp_t; } dpapimk_tmp_t;
typedef struct typedef struct bsdicrypt_tmp
{ {
u32 Kc[16]; u32 Kc[16];
u32 Kd[16]; u32 Kd[16];
@ -1443,7 +1443,7 @@ typedef struct
} bsdicrypt_tmp_t; } bsdicrypt_tmp_t;
typedef struct typedef struct rar3_tmp
{ {
u32 dgst[17][5]; u32 dgst[17][5];
@ -1457,7 +1457,7 @@ typedef struct
} seven_zip_hook_t; } seven_zip_hook_t;
typedef struct typedef struct cram_md5
{ {
u32 user[16]; u32 user[16];