aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps/wps_defs.h
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2010-06-18 01:35:18 (GMT)
committerJouni Malinen <j@w1.fi>2010-09-09 13:07:48 (GMT)
commit53587ec1836cc9532d33c872875e1bad422ab5ad (patch)
treeee1e95f22a01684951959ce045a373c11058c99f /src/wps/wps_defs.h
parentc15a854aec10a053cdbb955abc7f05d11fa51d1f (diff)
downloadhostap-53587ec1836cc9532d33c872875e1bad422ab5ad.zip
hostap-53587ec1836cc9532d33c872875e1bad422ab5ad.tar.gz
hostap-53587ec1836cc9532d33c872875e1bad422ab5ad.tar.bz2
WPS 2.0: Make WSC 2.0 support to be build option (CONFIG_WPS2)
For now, the default build will only include WSC 1.0 support. CONFIG_WPS2=y can be used to add support for WSC 2.0.
Diffstat (limited to 'src/wps/wps_defs.h')
-rw-r--r--src/wps/wps_defs.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wps/wps_defs.h b/src/wps/wps_defs.h
index 13716de..1343a43 100644
--- a/src/wps/wps_defs.h
+++ b/src/wps/wps_defs.h
@@ -15,11 +15,15 @@
#ifndef WPS_DEFS_H
#define WPS_DEFS_H
+#ifdef CONFIG_WPS2
#ifdef CONFIG_WPS_EXTENSIBILITY_TESTING
#define WPS_VERSION 0x57
#else /* CONFIG_WPS_EXTENSIBILITY_TESTING */
#define WPS_VERSION 0x20
#endif /* CONFIG_WPS_EXTENSIBILITY_TESTING */
+#else /* CONFIG_WPS2 */
+#define WPS_VERSION 0x10
+#endif /* CONFIG_WPS2 */
/* Diffie-Hellman 1536-bit MODP Group; RFC 3526, Group 5 */
#define WPS_DH_GROUP 5
@@ -129,12 +133,14 @@ 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 */
};
@@ -222,10 +228,12 @@ enum wps_config_error {
#define WPS_CONFIG_NFC_INTERFACE 0x0040
#define WPS_CONFIG_PUSHBUTTON 0x0080
#define WPS_CONFIG_KEYPAD 0x0100
+#ifdef CONFIG_WPS2
#define WPS_CONFIG_VIRT_PUSHBUTTON 0x0280
#define WPS_CONFIG_PHY_PUSHBUTTON 0x0480
#define WPS_CONFIG_VIRT_DISPLAY 0x2008
#define WPS_CONFIG_PHY_DISPLAY 0x4008
+#endif /* CONFIG_WPS2 */
/* Connection Type Flags */
#define WPS_CONN_ESS 0x01