uint eapol[64];
int eapol_size;
int keyver;
+ u8 orig_mac1[6];
+ u8 orig_mac2[6];
+ u8 orig_nonce1[32];
+ u8 orig_nonce2[32];
} wpa_t;
/* key-file handling */
u32 keyfile_len;
u32 keyfile[8];
-
+
u32 final_random_seed[8];
u32 transf_random_seed[8];
u32 enc_iv[4];
/* specific to version 1 */
u32 contents_len;
- u32 contents[12500];
+ u32 contents[75000];
/* specific to version 2 */
u32 expected_bytes[8];
} oldoffice34_t;
+typedef struct
+{
+ u32 salt_buf[128];
+ u32 salt_len;
+
+ u32 pc_digest[5];
+ u32 pc_offset;
+
+} pstoken_t;
+
typedef struct
{
uint P[256];
u64 device_maxmem_alloc;
u64 device_global_mem;
u32 device_maxclock_frequency;
+ size_t device_maxworkgroup_size;
uint vector_width;
uint kernel_power;
uint kernel_power_user;
- uint size_pws;
- uint size_tmps;
- uint size_hooks;
- uint size_bfs;
- uint size_combs;
- uint size_rules;
- uint size_rules_c;
- uint size_root_css;
- uint size_markov_css;
- uint size_digests;
- uint size_salts;
- uint size_shown;
- uint size_results;
- uint size_plains;
+ size_t size_pws;
+ size_t size_tmps;
+ size_t size_hooks;
+ size_t size_bfs;
+ size_t size_combs;
+ size_t size_rules;
+ size_t size_rules_c;
+ size_t size_root_css;
+ size_t size_markov_css;
+ size_t size_digests;
+ size_t size_salts;
+ size_t size_shown;
+ size_t size_results;
+ size_t size_plains;
FILE *combs_fp;
comb_t *combs_buf;
uint exec_pos;
double exec_ms[EXEC_CACHE];
+ // this is "current" speed
+
uint speed_pos;
u64 speed_cnt[SPEED_CACHE];
- float speed_ms[SPEED_CACHE];
-
- hc_timer_t speed_rec[SPEED_CACHE];
+ double speed_ms[SPEED_CACHE];
hc_timer_t timer_speed;
hc_timer_t timer_running; // timer on current dict
hc_timer_t timer_paused; // timer on current dict
- float ms_paused; // timer on current dict
+ double ms_paused; // timer on current dict
/**
* hash_info and username