typedef VTYPE(ulong, VECT_SIZE) u64x;
#endif
-// this one needs to die
-#define allx(r) r
-
static inline u32 l32_from_64_S (u64 a)
{
const u32 r = (u32) (a);
static inline u64 rotr64_S (const u64 a, const u32 n)
{
- #if DEVICE_TYPE == DEVICE_TYPE_CPU
-
- const u64 r = rotate (a, (u64) 64 - n);
-
- #else
-
const u32 a0 = h32_from_64_S (a);
const u32 a1 = l32_from_64_S (a);
const u64 r = hl32_to_64_S (t0, t1);
- #endif
-
return r;
}
static inline u64x rotr64 (const u64x a, const u32 n)
{
- #if DEVICE_TYPE == DEVICE_TYPE_CPU
-
- const u64x r = rotate (a, (u64) 64 - n);
-
- #else
-
const u32x a0 = h32_from_64 (a);
const u32x a1 = l32_from_64 (a);
const u64x r = hl32_to_64 (t0, t1);
- #endif
-
return r;
}
u32 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;
u32 version;
u32 algorithm;
+ /* 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];