]> git.ipfire.org Git - thirdparty/hostap.git/commit - wpa_supplicant/config_ssid.h
WPS: Merge mixed-WPA/WPA2 credentials if received in same session
authorHu Wang <huw@qti.qualcomm.com>
Fri, 29 Aug 2014 17:11:13 +0000 (20:11 +0300)
committerJouni Malinen <j@w1.fi>
Fri, 29 Aug 2014 17:25:18 +0000 (20:25 +0300)
commite5a4b85b2fa416efb516825f884a0eda5b3f1c40
tree40fc346d556cc3a08da91d336f6ac1acbb6e3bfc
parentdb9418bb1b8054b54d9b299e0334850d5e2b77ad
WPS: Merge mixed-WPA/WPA2 credentials if received in same session

Some deployed APs send two credentials when in mixed-WPA/WPA2
configuration; one for the WPA-Personal/TKIP and the other for
WPA2-Personal/CCMP. Previously, this would result in two network blocks
getting added for the single AP. This can be somewhat confusing and
unnecessary, so merge such credentials into a single one that allows
both WPA and WPA2 to be used.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
wpa_supplicant/config_ssid.h
wpa_supplicant/wpa_supplicant_i.h
wpa_supplicant/wps_supplicant.c