aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps/wps_defs.h
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2010-07-29 17:23:20 (GMT)
committerJouni Malinen <j@w1.fi>2010-09-09 13:07:49 (GMT)
commitfdc9eeb175a297fd7423b2814ce796fcaa21e181 (patch)
treee4e07c5d56a3f6929e3201c46249a39781777b2f /src/wps/wps_defs.h
parentac4dcaf7bf2ab86823314b1b161e13d802d0ea58 (diff)
downloadhostap-fdc9eeb175a297fd7423b2814ce796fcaa21e181.zip
hostap-fdc9eeb175a297fd7423b2814ce796fcaa21e181.tar.gz
hostap-fdc9eeb175a297fd7423b2814ce796fcaa21e181.tar.bz2
WPS 2.0: Convert new attributes into WFA vendor extension
The WSC 2.0 specification moved to use another design for the new attributes to avoid backwards compatibility issues with some deployed implementations.
Diffstat (limited to 'src/wps/wps_defs.h')
-rw-r--r--src/wps/wps_defs.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/wps/wps_defs.h b/src/wps/wps_defs.h
index 1343a43..719333a 100644
--- a/src/wps/wps_defs.h
+++ b/src/wps/wps_defs.h
@@ -133,17 +133,21 @@ enum wps_attribute {
ATTR_802_1X_ENABLED = 0x1062,
ATTR_APPSESSIONKEY = 0x1063,
ATTR_WEPTRANSMITKEY = 0x1064,
-#ifdef CONFIG_WPS2
- ATTR_SETTINGS_DELAY_TIME = 0x1065,
- ATTR_NETWORK_KEY_SHAREABLE = 0x1066,
- ATTR_VERSION2 = 0x1067,
- ATTR_REQUEST_TO_ENROLL = 0x1068,
- ATTR_AUTHORIZED_MACS = 0x1069,
ATTR_REQUESTED_DEV_TYPE = 0x106a,
-#endif /* CONFIG_WPS2 */
ATTR_EXTENSIBILITY_TEST = 0x10fa /* _NOT_ defined in the spec */
};
+#define WPS_VENDOR_ID_WFA 14122
+
+/* WFA Vendor Extension subelements */
+enum {
+ WFA_ELEM_VERSION2 = 0x00,
+ WFA_ELEM_AUTHORIZEDMACS = 0x01,
+ WFA_ELEM_NETWORK_KEY_SHAREABLE = 0x02,
+ WFA_ELEM_REQUEST_TO_ENROLL = 0x03,
+ WFA_ELEM_SETTINGS_DELAY_TIME = 0x04
+};
+
/* Device Password ID */
enum wps_dev_password_id {
DEV_PW_DEFAULT = 0x0000,