diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-03-21 10:54:03 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-03-21 10:57:58 -0700 |
| commit | 6cb1f6521a84955752c2b99100cf1df87637f86c (patch) | |
| tree | 78cfdb37785edace7c8d06ccad3925210201c157 /src/wps | |
| parent | b36ed7cd946148d829f311de8fe53ea3ffaaffe3 (diff) | |
| download | android_external_wpa_supplicant_8-6cb1f6521a84955752c2b99100cf1df87637f86c.tar.gz android_external_wpa_supplicant_8-6cb1f6521a84955752c2b99100cf1df87637f86c.tar.bz2 android_external_wpa_supplicant_8-6cb1f6521a84955752c2b99100cf1df87637f86c.zip | |
Cumulative patch from commit 20ff2642e192437245422c9654463bcebf65b277
20ff264 WPS: Clear WPS data on init failure
f19e370 WPS: Do not advertise WPA/WPA2-Enterprise Auth Type Flags
1b5df9e nl80211: Do not indicate scan started event on scan_for_auth
bb23826 HS 2.0R2: Clean up debug log during exit path
48408fc HS 2.0R2: Do not mandate OCSP response for EST operations
8f60293 HS 2.0R2: Do not use OSU cert validation for EST
40bdcea HS 2.0R2: Configure OSU client trust root more consistently
4d65ded HS 2.0R2: Clean up debug from libcurl
Change-Id: I44aa20ac92abf03ea7b47f1ecad72dc07a0870d9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/wps')
| -rw-r--r-- | src/wps/wps_attr_build.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wps/wps_attr_build.c b/src/wps/wps_attr_build.c index 62d0feb9..c7e1cbb2 100644 --- a/src/wps/wps_attr_build.c +++ b/src/wps/wps_attr_build.c @@ -296,6 +296,9 @@ int wps_build_registrar_nonce(struct wps_data *wps, struct wpabuf *msg) int wps_build_auth_type_flags(struct wps_data *wps, struct wpabuf *msg) { u16 auth_types = WPS_AUTH_TYPES; + /* WPA/WPA2-Enterprise enrollment not supported through WPS */ + auth_types &= ~WPS_AUTH_WPA; + auth_types &= ~WPS_AUTH_WPA2; #ifdef CONFIG_WPS2 auth_types &= ~WPS_AUTH_SHARED; #endif /* CONFIG_WPS2 */ |