aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps/wps_defs.h
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-12-11 16:00:10 (GMT)
committerJouni Malinen <j@w1.fi>2010-09-09 13:07:47 (GMT)
commitf439079e93dfff93d184df727bb8bedef4a9fcb2 (patch)
tree53ba3fe6bb0ae1689625cf53ed17227145e45c91 /src/wps/wps_defs.h
parent266c828e54b2fe6079840306308ec1eb349b5ab3 (diff)
downloadhostap-f439079e93dfff93d184df727bb8bedef4a9fcb2.zip
hostap-f439079e93dfff93d184df727bb8bedef4a9fcb2.tar.gz
hostap-f439079e93dfff93d184df727bb8bedef4a9fcb2.tar.bz2
WPS 2.0: Add new attributes and update version negotiation
This adds definitions and parsing of the new attributes that were added in WPS 2.0. In addition, the version negotiation is updated to use the new mechanism, i.e., accept everything received and use the new Version2 attribute in transmitted messages.
Diffstat (limited to 'src/wps/wps_defs.h')
-rw-r--r--src/wps/wps_defs.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/wps/wps_defs.h b/src/wps/wps_defs.h
index 750ca41..9f3f152 100644
--- a/src/wps/wps_defs.h
+++ b/src/wps/wps_defs.h
@@ -15,7 +15,7 @@
#ifndef WPS_DEFS_H
#define WPS_DEFS_H
-#define WPS_VERSION 0x10
+#define WPS_VERSION 0x20
/* Diffie-Hellman 1536-bit MODP Group; RFC 3526, Group 5 */
#define WPS_DH_GROUP 5
@@ -124,7 +124,13 @@ enum wps_attribute {
ATTR_KEY_PROVIDED_AUTO = 0x1061,
ATTR_802_1X_ENABLED = 0x1062,
ATTR_APPSESSIONKEY = 0x1063,
- ATTR_WEPTRANSMITKEY = 0x1064
+ ATTR_WEPTRANSMITKEY = 0x1064,
+ 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
};
/* Device Password ID */