diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2007-07-28 10:55:30 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2007-07-28 10:55:30 +0000 |
| commit | 0a83898af0b12bf8c10b849fd153c74543c01b7c (patch) | |
| tree | d440adc8f6b2d84cbda5c927b8f29b3d7295d390 /sys/net80211 | |
| parent | de3d57efce3153fd5af88e363b2964bae22595e1 (diff) | |
WPA1 uses its own (non-standard) EAPOL-Key descriptor type.
Remove a double definition.
Add definitions for Key Data Encapsulations.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 19fb0dcf289..33eccc11400 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211.h,v 1.31 2007/07/24 16:44:01 damien Exp $ */ +/* $OpenBSD: ieee80211.h,v 1.32 2007/07/28 10:55:29 damien Exp $ */ /* $NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $ */ /*- @@ -628,8 +628,9 @@ struct ieee80211_eapol_key { u_int8_t len[2]; u_int8_t desc; /* IEEE Std 802.1X-2004, 7.6.1 */ -#define EAPOL_KEY_TYPE_RC4 1 /* deprecated */ -#define EAPOL_KEY_TYPE_IEEE80211 2 +#define EAPOL_KEY_DESC_RC4 1 /* deprecated */ +#define EAPOL_KEY_DESC_IEEE80211 2 +#define EAPOL_KEY_DESC_WPA1 254 /* non-standard WPA1 */ u_int8_t info[2]; #define EAPOL_KEY_VERSION_MASK 0x7 @@ -643,7 +644,6 @@ struct ieee80211_eapol_key { #define EAPOL_KEY_ERROR (1 << 10) #define EAPOL_KEY_REQUEST (1 << 11) #define EAPOL_KEY_ENCRYPTED (1 << 12) -#define EAPOL_KEY_ENCRYPTED (1 << 12) #define EAPOL_KEY_SMK (1 << 13) u_int8_t keylen[2]; @@ -666,4 +666,17 @@ struct ieee80211_ptk { #define IEEE80211_PMKID_LEN 16 #define IEEE80211_SMKID_LEN 16 +/* + * Key Data Encapsulation (see Table 62). + */ +enum { + IEEE80211_KDE_GTK = 1, + IEEE80211_KDE_MACADDR = 3, + IEEE80211_KDE_PMKID = 4, + IEEE80211_KDE_SMK = 5, + IEEE80211_KDE_NONCE = 6, + IEEE80211_KDE_LIFETIME = 7, + IEEE80211_KDE_ERROR = 8 +}; + #endif /* _NET80211_IEEE80211_H_ */ |