Deleted Added
full compact
eapol_common.h (252726) eapol_common.h (281806)
1/*
2 * EAPOL definitions shared between hostapd and wpa_supplicant
3 * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
4 *
5 * This software may be distributed under the terms of the BSD license.
6 * See README for more details.
7 */
8

--- 8 unchanged lines hidden (view full) ---

17
18struct ieee802_1x_hdr {
19 u8 version;
20 u8 type;
21 be16 length;
22 /* followed by length octets of data */
23} STRUCT_PACKED;
24
1/*
2 * EAPOL definitions shared between hostapd and wpa_supplicant
3 * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
4 *
5 * This software may be distributed under the terms of the BSD license.
6 * See README for more details.
7 */
8

--- 8 unchanged lines hidden (view full) ---

17
18struct ieee802_1x_hdr {
19 u8 version;
20 u8 type;
21 be16 length;
22 /* followed by length octets of data */
23} STRUCT_PACKED;
24
25struct ieee8023_hdr {
26 u8 dest[ETH_ALEN];
27 u8 src[ETH_ALEN];
28 u16 ethertype;
29} STRUCT_PACKED;
30
25#ifdef _MSC_VER
26#pragma pack(pop)
27#endif /* _MSC_VER */
28
31#ifdef _MSC_VER
32#pragma pack(pop)
33#endif /* _MSC_VER */
34
35#ifdef CONFIG_MACSEC
36#define EAPOL_VERSION 3
37#else /* CONFIG_MACSEC */
29#define EAPOL_VERSION 2
38#define EAPOL_VERSION 2
39#endif /* CONFIG_MACSEC */
30
31enum { IEEE802_1X_TYPE_EAP_PACKET = 0,
32 IEEE802_1X_TYPE_EAPOL_START = 1,
33 IEEE802_1X_TYPE_EAPOL_LOGOFF = 2,
34 IEEE802_1X_TYPE_EAPOL_KEY = 3,
40
41enum { IEEE802_1X_TYPE_EAP_PACKET = 0,
42 IEEE802_1X_TYPE_EAPOL_START = 1,
43 IEEE802_1X_TYPE_EAPOL_LOGOFF = 2,
44 IEEE802_1X_TYPE_EAPOL_KEY = 3,
35 IEEE802_1X_TYPE_EAPOL_ENCAPSULATED_ASF_ALERT = 4
45 IEEE802_1X_TYPE_EAPOL_ENCAPSULATED_ASF_ALERT = 4,
46 IEEE802_1X_TYPE_EAPOL_MKA = 5,
36};
37
38enum { EAPOL_KEY_TYPE_RC4 = 1, EAPOL_KEY_TYPE_RSN = 2,
39 EAPOL_KEY_TYPE_WPA = 254 };
40
41
42#define IEEE8021X_REPLAY_COUNTER_LEN 8
43#define IEEE8021X_KEY_SIGN_LEN 16

--- 38 unchanged lines hidden ---
47};
48
49enum { EAPOL_KEY_TYPE_RC4 = 1, EAPOL_KEY_TYPE_RSN = 2,
50 EAPOL_KEY_TYPE_WPA = 254 };
51
52
53#define IEEE8021X_REPLAY_COUNTER_LEN 8
54#define IEEE8021X_KEY_SIGN_LEN 16

--- 38 unchanged lines hidden ---