Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity
1772d348ea
fragattacks/wpa_supplicant/wps_supplicant.c

2849 lines
76 KiB
C
Raw Normal View History

WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
/*
* wpa_supplicant / WPS integration
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 10:56:50 -05:00
* Copyright (c) 2008-2014, Jouni Malinen <j@w1.fi>
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
*
Remove the GPL notification from files contributed by Jouni Malinen Remove the GPL notification text from the files that were initially contributed by myself. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 09:46:35 -05:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
*/
#include "includes.h"
#include "common.h"
Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
2009-11-29 16:04:43 -05:00
#include "eloop.h"
#include "uuid.h"
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
#include "crypto/random.h"
Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
2009-11-29 16:04:43 -05:00
#include "crypto/dh_group5.h"
Remove src/common from default header file path This makes it clearer which files are including header from src/common. Some of these cases should probably be cleaned up in the future not to do that. In addition, src/common/nl80211_copy.h and wireless_copy.h were moved into src/drivers since they are only used by driver wrappers and do not need to live in src/common.
2009-11-29 10:51:55 -05:00
#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "common/wpa_common.h"
Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
2009-11-29 16:04:43 -05:00
#include "common/wpa_ctrl.h"
#include "eap_common/eap_wsc_common.h"
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 06:38:03 -05:00
#include "eap_peer/eap.h"
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 12:02:24 -04:00
#include "eapol_supp/eapol_supp_sm.h"
Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
2009-11-29 16:04:43 -05:00
#include "rsn_supp/wpa.h"
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
#include "wps/wps_attr_parse.h"
Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
2009-11-29 16:04:43 -05:00
#include "config.h"
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
#include "wpa_supplicant_i.h"
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 14:37:05 -04:00
#include "driver_i.h"
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
#include "notify.h"
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
#include "blacklist.h"
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
#include "bss.h"
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 11:48:11 -05:00
#include "scan.h"
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
#include "ap.h"
P2P: Use SSID from GO Negotiation to limit WPS provisioning step In order to avoid picking incorrect SSID from old scan results, use SSID from GO Negotiation to select the AP.
2010-08-05 12:15:11 -04:00
#include "p2p/p2p.h"
P2P: Add initial version of P2P Module
2010-07-18 17:30:25 -04:00
#include "p2p_supplicant.h"
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
#include "wps_supplicant.h"
WPS: Clear SSID selection if more than one BSSID match is found Need to use wildcard SSID matching for WPS connection if the same BSSID occurs multiple time in scan results since any of the SSIDs may be used.
2009-12-28 09:07:15 -05:00
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
#ifndef WPS_PIN_SCAN_IGNORE_SEL_REG
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
#define WPS_PIN_SCAN_IGNORE_SEL_REG 3
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
#endif /* WPS_PIN_SCAN_IGNORE_SEL_REG */
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
static void wpas_wps_timeout(void *eloop_ctx, void *timeout_ctx);
WPS: Added callback for failure-after-M2/M2D This callback is now used to stop wpa_supplicant from trying to continue using parameters (most likely, device password) that do not work in a loop. In addition, wpa_gui can now notify user of failed registration.
2008-12-19 15:19:41 -05:00
static void wpas_clear_wps(struct wpa_supplicant *wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
static void wpas_wps_clear_ap_info(struct wpa_supplicant *wpa_s)
{
os_free(wpa_s->wps_ap);
wpa_s->wps_ap = NULL;
wpa_s->num_wps_ap = 0;
wpa_s->wps_ap_iter = 0;
}
WPS: Split eapol_cb reconnect to a separate code path Use eloop timeout to run the reconnect command after eapol_cb has returned. This reduces stack use and can simplify the driver command/event sequence by allowing the disconnection events from the provisioning step to be processed before starting the actual data connection. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-13 04:47:03 -04:00
static void wpas_wps_assoc_with_cred(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
int use_fast_assoc = timeout_ctx != NULL;
wpa_printf(MSG_DEBUG, "WPS: Continuing association after eapol_cb");
if (!use_fast_assoc ||
wpa_supplicant_fast_associate(wpa_s) != 1)
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
static void wpas_wps_assoc_with_cred_cancel(struct wpa_supplicant *wpa_s)
{
eloop_cancel_timeout(wpas_wps_assoc_with_cred, wpa_s, (void *) 0);
eloop_cancel_timeout(wpas_wps_assoc_with_cred, wpa_s, (void *) 1);
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s)
{
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 10:56:50 -05:00
if (wpas_p2p_wps_eapol_cb(wpa_s) > 0)
return 1;
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
if (!wpa_s->wps_success &&
wpa_s->current_ssid &&
eap_is_wps_pin_enrollee(&wpa_s->current_ssid->eap)) {
const u8 *bssid = wpa_s->bssid;
if (is_zero_ether_addr(bssid))
bssid = wpa_s->pending_bssid;
wpa_printf(MSG_DEBUG, "WPS: PIN registration with " MACSTR
" did not succeed - continue trying to find "
"suitable AP", MAC2STR(bssid));
wpa_blacklist_add(wpa_s, bssid);
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s,
wpa_s->blacklist_cleared ? 5 : 0, 0);
wpa_s->blacklist_cleared = 0;
return 1;
}
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
wpas_wps_clear_ap_info(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_cancel_timeout(wpas_wps_timeout, wpa_s, NULL);
WPS: Indicate WPS-FAIL event on EAPOL timeout-based failure callback If the EAPOL processing times out (e.g., if the AP stops replying to messages for some reason) during WPS negotiation, we need to indicate WPS-FAIL event from eapol_cb since no other WPS failure is reported for this particular case.
2011-01-13 11:04:33 -05:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS && !wpa_s->wps_success)
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_FAIL);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS && wpa_s->current_ssid &&
!(wpa_s->current_ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
WPS: Add option to disable open networks by default CONFIG_WPS_REG_DISABLE_OPEN=y can be used to configure wpa_supplicant to disable open networks by default when wps_reg command is used to learn the current AP settings. When this is enabled, there will be a WPS-OPEN-NETWORK ctrl_iface event and the user will need to explicitly enable the network (e.g., with "select_network <id>") to connect to the open network.
2010-12-22 04:33:59 -05:00
int disabled = wpa_s->current_ssid->disabled;
WPS: Fix regression in post-WPS scan optimization Commit 3c85f144ce7aa3967f881a7584a5b125061ca436 fixed issues with P2P Action frame TX after disconnection by clearing wpa_s->assoc_freq. This resulted in a regression to the post-WPS scan optimization that used wpa_s->assoc_freq to enable fast single-channel scan. Fix this by copying wpa_s->assoc_freq to a local variable before calling wpa_supplicant_deauthenticate() that ends up calling wpa_supplicant_mark_disassoc() which will clear assoc_freq. Reported-by: Angie Chinchilla <angie.v.chinchilla@intel.com> intended-for: hostap-1 Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-12 06:54:15 -05:00
unsigned int freq = wpa_s->assoc_freq;
WPS: Skip rescanning after provisioning if AP was configured If WPS provisioning step is completed with an AP that is in WPS configured state, we can skip a second scan after the provisioning step since the AP is unlikely to change its configuration in such a case. This can speed up WPS connection a bit by removing an unneeded scan. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-03-31 13:06:42 -04:00
struct wpa_bss *bss;
struct wpa_ssid *ssid = NULL;
int use_fast_assoc = 0;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
wpa_printf(MSG_DEBUG, "WPS: Network configuration replaced - "
WPS: Fix regression in post-WPS scan optimization Commit 3c85f144ce7aa3967f881a7584a5b125061ca436 fixed issues with P2P Action frame TX after disconnection by clearing wpa_s->assoc_freq. This resulted in a regression to the post-WPS scan optimization that used wpa_s->assoc_freq to enable fast single-channel scan. Fix this by copying wpa_s->assoc_freq to a local variable before calling wpa_supplicant_deauthenticate() that ends up calling wpa_supplicant_mark_disassoc() which will clear assoc_freq. Reported-by: Angie Chinchilla <angie.v.chinchilla@intel.com> intended-for: hostap-1 Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-12 06:54:15 -05:00
"try to associate with the received credential "
"(freq=%u)", freq);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
wpa_s->own_disconnect_req = 1;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
WPS: Add option to disable open networks by default CONFIG_WPS_REG_DISABLE_OPEN=y can be used to configure wpa_supplicant to disable open networks by default when wps_reg command is used to learn the current AP settings. When this is enabled, there will be a WPS-OPEN-NETWORK ctrl_iface event and the user will need to explicitly enable the network (e.g., with "select_network <id>") to connect to the open network.
2010-12-22 04:33:59 -05:00
if (disabled) {
wpa_printf(MSG_DEBUG, "WPS: Current network is "
"disabled - wait for user to enable");
return 1;
}
Optimize post-WPS scan based on channel used during provisioning Scan only the frequency that was used during provisioning during the first five scans for the connection. This speeds up connection in the most likely case where the AP remains on the same channel. If the AP is not found after these initial scans, all channels will be scanned.
2010-04-11 12:06:42 -04:00
wpa_s->after_wps = 5;
WPS: Fix regression in post-WPS scan optimization Commit 3c85f144ce7aa3967f881a7584a5b125061ca436 fixed issues with P2P Action frame TX after disconnection by clearing wpa_s->assoc_freq. This resulted in a regression to the post-WPS scan optimization that used wpa_s->assoc_freq to enable fast single-channel scan. Fix this by copying wpa_s->assoc_freq to a local variable before calling wpa_supplicant_deauthenticate() that ends up calling wpa_supplicant_mark_disassoc() which will clear assoc_freq. Reported-by: Angie Chinchilla <angie.v.chinchilla@intel.com> intended-for: hostap-1 Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-12 06:54:15 -05:00
wpa_s->wps_freq = freq;
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 11:36:36 -05:00
wpa_s->normal_scans = 0;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
wpa_s->reassociate = 1;
WPS: Skip rescanning after provisioning if AP was configured If WPS provisioning step is completed with an AP that is in WPS configured state, we can skip a second scan after the provisioning step since the AP is unlikely to change its configuration in such a case. This can speed up WPS connection a bit by removing an unneeded scan. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-03-31 13:06:42 -04:00
wpa_printf(MSG_DEBUG, "WPS: Checking whether fast association "
"without a new scan can be used");
bss = wpa_supplicant_pick_network(wpa_s, &ssid);
if (bss) {
struct wpabuf *wps;
struct wps_parse_attr attr;
wps = wpa_bss_get_vendor_ie_multi(bss,
WPS_IE_VENDOR_TYPE);
if (wps && wps_parse_msg(wps, &attr) == 0 &&
attr.wps_state &&
*attr.wps_state == WPS_STATE_CONFIGURED)
use_fast_assoc = 1;
wpabuf_free(wps);
}
WPS: Split eapol_cb reconnect to a separate code path Use eloop timeout to run the reconnect command after eapol_cb has returned. This reduces stack use and can simplify the driver command/event sequence by allowing the disconnection events from the provisioning step to be processed before starting the actual data connection. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-13 04:47:03 -04:00
/*
* Complete the next step from an eloop timeout to allow pending
* driver events related to the disconnection to be processed
* first. This makes it less likely for disconnection event to
* cause problems with the following connection.
*/
wpa_printf(MSG_DEBUG, "WPS: Continue association from timeout");
wpas_wps_assoc_with_cred_cancel(wpa_s);
eloop_register_timeout(0, 10000,
wpas_wps_assoc_with_cred, wpa_s,
use_fast_assoc ? (void *) 1 :
(void *) 0);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
return 1;
}
WPS: Add configurable option for processing credentials externally The wps_cred_process option can be used to configure wpa_supplicant to send received Credential attributes for external processing over ctrl_iface and dbus. This allows external programs to update their configuration when WPS is used to provision new networks.
2009-01-18 05:27:12 -05:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS && wpa_s->current_ssid) {
wpa_printf(MSG_DEBUG, "WPS: Registration completed - waiting "
"for external credential processing");
wpas_clear_wps(wpa_s);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
wpa_s->own_disconnect_req = 1;
WPS: Add configurable option for processing credentials externally The wps_cred_process option can be used to configure wpa_supplicant to send received Credential attributes for external processing over ctrl_iface and dbus. This allows external programs to update their configuration when WPS is used to provision new networks.
2009-01-18 05:27:12 -05:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
return 1;
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
return 0;
}
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
static void wpas_wps_security_workaround(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
const struct wps_credential *cred)
{
struct wpa_driver_capa capa;
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
struct wpa_bss *bss;
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
const u8 *ie;
struct wpa_ie_data adv;
int wpa2 = 0, ccmp = 0;
/*
* Many existing WPS APs do not know how to negotiate WPA2 or CCMP in
* case they are configured for mixed mode operation (WPA+WPA2 and
* TKIP+CCMP). Try to use scan results to figure out whether the AP
* actually supports stronger security and select that if the client
* has support for it, too.
*/
if (wpa_drv_get_capa(wpa_s, &capa))
return; /* Unknown what driver supports */
WPS: Check malloc success on workaround path ssid->ssid could be NULL here if malloc failed, so better check that consistently.
2011-07-15 07:21:50 -04:00
if (ssid->ssid == NULL)
return;
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
bss = wpa_bss_get(wpa_s, cred->mac_addr, ssid->ssid, ssid->ssid_len);
if (bss == NULL) {
wpa_printf(MSG_DEBUG, "WPS: The AP was not found from BSS "
"table - use credential as-is");
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
return;
}
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
wpa_printf(MSG_DEBUG, "WPS: AP found from BSS table");
ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &adv) == 0) {
wpa2 = 1;
if (adv.pairwise_cipher & WPA_CIPHER_CCMP)
ccmp = 1;
} else {
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &adv) == 0 &&
adv.pairwise_cipher & WPA_CIPHER_CCMP)
ccmp = 1;
}
if (ie == NULL && (ssid->proto & WPA_PROTO_WPA) &&
(ssid->pairwise_cipher & WPA_CIPHER_TKIP)) {
/*
* TODO: This could be the initial AP configuration and the
* Beacon contents could change shortly. Should request a new
* scan and delay addition of the network until the updated
* scan results are available.
*/
wpa_printf(MSG_DEBUG, "WPS: The AP did not yet advertise WPA "
"support - use credential as-is");
return;
}
if (ccmp && !(ssid->pairwise_cipher & WPA_CIPHER_CCMP) &&
(ssid->pairwise_cipher & WPA_CIPHER_TKIP) &&
(capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
wpa_printf(MSG_DEBUG, "WPS: Add CCMP into the credential "
"based on scan results");
if (wpa_s->conf->ap_scan == 1)
ssid->pairwise_cipher |= WPA_CIPHER_CCMP;
else
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
}
if (wpa2 && !(ssid->proto & WPA_PROTO_RSN) &&
(ssid->proto & WPA_PROTO_WPA) &&
(capa.enc & WPA_DRIVER_CAPA_ENC_CCMP)) {
wpa_printf(MSG_DEBUG, "WPS: Add WPA2 into the credential "
"based on scan results");
if (wpa_s->conf->ap_scan == 1)
ssid->proto |= WPA_PROTO_RSN;
else
ssid->proto = WPA_PROTO_RSN;
}
}
WPS: Remove duplicate networks after WPS Each attempt to connect to the same network using WPS would result in the duplicate configuration getting added. Avoid such redundant additions by comparing the network configuration with an already existing one and remove the older network if the new credential provisioned through WPS is identical. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-30 06:35:50 -04:00
static void wpas_wps_remove_dup_network(struct wpa_supplicant *wpa_s,
struct wpa_ssid *new_ssid)
{
struct wpa_ssid *ssid, *next;
for (ssid = wpa_s->conf->ssid, next = ssid ? ssid->next : NULL; ssid;
ssid = next, next = ssid ? ssid->next : NULL) {
/*
* new_ssid has already been added to the list in
* wpas_wps_add_network(), so skip it.
*/
if (ssid == new_ssid)
continue;
if (ssid->bssid_set || new_ssid->bssid_set) {
if (ssid->bssid_set != new_ssid->bssid_set)
continue;
if (os_memcmp(ssid->bssid, new_ssid->bssid, ETH_ALEN) !=
0)
continue;
}
/* compare SSID */
if (ssid->ssid_len == 0 || ssid->ssid_len != new_ssid->ssid_len)
continue;
if (ssid->ssid && new_ssid->ssid) {
if (os_memcmp(ssid->ssid, new_ssid->ssid,
ssid->ssid_len) != 0)
continue;
} else if (ssid->ssid || new_ssid->ssid)
continue;
/* compare security parameters */
if (ssid->auth_alg != new_ssid->auth_alg ||
ssid->key_mgmt != new_ssid->key_mgmt ||
P2P: Support GCMP as part of 60 GHz support Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-26 08:04:29 -04:00
(ssid->group_cipher != new_ssid->group_cipher &&
!(ssid->group_cipher & new_ssid->group_cipher &
WPA_CIPHER_CCMP)))
WPS: Remove duplicate networks after WPS Each attempt to connect to the same network using WPS would result in the duplicate configuration getting added. Avoid such redundant additions by comparing the network configuration with an already existing one and remove the older network if the new credential provisioned through WPS is identical. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-30 06:35:50 -04:00
continue;
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>
2014-08-29 13:11:13 -04:00
/*
* Some existing WPS APs will send two creds in case they are
* configured for mixed mode operation (WPA+WPA2 and TKIP+CCMP).
* Try to merge these two creds if they are received in the same
* M8 message.
*/
if (ssid->wps_run && ssid->wps_run == new_ssid->wps_run &&
wpa_key_mgmt_wpa_psk(ssid->key_mgmt)) {
if (new_ssid->passphrase && ssid->passphrase &&
os_strcmp(new_ssid->passphrase, ssid->passphrase) !=
0) {
wpa_printf(MSG_DEBUG,
"WPS: M8 Creds with different passphrase - do not merge");
continue;
}
if (new_ssid->psk_set &&
(!ssid->psk_set ||
os_memcmp(new_ssid->psk, ssid->psk, 32) != 0)) {
wpa_printf(MSG_DEBUG,
"WPS: M8 Creds with different PSK - do not merge");
continue;
}
if ((new_ssid->passphrase && !ssid->passphrase) ||
(!new_ssid->passphrase && ssid->passphrase)) {
wpa_printf(MSG_DEBUG,
"WPS: M8 Creds with different passphrase/PSK type - do not merge");
continue;
}
wpa_printf(MSG_DEBUG,
"WPS: Workaround - merge likely WPA/WPA2-mixed mode creds in same M8 message");
new_ssid->proto |= ssid->proto;
new_ssid->pairwise_cipher |= ssid->pairwise_cipher;
} else {
/*
* proto and pairwise_cipher difference matter for
* non-mixed-mode creds.
*/
if (ssid->proto != new_ssid->proto ||
ssid->pairwise_cipher != new_ssid->pairwise_cipher)
continue;
}
WPS: Remove duplicate networks after WPS Each attempt to connect to the same network using WPS would result in the duplicate configuration getting added. Avoid such redundant additions by comparing the network configuration with an already existing one and remove the older network if the new credential provisioned through WPS is identical. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-30 06:35:50 -04:00
/* Remove the duplicated older network entry. */
wpa_printf(MSG_DEBUG, "Remove duplicate network %d", ssid->id);
wpas_notify_network_removed(wpa_s, ssid);
WPS: Fix current_ssid clearing on duplicate network removal It was possible for the current network profile to be deleted when merging duplicated WPS credentials. However, this did not clear wpa_s->current_ssid and it was possible for something else to end up dereferencing that pointer to now freed memory. This could be hit, e.g., with ap_wps_mixed_cred. Fix this by clearing current_ssid also in this code path similarly to other cases of network block getting removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-30 08:48:37 -05:00
if (wpa_s->current_ssid == ssid)
wpa_s->current_ssid = NULL;
WPS: Remove duplicate networks after WPS Each attempt to connect to the same network using WPS would result in the duplicate configuration getting added. Avoid such redundant additions by comparing the network configuration with an already existing one and remove the older network if the new credential provisioned through WPS is identical. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-30 06:35:50 -04:00
wpa_config_remove_network(wpa_s->conf, ssid->id);
}
}
WPS: Merged two cred_cb variables into the same one Previously, wpa_supplicant as Enrollee case was handled using a different callback function pointer. However, now that the wps_context structure is allocated for all cases, the same variable can be used in all cases.
2008-11-28 13:02:32 -05:00
static int wpa_supplicant_wps_cred(void *ctx,
const struct wps_credential *cred)
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *ssid = wpa_s->current_ssid;
WPS: Workaround mixed-mode WPA+WPA2 auth type in credentials An SMC router was reported to use 0x22 (WPAPSK + WPA2PSK) in the authentication type of the provisioned credential and wpa_supplicant rejected this as invalid. Work around this by replacing WPAPSK + WPA2PSK with WPA2PSK.
2009-08-15 13:40:45 -04:00
u16 auth_type;
WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN The registrar variable is used only if this macro is defined, so no need to set it otherwise.
2011-10-22 15:21:53 -04:00
#ifdef CONFIG_WPS_REG_DISABLE_OPEN
WPS: Add option to disable open networks by default CONFIG_WPS_REG_DISABLE_OPEN=y can be used to configure wpa_supplicant to disable open networks by default when wps_reg command is used to learn the current AP settings. When this is enabled, there will be a WPS-OPEN-NETWORK ctrl_iface event and the user will need to explicitly enable the network (e.g., with "select_network <id>") to connect to the open network.
2010-12-22 04:33:59 -05:00
int registrar = 0;
WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN The registrar variable is used only if this macro is defined, so no need to set it otherwise.
2011-10-22 15:21:53 -04:00
#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
WPS: Add configurable option for processing credentials externally The wps_cred_process option can be used to configure wpa_supplicant to send received Credential attributes for external processing over ctrl_iface and dbus. This allows external programs to update their configuration when WPS is used to provision new networks.
2009-01-18 05:27:12 -05:00
if ((wpa_s->conf->wps_cred_processing == 1 ||
wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) {
size_t blen = cred->cred_attr_len * 2 + 1;
char *buf = os_malloc(blen);
if (buf) {
wpa_snprintf_hex(buf, blen,
cred->cred_attr, cred->cred_attr_len);
wpa_msg(wpa_s, MSG_INFO, "%s%s",
WPS_EVENT_CRED_RECEIVED, buf);
os_free(buf);
}
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_wps_credential(wpa_s, cred);
WPS: Add configurable option for processing credentials externally The wps_cred_process option can be used to configure wpa_supplicant to send received Credential attributes for external processing over ctrl_iface and dbus. This allows external programs to update their configuration when WPS is used to provision new networks.
2009-01-18 05:27:12 -05:00
} else
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_CRED_RECEIVED);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
WPS: Provide the unparsed Credential attribute to cred_cb() This makes it easier to pass the credential data to external programs (e.g., Network Manager) for processing. The actual use of this data is not yet included in hostapd/wpa_supplicant.
2009-01-17 15:17:12 -05:00
wpa_hexdump_key(MSG_DEBUG, "WPS: Received Credential attribute",
cred->cred_attr, cred->cred_attr_len);
WPS: Add configurable option for processing credentials externally The wps_cred_process option can be used to configure wpa_supplicant to send received Credential attributes for external processing over ctrl_iface and dbus. This allows external programs to update their configuration when WPS is used to provision new networks.
2009-01-18 05:27:12 -05:00
if (wpa_s->conf->wps_cred_processing == 1)
return 0;
WPS: Fix local configuration update after AP configuration Update credential to only include a single authentication and encryption type in case the AP configuration includes more than one option. Without this, the credential would be rejected if the AP was configured to allow more than one authentication type.
2009-03-30 12:00:55 -04:00
wpa_hexdump_ascii(MSG_DEBUG, "WPS: SSID", cred->ssid, cred->ssid_len);
wpa_printf(MSG_DEBUG, "WPS: Authentication Type 0x%x",
cred->auth_type);
wpa_printf(MSG_DEBUG, "WPS: Encryption Type 0x%x", cred->encr_type);
wpa_printf(MSG_DEBUG, "WPS: Network Key Index %d", cred->key_idx);
wpa_hexdump_key(MSG_DEBUG, "WPS: Network Key",
cred->key, cred->key_len);
wpa_printf(MSG_DEBUG, "WPS: MAC Address " MACSTR,
MAC2STR(cred->mac_addr));
WPS: Workaround mixed-mode WPA+WPA2 auth type in credentials An SMC router was reported to use 0x22 (WPAPSK + WPA2PSK) in the authentication type of the provisioned credential and wpa_supplicant rejected this as invalid. Work around this by replacing WPAPSK + WPA2PSK with WPA2PSK.
2009-08-15 13:40:45 -04:00
auth_type = cred->auth_type;
if (auth_type == (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK)) {
wpa_printf(MSG_DEBUG, "WPS: Workaround - convert mixed-mode "
"auth_type into WPA2PSK");
auth_type = WPS_AUTH_WPA2PSK;
}
if (auth_type != WPS_AUTH_OPEN &&
auth_type != WPS_AUTH_WPAPSK &&
auth_type != WPS_AUTH_WPA2PSK) {
WPS: Ignore credentials for unsupported authentication type The current implementation does not support WPA/WPA2-Enterprise credentials. Ignore any credential that is using unsupported authentication type to avoid potential issues with partially configured network blocks.
2009-01-17 14:45:51 -05:00
wpa_printf(MSG_DEBUG, "WPS: Ignored credentials for "
WPS: Workaround mixed-mode WPA+WPA2 auth type in credentials An SMC router was reported to use 0x22 (WPAPSK + WPA2PSK) in the authentication type of the provisioned credential and wpa_supplicant rejected this as invalid. Work around this by replacing WPAPSK + WPA2PSK with WPA2PSK.
2009-08-15 13:40:45 -04:00
"unsupported authentication type 0x%x",
auth_type);
WPS: Ignore credentials for unsupported authentication type The current implementation does not support WPA/WPA2-Enterprise credentials. Ignore any credential that is using unsupported authentication type to avoid potential issues with partially configured network blocks.
2009-01-17 14:45:51 -05:00
return 0;
}
WPS: Reject invalid credential more cleanly If WPS Registrar tries to provision a WPA/WPA2-Personal network without including a valid Network Key, the network block cannot be used to connect to the network. Reject such credential without adding the network block. This makes wpa_supplicant send WSC_NACK as a response to the invalid Credential and stop the provisioning process immediately rather than only after trying unsuccessfully to connect to the network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-01 10:30:35 -04:00
if (auth_type == WPS_AUTH_WPAPSK || auth_type == WPS_AUTH_WPA2PSK) {
if (cred->key_len < 8 || cred->key_len > 2 * PMK_LEN) {
wpa_printf(MSG_ERROR, "WPS: Reject PSK credential with "
"invalid Network Key length %lu",
(unsigned long) cred->key_len);
return -1;
}
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
wpa_printf(MSG_DEBUG, "WPS: Replace WPS network block based "
"on the received credential");
WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN The registrar variable is used only if this macro is defined, so no need to set it otherwise.
2011-10-22 15:21:53 -04:00
#ifdef CONFIG_WPS_REG_DISABLE_OPEN
WPS: Add option to disable open networks by default CONFIG_WPS_REG_DISABLE_OPEN=y can be used to configure wpa_supplicant to disable open networks by default when wps_reg command is used to learn the current AP settings. When this is enabled, there will be a WPS-OPEN-NETWORK ctrl_iface event and the user will need to explicitly enable the network (e.g., with "select_network <id>") to connect to the open network.
2010-12-22 04:33:59 -05:00
if (ssid->eap.identity &&
ssid->eap.identity_len == WSC_ID_REGISTRAR_LEN &&
os_memcmp(ssid->eap.identity, WSC_ID_REGISTRAR,
WSC_ID_REGISTRAR_LEN) == 0)
registrar = 1;
WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN The registrar variable is used only if this macro is defined, so no need to set it otherwise.
2011-10-22 15:21:53 -04:00
#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
os_free(ssid->eap.identity);
ssid->eap.identity = NULL;
ssid->eap.identity_len = 0;
os_free(ssid->eap.phase1);
ssid->eap.phase1 = NULL;
os_free(ssid->eap.eap_methods);
ssid->eap.eap_methods = NULL;
P2P: Leave forced BSSID parameter for P2P group P2P group is only going to use a single GO, so we can leave the fixed BSSID parameter set for the actual data connection in addition to the initial WPS provisionign step. This can speed up operations with drivers that select BSS internally by allowing them to skip an extra scan when the BSSID and frequency of the GO is already known. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-07-25 09:18:12 -04:00
if (!ssid->p2p_group) {
P2P: Do not save temporary networks
2010-07-18 17:30:24 -04:00
ssid->temporary = 0;
P2P: Leave forced BSSID parameter for P2P group P2P group is only going to use a single GO, so we can leave the fixed BSSID parameter set for the actual data connection in addition to the initial WPS provisionign step. This can speed up operations with drivers that select BSS internally by allowing them to skip an extra scan when the BSSID and frequency of the GO is already known. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-07-25 09:18:12 -04:00
ssid->bssid_set = 0;
}
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 16:01:26 -04:00
ssid->disabled_until.sec = 0;
ssid->disabled_until.usec = 0;
ssid->auth_failures = 0;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
} else {
wpa_printf(MSG_DEBUG, "WPS: Create a new network based on the "
"received credential");
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL)
return -1;
WPS: Close p2p_group and temporary parameters to all network blocks If a P2P GO issues multiple credentials for some reason, clone the p2p_group and temporary parameters to all those based on the initial network block that gets used for the first credential. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-13 04:44:57 -04:00
if (wpa_s->current_ssid) {
/*
* Should the GO issue multiple credentials for some
* reason, each credential should be marked as a
* temporary P2P group similarly to the one that gets
* marked as such based on the pre-configured values
* used for the WPS network block.
*/
ssid->p2p_group = wpa_s->current_ssid->p2p_group;
ssid->temporary = wpa_s->current_ssid->temporary;
}
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_network_added(wpa_s, ssid);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
}
wpa_config_set_network_defaults(ssid);
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>
2014-08-29 13:11:13 -04:00
ssid->wps_run = wpa_s->wps_run;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
os_free(ssid->ssid);
ssid->ssid = os_malloc(cred->ssid_len);
if (ssid->ssid) {
os_memcpy(ssid->ssid, cred->ssid, cred->ssid_len);
ssid->ssid_len = cred->ssid_len;
}
switch (cred->encr_type) {
case WPS_ENCR_NONE:
break;
case WPS_ENCR_TKIP:
ssid->pairwise_cipher = WPA_CIPHER_TKIP;
break;
case WPS_ENCR_AES:
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
P2P: Support GCMP as part of 60 GHz support Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-26 08:04:29 -04:00
if (wpa_s->drv_capa_known &&
(wpa_s->drv_enc & WPA_DRIVER_CAPA_ENC_GCMP)) {
ssid->pairwise_cipher |= WPA_CIPHER_GCMP;
ssid->group_cipher |= WPA_CIPHER_GCMP;
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
break;
}
WPS: Workaround mixed-mode WPA+WPA2 auth type in credentials An SMC router was reported to use 0x22 (WPAPSK + WPA2PSK) in the authentication type of the provisioned credential and wpa_supplicant rejected this as invalid. Work around this by replacing WPAPSK + WPA2PSK with WPA2PSK.
2009-08-15 13:40:45 -04:00
switch (auth_type) {
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
case WPS_AUTH_OPEN:
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
ssid->key_mgmt = WPA_KEY_MGMT_NONE;
ssid->proto = 0;
WPS: Add option to disable open networks by default CONFIG_WPS_REG_DISABLE_OPEN=y can be used to configure wpa_supplicant to disable open networks by default when wps_reg command is used to learn the current AP settings. When this is enabled, there will be a WPS-OPEN-NETWORK ctrl_iface event and the user will need to explicitly enable the network (e.g., with "select_network <id>") to connect to the open network.
2010-12-22 04:33:59 -05:00
#ifdef CONFIG_WPS_REG_DISABLE_OPEN
if (registrar) {
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OPEN_NETWORK
"id=%d - Credentials for an open "
"network disabled by default - use "
"'select_network %d' to enable",
ssid->id, ssid->id);
ssid->disabled = 1;
}
#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
break;
case WPS_AUTH_WPAPSK:
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
ssid->proto = WPA_PROTO_WPA;
break;
case WPS_AUTH_WPA2PSK:
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
ssid->proto = WPA_PROTO_RSN;
break;
}
if (ssid->key_mgmt == WPA_KEY_MGMT_PSK) {
if (cred->key_len == 2 * PMK_LEN) {
if (hexstr2bin((const char *) cred->key, ssid->psk,
PMK_LEN)) {
wpa_printf(MSG_ERROR, "WPS: Invalid Network "
"Key");
return -1;
}
ssid->psk_set = 1;
DBus: Publish provisioned keys in network properties When the network was provisioned, we need to get the keys to be able to reconnect without new provisioning. To be able to publish those keys but not normally configured ones, add a new attribute to struct wpa_ssid indicating whether or not keys may be exported. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 10:00:12 -05:00
ssid->export_keys = 1;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
} else if (cred->key_len >= 8 && cred->key_len < 2 * PMK_LEN) {
os_free(ssid->passphrase);
ssid->passphrase = os_malloc(cred->key_len + 1);
if (ssid->passphrase == NULL)
return -1;
os_memcpy(ssid->passphrase, cred->key, cred->key_len);
ssid->passphrase[cred->key_len] = '\0';
wpa_config_update_psk(ssid);
DBus: Publish provisioned keys in network properties When the network was provisioned, we need to get the keys to be able to reconnect without new provisioning. To be able to publish those keys but not normally configured ones, add a new attribute to struct wpa_ssid indicating whether or not keys may be exported. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 10:00:12 -05:00
ssid->export_keys = 1;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
} else {
wpa_printf(MSG_ERROR, "WPS: Invalid Network Key "
"length %lu",
(unsigned long) cred->key_len);
return -1;
}
}
WPS: Add a workaround for TKIP/CCMP mixed mode credentials Many deployed APs do not handle negotiation of security parameters well when both TKIP and CCMP (or both WPA and WPA2) are enabled. The most common end result seems to be ending up with the least secure option.. As a workaround, check whether the AP advertises WPA2/CCMP in Beacon frames and add those options for the credential if needed. This allows the client to select the most secure configuration regardless of how broken the AP's WPS implementation is as far as auth/encr type negotiation is concerned.
2009-03-05 14:39:39 -05:00
wpas_wps_security_workaround(wpa_s, ssid, cred);
WPS: Remove duplicate networks after WPS Each attempt to connect to the same network using WPS would result in the duplicate configuration getting added. Avoid such redundant additions by comparing the network configuration with an already existing one and remove the older network if the new credential provisioned through WPS is identical. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-30 06:35:50 -04:00
wpas_wps_remove_dup_network(wpa_s, ssid);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
#ifndef CONFIG_NO_CONFIG_WRITE
if (wpa_s->conf->update_config &&
wpa_config_write(wpa_s->confname, wpa_s->conf)) {
wpa_printf(MSG_DEBUG, "WPS: Failed to update configuration");
return -1;
}
#endif /* CONFIG_NO_CONFIG_WRITE */
WPS: Optimize post-WPS scan even if EAP-Failure is not received Commit 17a4734dc4d28ef070dfa227b422ed84794f48c5 shall optimize the post-WPS scan based on the channel used during the provisioning only when the EAP-Failure frame is received. In cases where the EAP-Failure frame is missed, this optimization shall not happen resulting in the scan in all the channels thus consuming more time for the connection. This commit enhances this by storing the requisite information after the M8 frame is received. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 08:30:39 -05:00
/*
* Optimize the post-WPS scan based on the channel used during
* the provisioning in case EAP-Failure is not received.
*/
wpa_s->after_wps = 5;
wpa_s->wps_freq = wpa_s->assoc_freq;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
return 0;
}
WPS: Added event callback and M2D notification The event callback will be used for various event messages and the M2D notification is the first such message. It is used to notify wpa_gui about Registrar not yet knowing the device password (PIN).
2008-12-18 14:58:42 -05:00
static void wpa_supplicant_wps_event_m2d(struct wpa_supplicant *wpa_s,
struct wps_event_m2d *m2d)
{
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_M2D
"dev_password_id=%d config_error=%d",
m2d->dev_password_id, m2d->config_error);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_wps_event_m2d(wpa_s, m2d);
P2P: Notify WPS-M2D event on parent interface and handle PBC overlap GO may use M2D to notify that PBC overlap was detected if the GO was configured to allow only a specific P2P Device to connect using PBC. We need to report the M2D message on the parent interface if a separate group interface is used. In addition, we can stop the P2P operation if PBC overlap was indicated similarly to what we are already doing in th case the overlap is detected locally.
2011-02-22 05:20:16 -05:00
#ifdef CONFIG_P2P
if (wpa_s->parent && wpa_s->parent != wpa_s) {
wpa_msg(wpa_s->parent, MSG_INFO, WPS_EVENT_M2D
"dev_password_id=%d config_error=%d",
m2d->dev_password_id, m2d->config_error);
}
if (m2d->config_error == WPS_CFG_MULTIPLE_PBC_DETECTED) {
/*
* Notify P2P from eloop timeout to avoid issues with the
* interface getting removed while processing a message.
*/
P2P: Fix segfault when PBC overlap is detected If a separate P2P group interface is used, PBC overlap during group formation causes the group interface to be removed, which ends up with the interface context becoming invalid. Fix this by scheduling a timeout to process the PBC overlap and interface removal instead of removing the interface directly before the connection operation has returned. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2014-03-27 02:58:30 -04:00
eloop_register_timeout(0, 0, wpas_p2p_pbc_overlap_cb, wpa_s,
P2P: Notify WPS-M2D event on parent interface and handle PBC overlap GO may use M2D to notify that PBC overlap was detected if the GO was configured to allow only a specific P2P Device to connect using PBC. We need to report the M2D message on the parent interface if a separate group interface is used. In addition, we can stop the P2P operation if PBC overlap was indicated similarly to what we are already doing in th case the overlap is detected locally.
2011-02-22 05:20:16 -05:00
NULL);
}
#endif /* CONFIG_P2P */
WPS: Added event callback and M2D notification The event callback will be used for various event messages and the M2D notification is the first such message. It is used to notify wpa_gui about Registrar not yet knowing the device password (PIN).
2008-12-18 14:58:42 -05:00
}
WPS: Fix failure path to allow WSC_NACK and EAP-Failure to be exchanged Commit c7a67a77195464d667d6f482777a75325b6f3642 forced disconnection when wpas_clear_wps() is called. Call this function from a registered timeout when processing a failure event in order to allow the WPS handshake to be completed with WSC_NACK and EAP-Failure. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-23 10:43:01 -04:00
static void wpas_wps_clear_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_printf(MSG_DEBUG, "WPS: Clear WPS network from timeout");
wpas_clear_wps(wpa_s);
}
WPS: Added callback for failure-after-M2/M2D This callback is now used to stop wpa_supplicant from trying to continue using parameters (most likely, device password) that do not work in a loop. In addition, wpa_gui can now notify user of failed registration.
2008-12-19 15:19:41 -05:00
static void wpa_supplicant_wps_event_fail(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail)
{
WPS: Add mechanism for indicating non-standard WPS errors Previously, only the Configuration Error values were indicated in WPS-FAIL events. Since those values are defined in the specification it is not feasible to extend them for indicating other errors. Add a new error indication value that is internal to wpa_supplicant and hostapd to allow other errors to be indicated. Use the new mechanism to indicate if negotiation fails because of WEP or TKIP-only configurations being disallows by WPS 2.0.
2011-01-13 10:50:59 -05:00
if (fail->error_indication > 0 &&
fail->error_indication < NUM_WPS_EI_VALUES) {
wpa_msg(wpa_s, MSG_INFO,
WPS_EVENT_FAIL "msg=%d config_error=%d reason=%d (%s)",
fail->msg, fail->config_error, fail->error_indication,
WPS: Share a common function for error strings This makes it easier to maintain the list of WPS_EI_* error values and matching strings. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-31 10:30:45 -04:00
wps_ei_str(fail->error_indication));
WPS: Add mechanism for indicating non-standard WPS errors Previously, only the Configuration Error values were indicated in WPS-FAIL events. Since those values are defined in the specification it is not feasible to extend them for indicating other errors. Add a new error indication value that is internal to wpa_supplicant and hostapd to allow other errors to be indicated. Use the new mechanism to indicate if negotiation fails because of WEP or TKIP-only configurations being disallows by WPS 2.0.
2011-01-13 10:50:59 -05:00
if (wpa_s->parent && wpa_s->parent != wpa_s)
wpa_msg(wpa_s->parent, MSG_INFO, WPS_EVENT_FAIL
"msg=%d config_error=%d reason=%d (%s)",
fail->msg, fail->config_error,
fail->error_indication,
WPS: Share a common function for error strings This makes it easier to maintain the list of WPS_EI_* error values and matching strings. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-31 10:30:45 -04:00
wps_ei_str(fail->error_indication));
WPS: Add mechanism for indicating non-standard WPS errors Previously, only the Configuration Error values were indicated in WPS-FAIL events. Since those values are defined in the specification it is not feasible to extend them for indicating other errors. Add a new error indication value that is internal to wpa_supplicant and hostapd to allow other errors to be indicated. Use the new mechanism to indicate if negotiation fails because of WEP or TKIP-only configurations being disallows by WPS 2.0.
2011-01-13 10:50:59 -05:00
} else {
wpa_msg(wpa_s, MSG_INFO,
WPS_EVENT_FAIL "msg=%d config_error=%d",
P2P: Send WPS-FAIL event to parent interface, too This makes it easier to figure out what went wrong during group formation when per-group interfaces are used.
2010-10-14 13:52:31 -04:00
fail->msg, fail->config_error);
WPS: Add mechanism for indicating non-standard WPS errors Previously, only the Configuration Error values were indicated in WPS-FAIL events. Since those values are defined in the specification it is not feasible to extend them for indicating other errors. Add a new error indication value that is internal to wpa_supplicant and hostapd to allow other errors to be indicated. Use the new mechanism to indicate if negotiation fails because of WEP or TKIP-only configurations being disallows by WPS 2.0.
2011-01-13 10:50:59 -05:00
if (wpa_s->parent && wpa_s->parent != wpa_s)
wpa_msg(wpa_s->parent, MSG_INFO, WPS_EVENT_FAIL
"msg=%d config_error=%d",
fail->msg, fail->config_error);
}
WPS: Fix failure path to allow WSC_NACK and EAP-Failure to be exchanged Commit c7a67a77195464d667d6f482777a75325b6f3642 forced disconnection when wpas_clear_wps() is called. Call this function from a registered timeout when processing a failure event in order to allow the WPS handshake to be completed with WSC_NACK and EAP-Failure. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-23 10:43:01 -04:00
/*
* Need to allow WPS processing to complete, e.g., by sending WSC_NACK.
*/
wpa_printf(MSG_DEBUG, "WPS: Register timeout to clear WPS network");
eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL);
eloop_register_timeout(0, 100000, wpas_wps_clear_timeout, wpa_s, NULL);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_wps_event_fail(wpa_s, fail);
P2P: Add WpsFailed signal in P2P D-Bus Signal is triggered if an error occurs during WPS provisioning phase. Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 04:47:04 -04:00
wpas_p2p_wps_failed(wpa_s, fail);
WPS: Added callback for failure-after-M2/M2D This callback is now used to stop wpa_supplicant from trying to continue using parameters (most likely, device password) that do not work in a loop. In addition, wpa_gui can now notify user of failed registration.
2008-12-19 15:19:41 -05:00
}
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
static void wpas_wps_reenable_networks_cb(void *eloop_ctx, void *timeout_ctx);
static void wpas_wps_reenable_networks(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid;
WPS: Update configuration file after re-enabling networks Network blocks are disabled during a WPS provisioning step and 10 seconds after this to allow the newly provisioned network to be selected. The disabled=1 flag gets written to the configuration file when the credential is added since it happens during this process. Update the file again after the networks have been re-enabled to avoid leaving the configuration file into state that is not consistent with the running configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 13:11:26 -05:00
int changed = 0;
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
eloop_cancel_timeout(wpas_wps_reenable_networks_cb, wpa_s, NULL);
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (ssid->disabled_for_connect && ssid->disabled) {
ssid->disabled_for_connect = 0;
ssid->disabled = 0;
wpas_notify_network_enabled_changed(wpa_s, ssid);
WPS: Update configuration file after re-enabling networks Network blocks are disabled during a WPS provisioning step and 10 seconds after this to allow the newly provisioned network to be selected. The disabled=1 flag gets written to the configuration file when the credential is added since it happens during this process. Update the file again after the networks have been re-enabled to avoid leaving the configuration file into state that is not consistent with the running configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 13:11:26 -05:00
changed++;
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
}
}
WPS: Update configuration file after re-enabling networks Network blocks are disabled during a WPS provisioning step and 10 seconds after this to allow the newly provisioned network to be selected. The disabled=1 flag gets written to the configuration file when the credential is added since it happens during this process. Update the file again after the networks have been re-enabled to avoid leaving the configuration file into state that is not consistent with the running configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 13:11:26 -05:00
if (changed) {
#ifndef CONFIG_NO_CONFIG_WRITE
if (wpa_s->conf->update_config &&
wpa_config_write(wpa_s->confname, wpa_s->conf)) {
wpa_printf(MSG_DEBUG, "WPS: Failed to update "
"configuration");
}
#endif /* CONFIG_NO_CONFIG_WRITE */
}
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
}
static void wpas_wps_reenable_networks_cb(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
/* Enable the networks disabled during wpas_wps_reassoc */
wpas_wps_reenable_networks(wpa_s);
}
WPS: Added event callback for successfully completed registration
2008-12-19 15:34:18 -05:00
static void wpa_supplicant_wps_event_success(struct wpa_supplicant *wpa_s)
{
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_SUCCESS);
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
wpa_s->wps_success = 1;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_wps_event_success(wpa_s);
WPS: Clear connection failure counts on WPS success The WPS provisioning case does not result in successful connection by design and as such, this can result in networks getting temporarily disabled. Avoid this by clearing the failure counts on WPS success. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 10:33:50 -04:00
if (wpa_s->current_ssid)
wpas_clear_temp_disabled(wpa_s, wpa_s->current_ssid, 1);
wpa_s->extra_blacklist_count = 0;
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
/*
* Enable the networks disabled during wpas_wps_reassoc after 10
* seconds. The 10 seconds timer is to allow the data connection to be
* formed before allowing other networks to be selected.
*/
eloop_register_timeout(10, 0, wpas_wps_reenable_networks_cb, wpa_s,
NULL);
P2P: Add initial version of P2P Module
2010-07-18 17:30:25 -04:00
wpas_p2p_wps_success(wpa_s, wpa_s->bssid, 0);
WPS: Added event callback for successfully completed registration
2008-12-19 15:34:18 -05:00
}
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
static void wpa_supplicant_wps_event_er_ap_add(struct wpa_supplicant *wpa_s,
struct wps_event_er_ap *ap)
{
char uuid_str[100];
WPS: Update couple of missed Primary Device Type uses
2009-11-26 04:54:37 -05:00
char dev_type[WPS_DEV_TYPE_BUFSIZE];
WPS ER: Add more AP information into the ctrl_interface message This allow wpa_gui to show AP BSSID, WPS State (configured/unconfigured), and primary device type.
2009-11-21 06:34:23 -05:00
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
uuid_bin2str(ap->uuid, uuid_str, sizeof(uuid_str));
WPS ER: Add more AP information into the ctrl_interface message This allow wpa_gui to show AP BSSID, WPS State (configured/unconfigured), and primary device type.
2009-11-21 06:34:23 -05:00
if (ap->pri_dev_type)
WPS: Update couple of missed Primary Device Type uses
2009-11-26 04:54:37 -05:00
wps_dev_type_bin2str(ap->pri_dev_type, dev_type,
sizeof(dev_type));
WPS ER: Add more AP information into the ctrl_interface message This allow wpa_gui to show AP BSSID, WPS State (configured/unconfigured), and primary device type.
2009-11-21 06:34:23 -05:00
else
dev_type[0] = '\0';
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ER_AP_ADD "%s " MACSTR
" pri_dev_type=%s wps_state=%d |%s|%s|%s|%s|%s|%s|",
uuid_str, MAC2STR(ap->mac_addr), dev_type, ap->wps_state,
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
ap->friendly_name ? ap->friendly_name : "",
ap->manufacturer ? ap->manufacturer : "",
ap->model_description ? ap->model_description : "",
ap->model_name ? ap->model_name : "",
ap->manufacturer_url ? ap->manufacturer_url : "",
ap->model_url ? ap->model_url : "");
}
static void wpa_supplicant_wps_event_er_ap_remove(struct wpa_supplicant *wpa_s,
struct wps_event_er_ap *ap)
{
char uuid_str[100];
uuid_bin2str(ap->uuid, uuid_str, sizeof(uuid_str));
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ER_AP_REMOVE "%s", uuid_str);
}
static void wpa_supplicant_wps_event_er_enrollee_add(
struct wpa_supplicant *wpa_s, struct wps_event_er_enrollee *enrollee)
{
char uuid_str[100];
WPS: Update couple of missed Primary Device Type uses
2009-11-26 04:54:37 -05:00
char dev_type[WPS_DEV_TYPE_BUFSIZE];
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
uuid_bin2str(enrollee->uuid, uuid_str, sizeof(uuid_str));
if (enrollee->pri_dev_type)
WPS: Update couple of missed Primary Device Type uses
2009-11-26 04:54:37 -05:00
wps_dev_type_bin2str(enrollee->pri_dev_type, dev_type,
sizeof(dev_type));
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
else
dev_type[0] = '\0';
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ER_ENROLLEE_ADD "%s " MACSTR
" M1=%d config_methods=0x%x dev_passwd_id=%d pri_dev_type=%s "
"|%s|%s|%s|%s|%s|",
uuid_str, MAC2STR(enrollee->mac_addr), enrollee->m1_received,
enrollee->config_methods, enrollee->dev_passwd_id, dev_type,
enrollee->dev_name ? enrollee->dev_name : "",
enrollee->manufacturer ? enrollee->manufacturer : "",
enrollee->model_name ? enrollee->model_name : "",
enrollee->model_number ? enrollee->model_number : "",
enrollee->serial_number ? enrollee->serial_number : "");
}
static void wpa_supplicant_wps_event_er_enrollee_remove(
struct wpa_supplicant *wpa_s, struct wps_event_er_enrollee *enrollee)
{
char uuid_str[100];
uuid_bin2str(enrollee->uuid, uuid_str, sizeof(uuid_str));
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ER_ENROLLEE_REMOVE "%s " MACSTR,
uuid_str, MAC2STR(enrollee->mac_addr));
}
WPS ER: Add ctrl_iface event for learned AP settings
2010-05-27 08:24:45 -04:00
static void wpa_supplicant_wps_event_er_ap_settings(
struct wpa_supplicant *wpa_s,
struct wps_event_er_ap_settings *ap_settings)
{
char uuid_str[100];
char key_str[65];
const struct wps_credential *cred = ap_settings->cred;
key_str[0] = '\0';
if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK)) {
if (cred->key_len >= 8 && cred->key_len <= 64) {
os_memcpy(key_str, cred->key, cred->key_len);
key_str[cred->key_len] = '\0';
}
}
uuid_bin2str(ap_settings->uuid, uuid_str, sizeof(uuid_str));
/* Use wpa_msg_ctrl to avoid showing the key in debug log */
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_ER_AP_SETTINGS
"uuid=%s ssid=%s auth_type=0x%04x encr_type=0x%04x "
"key=%s",
uuid_str, wpa_ssid_txt(cred->ssid, cred->ssid_len),
cred->auth_type, cred->encr_type, key_str);
}
WPS ER: Show SetSelectedRegistrar events as ctrl_iface events This makes it easier to figure out if something goes wrong in preparing the AP for enrolling a station.
2010-10-25 14:29:22 -04:00
static void wpa_supplicant_wps_event_er_set_sel_reg(
struct wpa_supplicant *wpa_s,
struct wps_event_er_set_selected_registrar *ev)
{
char uuid_str[100];
uuid_bin2str(ev->uuid, uuid_str, sizeof(uuid_str));
switch (ev->state) {
case WPS_ER_SET_SEL_REG_START:
wpa_msg(wpa_s, MSG_DEBUG, WPS_EVENT_ER_SET_SEL_REG
"uuid=%s state=START sel_reg=%d dev_passwd_id=%u "
"sel_reg_config_methods=0x%x",
uuid_str, ev->sel_reg, ev->dev_passwd_id,
ev->sel_reg_config_methods);
break;
case WPS_ER_SET_SEL_REG_DONE:
wpa_msg(wpa_s, MSG_DEBUG, WPS_EVENT_ER_SET_SEL_REG
"uuid=%s state=DONE", uuid_str);
break;
case WPS_ER_SET_SEL_REG_FAILED:
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ER_SET_SEL_REG
"uuid=%s state=FAILED", uuid_str);
break;
}
}
WPS: Added event callback and M2D notification The event callback will be used for various event messages and the M2D notification is the first such message. It is used to notify wpa_gui about Registrar not yet knowing the device password (PIN).
2008-12-18 14:58:42 -05:00
static void wpa_supplicant_wps_event(void *ctx, enum wps_event event,
union wps_event_data *data)
{
struct wpa_supplicant *wpa_s = ctx;
switch (event) {
case WPS_EV_M2D:
wpa_supplicant_wps_event_m2d(wpa_s, &data->m2d);
break;
WPS: Added callback for failure-after-M2/M2D This callback is now used to stop wpa_supplicant from trying to continue using parameters (most likely, device password) that do not work in a loop. In addition, wpa_gui can now notify user of failed registration.
2008-12-19 15:19:41 -05:00
case WPS_EV_FAIL:
wpa_supplicant_wps_event_fail(wpa_s, &data->fail);
break;
WPS: Added event callback for successfully completed registration
2008-12-19 15:34:18 -05:00
case WPS_EV_SUCCESS:
wpa_supplicant_wps_event_success(wpa_s);
break;
WPS: Lock AP Setup on multiple AP PIN validation failures If a Registrar tries to configure the AP, but fails to validate the device password (AP PIN), lock the AP setup after four failures. This protects the AP PIN against brute force guessing attacks.
2009-01-23 14:57:43 -05:00
case WPS_EV_PWD_AUTH_FAIL:
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 09:46:55 -05:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface && data->pwd_auth_fail.enrollee)
wpa_supplicant_ap_pwd_auth_fail(wpa_s);
#endif /* CONFIG_AP */
WPS: Lock AP Setup on multiple AP PIN validation failures If a Registrar tries to configure the AP, but fails to validate the device password (AP PIN), lock the AP setup after four failures. This protects the AP PIN against brute force guessing attacks.
2009-01-23 14:57:43 -05:00
break;
WPS: Add PBC overlap and timeout events from WPS module This provides information about PBC mode result from the WPS Registrar module. This could be used, e.g., to provide a user notification on the AP UI on PBC failures.
2009-11-01 14:26:13 -05:00
case WPS_EV_PBC_OVERLAP:
break;
case WPS_EV_PBC_TIMEOUT:
break;
WPS: Add PBC mode activated/disabled events This makes it easier to track PBC state on the registrar. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-23 09:01:30 -04:00
case WPS_EV_PBC_ACTIVE:
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_ACTIVE);
break;
case WPS_EV_PBC_DISABLE:
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_DISABLE);
break;
WPS ER: Add ctrl_iface notifications for AP/Enrollee add/remove
2009-11-15 05:07:27 -05:00
case WPS_EV_ER_AP_ADD:
wpa_supplicant_wps_event_er_ap_add(wpa_s, &data->ap);
break;
case WPS_EV_ER_AP_REMOVE:
wpa_supplicant_wps_event_er_ap_remove(wpa_s, &data->ap);
break;
case WPS_EV_ER_ENROLLEE_ADD:
wpa_supplicant_wps_event_er_enrollee_add(wpa_s,
&data->enrollee);
break;
case WPS_EV_ER_ENROLLEE_REMOVE:
wpa_supplicant_wps_event_er_enrollee_remove(wpa_s,
&data->enrollee);
break;
WPS ER: Add ctrl_iface event for learned AP settings
2010-05-27 08:24:45 -04:00
case WPS_EV_ER_AP_SETTINGS:
wpa_supplicant_wps_event_er_ap_settings(wpa_s,
&data->ap_settings);
break;
WPS ER: Show SetSelectedRegistrar events as ctrl_iface events This makes it easier to figure out if something goes wrong in preparing the AP for enrolling a station.
2010-10-25 14:29:22 -04:00
case WPS_EV_ER_SET_SELECTED_REGISTRAR:
wpa_supplicant_wps_event_er_set_sel_reg(wpa_s,
&data->set_sel_reg);
break;
WPS: Disable AP PIN after 10 consecutive failures While the exponential increase in the lockout period provides an efficient mitigation mechanism against brute force attacks, this additional trigger to enter indefinite lockout period (cleared by restarting hostapd) will limit attacks even further by giving maximum of 10 attempts (without authorized user action) even in a very long term attack. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-30 10:31:06 -05:00
case WPS_EV_AP_PIN_SUCCESS:
break;
WPS: Added event callback and M2D notification The event callback will be used for various event messages and the M2D notification is the first such message. It is used to notify wpa_gui about Registrar not yet knowing the device password (PIN).
2008-12-18 14:58:42 -05:00
}
}
WPS: Set currently used RF band in RF Bands attribute According to WSC specification (Ver 2.0.2, section 8.3), RF Bands attribute should be set to the specific RF band used for the current message. Add an option to set wanted band in wps_build_rf_bands() and add a callback to get the current band from wpa_supplicant and hostapd. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-08-25 03:55:53 -04:00
static int wpa_supplicant_wps_rf_band(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
if (!wpa_s->current_ssid || !wpa_s->assoc_freq)
return 0;
return (wpa_s->assoc_freq > 2484) ? WPS_RF_50GHZ : WPS_RF_24GHZ;
}
Added Doxygen documentation for WPS code
2009-01-03 12:50:49 -05:00
enum wps_request_type wpas_wps_get_req_type(struct wpa_ssid *ssid)
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
{
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 06:38:03 -05:00
if (eap_is_wps_pbc_enrollee(&ssid->eap) ||
eap_is_wps_pin_enrollee(&ssid->eap))
return WPS_REQ_ENROLLEE;
else
return WPS_REQ_REGISTRAR;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 12:46:22 -05:00
}
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
static void wpas_clear_wps(struct wpa_supplicant *wpa_s)
{
int id;
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 12:02:24 -04:00
struct wpa_ssid *ssid, *remove_ssid = NULL, *prev_current;
WPS: Clear after_wps from number of new locations This makes it less likely to forget WPS single-channel scan optimization in effect after having completed the WPS operation or in case WPS operating gets cancelled. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 14:34:39 -04:00
wpa_s->after_wps = 0;
WPS: Clear known_wps_freq in addition to after_wps Both of these variables can result in optimized WPS scans, so better clear these more consistently to avoid unexpected single-channel scans. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 06:56:56 -04:00
wpa_s->known_wps_freq = 0;
WPS: Clear after_wps from number of new locations This makes it less likely to forget WPS single-channel scan optimization in effect after having completed the WPS operation or in case WPS operating gets cancelled. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 14:34:39 -04:00
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 12:02:24 -04:00
prev_current = wpa_s->current_ssid;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
/* Enable the networks disabled during wpas_wps_reassoc */
wpas_wps_reenable_networks(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_cancel_timeout(wpas_wps_timeout, wpa_s, NULL);
WPS: Fix clear-from-timeout handling to avoid race condition The 100 ms timeout to clear WPS state after EAP-Failure has been received worked otherwise fine, but it opened a race condition on another WPS operation starting within that wait. If that happens, the timeout will cancel that new operation unexpectedly. Fix this by cancelling the timeout from wpas_clear_wps(). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 15:00:09 -05:00
eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
/* Remove any existing WPS network from configuration */
ssid = wpa_s->conf->ssid;
while (ssid) {
WPS: Fixed deinit code for freeing config and registrar data We need to be a bit more careful when removing the WPS configuration block since wpa_s->current_ssid may still be pointing at it. In addition, registrar pointer in wps_context will need to be cleared since the context data is now maintained over multiple EAP-WSC runs. Without this, certain WPS operations could have used freed memory.
2008-12-17 18:06:06 -05:00
if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
if (ssid == wpa_s->current_ssid) {
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
wpa_s->own_disconnect_req = 1;
WPS: Disconnect when removing existing WPS network block wpas_clear_wps() was just clearing the current wpa_s->current_ssid pointer when removing a WPS network block which with the device was associated. This could leave the association up even though the network block had already been removed. Prevent this by explicitly disconnecting from the network instead of such clearing current_ssid. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 05:09:18 -04:00
wpa_supplicant_deauthenticate(
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
}
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
id = ssid->id;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
remove_ssid = ssid;
WPS: Fixed deinit code for freeing config and registrar data We need to be a bit more careful when removing the WPS configuration block since wpa_s->current_ssid may still be pointing at it. In addition, registrar pointer in wps_context will need to be cleared since the context data is now maintained over multiple EAP-WSC runs. Without this, certain WPS operations could have used freed memory.
2008-12-17 18:06:06 -05:00
} else
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
id = -1;
ssid = ssid->next;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
if (id >= 0) {
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 12:02:24 -04:00
if (prev_current == remove_ssid) {
wpa_sm_set_config(wpa_s->wpa, NULL);
eapol_sm_notify_config(wpa_s->eapol, NULL,
NULL);
}
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_network_removed(wpa_s, remove_ssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpa_config_remove_network(wpa_s->conf, id);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
}
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
}
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
wpas_wps_clear_ap_info(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
}
static void wpas_wps_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
WPS: Fix timeout event to be sent over ctrl_interface This was supposed to be sent to external event monitors, i.e., to use wpa_msg instead of wpa_printf.
2010-09-06 11:13:18 -04:00
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_TIMEOUT "Requested operation timed "
"out");
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpas_clear_wps(wpa_s);
}
static struct wpa_ssid * wpas_wps_add_network(struct wpa_supplicant *wpa_s,
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
int registrar, const u8 *dev_addr,
const u8 *bssid)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
{
struct wpa_ssid *ssid;
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL)
return NULL;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_network_added(wpa_s, ssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpa_config_set_network_defaults(ssid);
P2P: Do not save temporary networks
2010-07-18 17:30:24 -04:00
ssid->temporary = 1;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (wpa_config_set(ssid, "key_mgmt", "WPS", 0) < 0 ||
wpa_config_set(ssid, "eap", "WSC", 0) < 0 ||
wpa_config_set(ssid, "identity", registrar ?
"\"" WSC_ID_REGISTRAR "\"" :
"\"" WSC_ID_ENROLLEE "\"", 0) < 0) {
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
wpas_notify_network_removed(wpa_s, ssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpa_config_remove_network(wpa_s->conf, ssid->id);
return NULL;
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
#ifdef CONFIG_P2P
if (dev_addr)
os_memcpy(ssid->go_p2p_dev_addr, dev_addr, ETH_ALEN);
#endif /* CONFIG_P2P */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (bssid) {
P2P: Do not filter BSSes based on SSID during P2P Provisioning TODO: Use group id from GO Neg instead(?)
2010-07-18 17:30:24 -04:00
#ifndef CONFIG_P2P
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
struct wpa_bss *bss;
WPS: Clear SSID selection if more than one BSSID match is found Need to use wildcard SSID matching for WPS connection if the same BSSID occurs multiple time in scan results since any of the SSIDs may be used.
2009-12-28 09:07:15 -05:00
int count = 0;
P2P: Do not filter BSSes based on SSID during P2P Provisioning TODO: Use group id from GO Neg instead(?)
2010-07-18 17:30:24 -04:00
#endif /* CONFIG_P2P */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
os_memcpy(ssid->bssid, bssid, ETH_ALEN);
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 15:55:02 -05:00
ssid->bssid_set = 1;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
P2P: Do not filter BSSes based on SSID during P2P Provisioning TODO: Use group id from GO Neg instead(?)
2010-07-18 17:30:24 -04:00
/*
* Note: With P2P, the SSID may change at the time the WPS
* provisioning is started, so better not filter the AP based
* on the current SSID in the scan results.
*/
#ifndef CONFIG_P2P
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (os_memcmp(bssid, bss->bssid, ETH_ALEN) != 0)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
continue;
os_free(ssid->ssid);
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
ssid->ssid = os_malloc(bss->ssid_len);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (ssid->ssid == NULL)
break;
WPS: Use BSS table instead of raw scan results
2010-01-02 06:36:12 -05:00
os_memcpy(ssid->ssid, bss->ssid, bss->ssid_len);
ssid->ssid_len = bss->ssid_len;
WPS: Clear SSID selection if more than one BSSID match is found Need to use wildcard SSID matching for WPS connection if the same BSSID occurs multiple time in scan results since any of the SSIDs may be used.
2009-12-28 09:07:15 -05:00
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Picked SSID from "
"scan results",
ssid->ssid, ssid->ssid_len);
count++;
}
if (count > 1) {
wpa_printf(MSG_DEBUG, "WPS: More than one SSID found "
"for the AP; use wildcard");
os_free(ssid->ssid);
ssid->ssid = NULL;
ssid->ssid_len = 0;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
}
P2P: Do not filter BSSes based on SSID during P2P Provisioning TODO: Use group id from GO Neg instead(?)
2010-07-18 17:30:24 -04:00
#endif /* CONFIG_P2P */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
}
return ssid;
}
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
static void wpas_wps_temp_disable(struct wpa_supplicant *wpa_s,
struct wpa_ssid *selected)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
{
struct wpa_ssid *ssid;
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
if (wpa_s->current_ssid) {
wpa_s->own_disconnect_req = 1;
Disassociate when starting WPS search Previously, the WPS scans could have been done in associated state if we happened to be associated when the request to use WPS was received. This can slow down scanning and end up in unexpected state if no WPS association is tried. Avoid these issues by disconnecting when WPS search is started. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 11:30:47 -05:00
wpa_supplicant_deauthenticate(
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
}
Disassociate when starting WPS search Previously, the WPS scans could have been done in associated state if we happened to be associated when the request to use WPS was received. This can slow down scanning and end up in unexpected state if no WPS association is tried. Avoid these issues by disconnecting when WPS search is started. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 11:30:47 -05:00
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
/* Mark all other networks disabled and trigger reassociation */
ssid = wpa_s->conf->ssid;
while (ssid) {
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 13:53:32 -04:00
int was_disabled = ssid->disabled;
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
ssid->disabled_for_connect = 0;
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 14:25:13 -04:00
/*
* In case the network object corresponds to a persistent group
* then do not send out network disabled signal. In addition,
* do not change disabled status of persistent network objects
* from 2 to 1 should we connect to another network.
*/
if (was_disabled != 2) {
ssid->disabled = ssid != selected;
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
if (was_disabled != ssid->disabled) {
if (ssid->disabled)
ssid->disabled_for_connect = 1;
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 14:25:13 -04:00
wpas_notify_network_enabled_changed(wpa_s,
ssid);
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
}
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 14:25:13 -04:00
}
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
ssid = ssid->next;
}
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
}
static void wpas_wps_reassoc(struct wpa_supplicant *wpa_s,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
struct wpa_ssid *selected, const u8 *bssid,
int freq)
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
{
struct wpa_bss *bss;
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>
2014-08-29 13:11:13 -04:00
wpa_s->wps_run++;
if (wpa_s->wps_run == 0)
wpa_s->wps_run++;
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
wpa_s->after_wps = 0;
wpa_s->known_wps_freq = 0;
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
if (freq) {
wpa_s->after_wps = 5;
wpa_s->wps_freq = freq;
} else if (bssid) {
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
bss = wpa_bss_get_bssid_latest(wpa_s, bssid);
if (bss && bss->freq > 0) {
wpa_s->known_wps_freq = 1;
wpa_s->wps_freq = bss->freq;
}
}
wpas_wps_temp_disable(wpa_s, selected);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
wpa_s->scan_runs = 0;
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 11:36:36 -05:00
wpa_s->normal_scans = 0;
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
wpa_s->wps_success = 0;
wpa_s->blacklist_cleared = 0;
STA: Cancel sched_scan while initiating wps_reassoc Scan initiated from wps_nfc command context was ketp on getting rescheduled due to an on-going scheduled scan. So cancel sched_scan before issuing a reassociation scan. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-11-20 08:50:56 -05:00
wpa_supplicant_cancel_sched_scan(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
P2P: Let WPS code know if it is used in a P2P group
2010-07-18 17:30:24 -04:00
int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid,
int p2p_group)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
{
struct wpa_ssid *ssid;
WPS: Reject station-mode WPS operations when AP mode is enabled Start of station-mode WPS PBC/PIN/Registrar/NFC operation would result in the AP mode getting disabled. This can be particularly confusing for the P2P GO case where the group would need to be stopped cleanly. As such, it is better to reject these invalid operations rather than trying to handle all corner cases needed to allow this to work robustly. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-02 10:09:38 -05:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface) {
wpa_printf(MSG_DEBUG,
"WPS: Reject request to start Registrar(as station) operation while AP mode is enabled");
return -1;
}
#endif /* CONFIG_AP */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpas_clear_wps(wpa_s);
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
ssid = wpas_wps_add_network(wpa_s, 0, NULL, bssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (ssid == NULL)
return -1;
P2P: Let WPS code know if it is used in a P2P group
2010-07-18 17:30:24 -04:00
ssid->temporary = 1;
ssid->p2p_group = p2p_group;
Fix build without CONFIG_P2P=y
2010-09-09 10:20:28 -04:00
#ifdef CONFIG_P2P
P2P: Use SSID from GO Negotiation to limit WPS provisioning step In order to avoid picking incorrect SSID from old scan results, use SSID from GO Negotiation to select the AP.
2010-08-05 12:15:11 -04:00
if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) {
ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1);
if (ssid->ssid) {
ssid->ssid_len = wpa_s->go_params->ssid_len;
os_memcpy(ssid->ssid, wpa_s->go_params->ssid,
ssid->ssid_len);
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Use specific AP "
"SSID", ssid->ssid, ssid->ssid_len);
}
}
Fix build without CONFIG_P2P=y
2010-09-09 10:20:28 -04:00
#endif /* CONFIG_P2P */
WPS: Verify wpa_config_set() return value more consistently Even though this command is very unlikely to fail, in theory, it could and the WPS connection would fail in such a case. Return more clearer failure indication in such a case without even trying to start reassociation. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-01 13:30:17 -05:00
if (wpa_config_set(ssid, "phase1", "\"pbc=1\"", 0) < 0)
return -1;
WPS: Make fragment size configurable for EAP-WSC peer "wpa_cli set wps_fragment_size <val>" can now be used to configure the fragment size limit for EAP-WSC.
2010-07-22 13:24:23 -04:00
if (wpa_s->wps_fragment_size)
ssid->eap.fragment_size = wpa_s->wps_fragment_size;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_register_timeout(WPS_PBC_WALK_TIME, 0, wpas_wps_timeout,
wpa_s, NULL);
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
wpas_wps_reassoc(wpa_s, ssid, bssid, 0);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
return 0;
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
static int wpas_wps_start_dev_pw(struct wpa_supplicant *wpa_s,
const u8 *dev_addr, const u8 *bssid,
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
const char *pin, int p2p_group, u16 dev_pw_id,
WPS: Preparations for allowing SSID filtering for provisioning step If the SSID of the WPS AP is known, it should be possible to limit AP selection based on this when searching for an active WPS AP. This commit adds a mechanism to specify SSID for this type of uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:29:23 -04:00
const u8 *peer_pubkey_hash,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
const u8 *ssid_val, size_t ssid_len, int freq)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
{
struct wpa_ssid *ssid;
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
char val[128 + 2 * WPS_OOB_PUBKEY_HASH_LEN];
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
unsigned int rpin = 0;
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
char hash[2 * WPS_OOB_PUBKEY_HASH_LEN + 10];
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
WPS: Reject station-mode WPS operations when AP mode is enabled Start of station-mode WPS PBC/PIN/Registrar/NFC operation would result in the AP mode getting disabled. This can be particularly confusing for the P2P GO case where the group would need to be stopped cleanly. As such, it is better to reject these invalid operations rather than trying to handle all corner cases needed to allow this to work robustly. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-02 10:09:38 -05:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface) {
wpa_printf(MSG_DEBUG,
"WPS: Reject request to start Registrar(as station) operation while AP mode is enabled");
return -1;
}
#endif /* CONFIG_AP */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
wpas_clear_wps(wpa_s);
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
if (bssid && is_zero_ether_addr(bssid))
bssid = NULL;
ssid = wpas_wps_add_network(wpa_s, 0, dev_addr, bssid);
WPS: Preparations for allowing SSID filtering for provisioning step If the SSID of the WPS AP is known, it should be possible to limit AP selection based on this when searching for an active WPS AP. This commit adds a mechanism to specify SSID for this type of uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:29:23 -04:00
if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "WPS: Could not add network");
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
return -1;
WPS: Preparations for allowing SSID filtering for provisioning step If the SSID of the WPS AP is known, it should be possible to limit AP selection based on this when searching for an active WPS AP. This commit adds a mechanism to specify SSID for this type of uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:29:23 -04:00
}
P2P: Let WPS code know if it is used in a P2P group
2010-07-18 17:30:24 -04:00
ssid->temporary = 1;
ssid->p2p_group = p2p_group;
WPS: Preparations for allowing SSID filtering for provisioning step If the SSID of the WPS AP is known, it should be possible to limit AP selection based on this when searching for an active WPS AP. This commit adds a mechanism to specify SSID for this type of uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:29:23 -04:00
if (ssid_val) {
ssid->ssid = os_malloc(ssid_len);
if (ssid->ssid) {
os_memcpy(ssid->ssid, ssid_val, ssid_len);
ssid->ssid_len = ssid_len;
}
}
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
if (peer_pubkey_hash) {
os_memcpy(hash, " pkhash=", 8);
wpa_snprintf_hex_uppercase(hash + 8, sizeof(hash) - 8,
peer_pubkey_hash,
WPS_OOB_PUBKEY_HASH_LEN);
} else {
hash[0] = '\0';
}
Fix build without CONFIG_P2P=y
2010-09-09 10:20:28 -04:00
#ifdef CONFIG_P2P
P2P: Use SSID from GO Negotiation to limit WPS provisioning step In order to avoid picking incorrect SSID from old scan results, use SSID from GO Negotiation to select the AP.
2010-08-05 12:15:11 -04:00
if (p2p_group && wpa_s->go_params && wpa_s->go_params->ssid_len) {
ssid->ssid = os_zalloc(wpa_s->go_params->ssid_len + 1);
if (ssid->ssid) {
ssid->ssid_len = wpa_s->go_params->ssid_len;
os_memcpy(ssid->ssid, wpa_s->go_params->ssid,
ssid->ssid_len);
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Use specific AP "
"SSID", ssid->ssid, ssid->ssid_len);
}
}
Fix build without CONFIG_P2P=y
2010-09-09 10:20:28 -04:00
#endif /* CONFIG_P2P */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (pin)
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
os_snprintf(val, sizeof(val), "\"pin=%s dev_pw_id=%u%s\"",
pin, dev_pw_id, hash);
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
else if (pin == NULL && dev_pw_id == DEV_PW_NFC_CONNECTION_HANDOVER) {
os_snprintf(val, sizeof(val), "\"dev_pw_id=%u%s\"",
dev_pw_id, hash);
} else {
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
rpin = wps_generate_pin();
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
os_snprintf(val, sizeof(val), "\"pin=%08d dev_pw_id=%u%s\"",
rpin, dev_pw_id, hash);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
}
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
if (wpa_config_set(ssid, "phase1", val, 0) < 0) {
wpa_printf(MSG_DEBUG, "WPS: Failed to set phase1 '%s'", val);
WPS: Verify wpa_config_set() return value more consistently Even though this command is very unlikely to fail, in theory, it could and the WPS connection would fail in such a case. Return more clearer failure indication in such a case without even trying to start reassociation. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-01 13:30:17 -05:00
return -1;
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
}
WPS: Make fragment size configurable for EAP-WSC peer "wpa_cli set wps_fragment_size <val>" can now be used to configure the fragment size limit for EAP-WSC.
2010-07-22 13:24:23 -04:00
if (wpa_s->wps_fragment_size)
ssid->eap.fragment_size = wpa_s->wps_fragment_size;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_register_timeout(WPS_PBC_WALK_TIME, 0, wpas_wps_timeout,
wpa_s, NULL);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
wpa_s->wps_ap_iter = 1;
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
wpas_wps_reassoc(wpa_s, ssid, bssid, freq);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
return rpin;
}
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
const char *pin, int p2p_group, u16 dev_pw_id)
{
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
return wpas_wps_start_dev_pw(wpa_s, NULL, bssid, pin, p2p_group,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
dev_pw_id, NULL, NULL, 0, 0);
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
}
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
/* Cancel the wps pbc/pin requests */
int wpas_wps_cancel(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_AP
if (wpa_s->ap_iface) {
wpa_printf(MSG_DEBUG, "WPS: Cancelling in AP mode");
return wpa_supplicant_ap_wps_cancel(wpa_s);
}
#endif /* CONFIG_AP */
WPS: Cancel WPS operation also in DISCONNECTED state It is possible for wpa_state to be WPA_DISCONNECTED when a new scan is scheduled to be started in the future. If wpas_wps_cancel() gets called (e.g., through control interface wps_cancel or a P2P group removal) while in that state, the WPS operation (scan request and special network block) were not removed. Fix this by clearing the WPS operations both in WPA_SCANNING and WPA_DISCONNECTED states. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-06-06 15:07:11 -04:00
if (wpa_s->wpa_state == WPA_SCANNING ||
wpa_s->wpa_state == WPA_DISCONNECTED) {
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
wpa_printf(MSG_DEBUG, "WPS: Cancel operation - cancel scan");
wpa_supplicant_cancel_scan(wpa_s);
wpas_clear_wps(wpa_s);
} else if (wpa_s->wpa_state >= WPA_ASSOCIATED) {
wpa_printf(MSG_DEBUG, "WPS: Cancel operation - "
"deauthenticate");
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 08:54:24 -05:00
wpa_s->own_disconnect_req = 1;
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
wpas_clear_wps(wpa_s);
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
} else {
wpas_wps_reenable_networks(wpa_s);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
wpas_wps_clear_ap_info(wpa_s);
WPS: Fix clear-from-timeout handling to avoid race condition The 100 ms timeout to clear WPS state after EAP-Failure has been received worked otherwise fine, but it opened a race condition on another WPS operation starting within that wait. If that happens, the timeout will cancel that new operation unexpectedly. Fix this by cancelling the timeout from wpas_clear_wps(). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 15:00:09 -05:00
if (eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL) >
0)
wpas_clear_wps(wpa_s);
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
}
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
WPS: Clear after_wps from number of new locations This makes it less likely to forget WPS single-channel scan optimization in effect after having completed the WPS operation or in case WPS operating gets cancelled. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 14:34:39 -04:00
wpa_s->after_wps = 0;
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 13:51:06 -04:00
return 0;
}
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
int wpas_wps_start_reg(struct wpa_supplicant *wpa_s, const u8 *bssid,
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
const char *pin, struct wps_new_ap_settings *settings)
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
{
struct wpa_ssid *ssid;
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
char val[200];
char *pos, *end;
int res;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
WPS: Reject station-mode WPS operations when AP mode is enabled Start of station-mode WPS PBC/PIN/Registrar/NFC operation would result in the AP mode getting disabled. This can be particularly confusing for the P2P GO case where the group would need to be stopped cleanly. As such, it is better to reject these invalid operations rather than trying to handle all corner cases needed to allow this to work robustly. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-02 10:09:38 -05:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface) {
wpa_printf(MSG_DEBUG,
"WPS: Reject request to start Registrar(as station) operation while AP mode is enabled");
return -1;
}
#endif /* CONFIG_AP */
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (!pin)
return -1;
wpas_clear_wps(wpa_s);
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
ssid = wpas_wps_add_network(wpa_s, 1, NULL, bssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
if (ssid == NULL)
return -1;
P2P: Do not save temporary networks
2010-07-18 17:30:24 -04:00
ssid->temporary = 1;
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
pos = val;
end = pos + sizeof(val);
res = os_snprintf(pos, end - pos, "\"pin=%s", pin);
Check os_snprintf() result more consistently - automatic 1 This converts os_snprintf() result validation cases to use os_snprintf_error() where the exact rule used in os_snprintf_error() was used. These changes were done automatically with spatch using the following semantic patch: @@ identifier E1; expression E2,E3,E4,E5,E6; statement S1; @@ ( E1 = os_snprintf(E2, E3, ...); | int E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else if (E6) E1 = os_snprintf(E2, E3, ...); else E1 = 0; | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else if (E6) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... E1 = os_snprintf(E2, E3, ...); } ) ? os_free(E4); - if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \)) + if (os_snprintf_error(E3, E1)) ( S1 | { ... } ) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
if (os_snprintf_error(end - pos, res))
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
return -1;
pos += res;
if (settings) {
res = os_snprintf(pos, end - pos, " new_ssid=%s new_auth=%s "
"new_encr=%s new_key=%s",
settings->ssid_hex, settings->auth,
settings->encr, settings->key_hex);
Check os_snprintf() result more consistently - automatic 1 This converts os_snprintf() result validation cases to use os_snprintf_error() where the exact rule used in os_snprintf_error() was used. These changes were done automatically with spatch using the following semantic patch: @@ identifier E1; expression E2,E3,E4,E5,E6; statement S1; @@ ( E1 = os_snprintf(E2, E3, ...); | int E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else if (E6) E1 = os_snprintf(E2, E3, ...); else E1 = 0; | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else if (E6) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... E1 = os_snprintf(E2, E3, ...); } ) ? os_free(E4); - if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \)) + if (os_snprintf_error(E3, E1)) ( S1 | { ... } ) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
if (os_snprintf_error(end - pos, res))
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
return -1;
pos += res;
}
res = os_snprintf(pos, end - pos, "\"");
Check os_snprintf() result more consistently - automatic 1 This converts os_snprintf() result validation cases to use os_snprintf_error() where the exact rule used in os_snprintf_error() was used. These changes were done automatically with spatch using the following semantic patch: @@ identifier E1; expression E2,E3,E4,E5,E6; statement S1; @@ ( E1 = os_snprintf(E2, E3, ...); | int E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else if (E6) E1 = os_snprintf(E2, E3, ...); else E1 = 0; | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else if (E6) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... E1 = os_snprintf(E2, E3, ...); } ) ? os_free(E4); - if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \)) + if (os_snprintf_error(E3, E1)) ( S1 | { ... } ) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
if (os_snprintf_error(end - pos, res))
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 06:58:15 -04:00
return -1;
WPS: Verify wpa_config_set() return value more consistently Even though this command is very unlikely to fail, in theory, it could and the WPS connection would fail in such a case. Return more clearer failure indication in such a case without even trying to start reassociation. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-01 13:30:17 -05:00
if (wpa_config_set(ssid, "phase1", val, 0) < 0)
return -1;
WPS: Make fragment size configurable for EAP-WSC peer "wpa_cli set wps_fragment_size <val>" can now be used to configure the fragment size limit for EAP-WSC.
2010-07-22 13:24:23 -04:00
if (wpa_s->wps_fragment_size)
ssid->eap.fragment_size = wpa_s->wps_fragment_size;
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_register_timeout(WPS_PBC_WALK_TIME, 0, wpas_wps_timeout,
wpa_s, NULL);
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
wpas_wps_reassoc(wpa_s, ssid, bssid, 0);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
return 0;
}
P2P: Store P2P Device Address in per-device PSK records This makes the P2P Device Address of the Enrollee available with the PSK records to allow P2P Device Address instead of P2P Interface Address to be used for finding the correct PSK. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 03:47:34 -04:00
static int wpas_wps_new_psk_cb(void *ctx, const u8 *mac_addr,
const u8 *p2p_dev_addr, const u8 *psk,
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
size_t psk_len)
{
P2P: Store P2P Device Address in per-device PSK records This makes the P2P Device Address of the Enrollee available with the PSK records to allow P2P Device Address instead of P2P Interface Address to be used for finding the correct PSK. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 03:47:34 -04:00
if (is_zero_ether_addr(p2p_dev_addr)) {
wpa_printf(MSG_DEBUG,
"Received new WPA/WPA2-PSK from WPS for STA " MACSTR,
MAC2STR(mac_addr));
} else {
wpa_printf(MSG_DEBUG,
"Received new WPA/WPA2-PSK from WPS for STA " MACSTR
" P2P Device Addr " MACSTR,
MAC2STR(mac_addr), MAC2STR(p2p_dev_addr));
}
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
wpa_hexdump_key(MSG_DEBUG, "Per-device PSK", psk, psk_len);
/* TODO */
return 0;
}
static void wpas_wps_pin_needed_cb(void *ctx, const u8 *uuid_e,
const struct wps_device_data *dev)
{
char uuid[40], txt[400];
int len;
WPS: Clean up Primary Device Type handling Use shared functions for converting Primary Device Type between binary and string formats. In addition, use array of eight octets instead of a specific structure with multiple fields to reduce code complexity.
2009-11-26 04:39:29 -05:00
char devtype[WPS_DEV_TYPE_BUFSIZE];
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
if (uuid_bin2str(uuid_e, uuid, sizeof(uuid)))
return;
wpa_printf(MSG_DEBUG, "WPS: PIN needed for UUID-E %s", uuid);
len = os_snprintf(txt, sizeof(txt), "WPS-EVENT-PIN-NEEDED %s " MACSTR
WPS: Clean up Primary Device Type handling Use shared functions for converting Primary Device Type between binary and string formats. In addition, use array of eight octets instead of a specific structure with multiple fields to reduce code complexity.
2009-11-26 04:39:29 -05:00
" [%s|%s|%s|%s|%s|%s]",
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
uuid, MAC2STR(dev->mac_addr), dev->device_name,
dev->manufacturer, dev->model_name,
dev->model_number, dev->serial_number,
WPS: Clean up Primary Device Type handling Use shared functions for converting Primary Device Type between binary and string formats. In addition, use array of eight octets instead of a specific structure with multiple fields to reduce code complexity.
2009-11-26 04:39:29 -05:00
wps_dev_type_bin2str(dev->pri_dev_type, devtype,
sizeof(devtype)));
Check os_snprintf() result more consistently - success case This converts os_snprintf() result validation cases to use os_snprintf_error() in cases where success condition was used to execute a step. These changes were done automatically with spatch using the following semantic patch: @@ expression E1,E2,E3; statement S1; @@ E1 = os_snprintf(E2, E3, ...); - if (\( E1 >= 0 \| E1 > 0 \) && \( (size_t) E1 < E3 \| E1 < (int) E3 \| E1 < E3 \)) + if (!os_snprintf_error(E3, E1)) S1 Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 05:15:34 -05:00
if (!os_snprintf_error(sizeof(txt), len))
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
wpa_printf(MSG_INFO, "%s", txt);
}
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
static void wpas_wps_set_sel_reg_cb(void *ctx, int sel_reg, u16 dev_passwd_id,
u16 sel_reg_config_methods)
{
#ifdef CONFIG_WPS_ER
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s->wps_er == NULL)
return;
WPS 2.0: Make sure PHY/VIRT flag gets set for PBC
2010-07-19 01:53:15 -04:00
wpa_printf(MSG_DEBUG, "WPS ER: SetSelectedRegistrar - sel_reg=%d "
"dev_password_id=%u sel_reg_config_methods=0x%x",
sel_reg, dev_passwd_id, sel_reg_config_methods);
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
wps_er_set_sel_reg(wpa_s->wps_er, sel_reg, dev_passwd_id,
sel_reg_config_methods);
#endif /* CONFIG_WPS_ER */
}
WPS: Add virtual flags in Config Methods for WPS 2.0 if needed This is a workaround for incorrect configuration (missing virtual/physical identifier for config methods) for WPS 2.0 to allow unmodified configuration from WPS 1.0 to be used while enforcing compliant WPS 2.0 values.
2010-10-16 05:57:47 -04:00
static u16 wps_fix_config_methods(u16 config_methods)
{
if ((config_methods &
(WPS_CONFIG_DISPLAY | WPS_CONFIG_VIRT_DISPLAY |
WPS_CONFIG_PHY_DISPLAY)) == WPS_CONFIG_DISPLAY) {
wpa_printf(MSG_INFO, "WPS: Converting display to "
"virtual_display for WPS 2.0 compliance");
config_methods |= WPS_CONFIG_VIRT_DISPLAY;
}
if ((config_methods &
(WPS_CONFIG_PUSHBUTTON | WPS_CONFIG_VIRT_PUSHBUTTON |
WPS_CONFIG_PHY_PUSHBUTTON)) == WPS_CONFIG_PUSHBUTTON) {
wpa_printf(MSG_INFO, "WPS: Converting push_button to "
"virtual_push_button for WPS 2.0 compliance");
config_methods |= WPS_CONFIG_VIRT_PUSHBUTTON;
}
return config_methods;
}
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
static void wpas_wps_set_uuid(struct wpa_supplicant *wpa_s,
struct wps_context *wps)
{
WPS: Clean up UUID debug print Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 09:50:08 -05:00
char buf[50];
const char *src;
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
if (is_nil_uuid(wpa_s->conf->uuid)) {
struct wpa_supplicant *first;
first = wpa_s->global->ifaces;
while (first && first->next)
first = first->next;
if (first && first != wpa_s) {
wpa_supplicant: Fix overlapping memcpy on WPS interface addition I think this should fix the following valgrind complaint: ==1972== Source and destination overlap in memcpy(0x5181708, 0x5181708, 16) ==1972== at 0x4A073BA: memcpy (mc_replace_strmem.c:602) ==1972== by 0x45872B: wpas_wps_set_uuid (wps_supplicant.c:1116) ==1972== by 0x4599EC: wpas_wps_update_config (wps_supplicant.c:1747) ==1972== by 0x4C8DB0: wpa_supplicant_update_config (wpa_supplicant.c:3090) ==1972== by 0x4C3E5E: wpa_supplicant_reload_configuration (wpa_supplicant.c:746) ==1972== by 0x4B8B37: wpa_supplicant_ctrl_iface_process (ctrl_iface.c:4082) ==1972== by 0x4BA39C: wpa_supplicant_ctrl_iface_receive (ctrl_iface_unix.c:168) ==1972== by 0x4114D4: eloop_sock_table_dispatch_table (eloop.c:335) ==1972== by 0x411541: eloop_sock_table_dispatch (eloop.c:352) ==1972== by 0x41200D: eloop_run (eloop.c:766) ==1972== by 0x4C8B43: wpa_supplicant_run (wpa_supplicant.c:3010) ==1972== by 0x4D44AD: main (main.c:286) Signed-hostap: Ben Greear <greearb@candelatech.com> intended-for: hostap-1
2012-05-10 03:56:51 -04:00
if (wps != wpa_s->global->ifaces->wps)
os_memcpy(wps->uuid,
wpa_s->global->ifaces->wps->uuid,
WPS_UUID_LEN);
WPS: Clean up UUID debug print Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 09:50:08 -05:00
src = "from the first interface";
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
} else {
uuid_gen_mac_addr(wpa_s->own_addr, wps->uuid);
WPS: Clean up UUID debug print Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 09:50:08 -05:00
src = "based on MAC address";
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
}
} else {
os_memcpy(wps->uuid, wpa_s->conf->uuid, WPS_UUID_LEN);
WPS: Clean up UUID debug print Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 09:50:08 -05:00
src = "based on configuration";
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
}
WPS: Clean up UUID debug print Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 09:50:08 -05:00
uuid_bin2str(wps->uuid, buf, sizeof(buf));
wpa_dbg(wpa_s, MSG_DEBUG, "WPS: UUID %s: %s", src, buf);
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
}
WPS: Allow vendor specific attribute to be added into M1 wps_vendor_ext_m1 configuration parameter can now be used to add a vendor specific attribute into the WPS M1 message, e.g., for Windows Vertical Pairing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-03 17:08:57 -04:00
static void wpas_wps_set_vendor_ext_m1(struct wpa_supplicant *wpa_s,
struct wps_context *wps)
{
wpabuf_free(wps->dev.vendor_ext_m1);
wps->dev.vendor_ext_m1 = NULL;
if (wpa_s->conf->wps_vendor_ext_m1) {
wps->dev.vendor_ext_m1 =
wpabuf_dup(wpa_s->conf->wps_vendor_ext_m1);
if (!wps->dev.vendor_ext_m1) {
wpa_printf(MSG_ERROR, "WPS: Cannot "
"allocate memory for vendor_ext_m1");
}
}
}
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
int wpas_wps_init(struct wpa_supplicant *wpa_s)
{
struct wps_context *wps;
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
struct wps_registrar_config rcfg;
WPS: Set RF bands based on driver capabilities Instead of hardcoding support for both 2.4 GHz and 5 GHz bands, use driver capabilities to figure out which bands are supported.
2011-08-31 10:53:55 -04:00
struct hostapd_hw_modes *modes;
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 04:58:54 -04:00
u16 m;
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
wps = os_zalloc(sizeof(*wps));
if (wps == NULL)
return -1;
wps->cred_cb = wpa_supplicant_wps_cred;
WPS: Added event callback and M2D notification The event callback will be used for various event messages and the M2D notification is the first such message. It is used to notify wpa_gui about Registrar not yet knowing the device password (PIN).
2008-12-18 14:58:42 -05:00
wps->event_cb = wpa_supplicant_wps_event;
WPS: Set currently used RF band in RF Bands attribute According to WSC specification (Ver 2.0.2, section 8.3), RF Bands attribute should be set to the specific RF band used for the current message. Add an option to set wanted band in wps_build_rf_bands() and add a callback to get the current band from wpa_supplicant and hostapd. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-08-25 03:55:53 -04:00
wps->rf_band_cb = wpa_supplicant_wps_rf_band;
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
wps->cb_ctx = wpa_s;
Added configuration of WPS device parameters for wpa_supplicant
2008-12-13 10:20:46 -05:00
wps->dev.device_name = wpa_s->conf->device_name;
wps->dev.manufacturer = wpa_s->conf->manufacturer;
wps->dev.model_name = wpa_s->conf->model_name;
wps->dev.model_number = wpa_s->conf->model_number;
wps->dev.serial_number = wpa_s->conf->serial_number;
WPS: Make Config Methods configurable for wpa_supplicant This adds config_methods configuration option for wpa_supplicant following the design used in hostapd. In addition, the string is now parsed in common code from src/wps/wps_common.c and the list of configurable methods include all the defined methods from WPS 1.0h spec.
2009-12-21 08:59:25 -05:00
wps->config_methods =
wps_config_methods_str2bin(wpa_s->conf->config_methods);
WPS: Do not allow Label and Display config methods to be enabled It is unclear which PIN is used if both Label and Display config methods are advertised. Avoid this by not allowing such configuration.
2010-07-17 23:30:49 -04:00
if ((wps->config_methods & (WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) ==
(WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) {
wpa_printf(MSG_ERROR, "WPS: Both Label and Display config "
"methods are not allowed at the same time");
os_free(wps);
return -1;
}
WPS: Add virtual flags in Config Methods for WPS 2.0 if needed This is a workaround for incorrect configuration (missing virtual/physical identifier for config methods) for WPS 2.0 to allow unmodified configuration from WPS 1.0 to be used while enforcing compliant WPS 2.0 values.
2010-10-16 05:57:47 -04:00
wps->config_methods = wps_fix_config_methods(wps->config_methods);
WPS: Set Probe Request config methods based on configuration Instead of hardcoding the Config Methods attribute value in Probe Request frames, set this based on the configured parameter config_methods to allow correct set of methods to be advertised.
2011-09-01 08:24:45 -04:00
wps->dev.config_methods = wps->config_methods;
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 12:50:22 -04:00
os_memcpy(wps->dev.pri_dev_type, wpa_s->conf->device_type,
WPS_DEV_TYPE_LEN);
WPS: Add secondary device types into Probe Request frames The secondary device type list is an optional attribute in the WSC IE. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 05:09:49 -04:00
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 12:50:22 -04:00
wps->dev.num_sec_dev_types = wpa_s->conf->num_sec_device_types;
os_memcpy(wps->dev.sec_dev_type, wpa_s->conf->sec_device_type,
WPS_DEV_TYPE_LEN * wps->dev.num_sec_dev_types);
WPS: Add secondary device types into Probe Request frames The secondary device type list is an optional attribute in the WSC IE. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 05:09:49 -04:00
WPS: Allow vendor specific attribute to be added into M1 wps_vendor_ext_m1 configuration parameter can now be used to add a vendor specific attribute into the WPS M1 message, e.g., for Windows Vertical Pairing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-03 17:08:57 -04:00
wpas_wps_set_vendor_ext_m1(wpa_s, wps);
Added configuration of WPS device parameters for wpa_supplicant
2008-12-13 10:20:46 -05:00
wps->dev.os_version = WPA_GET_BE32(wpa_s->conf->os_version);
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 04:58:54 -04:00
modes = wpa_s->hw.modes;
WPS: Set RF bands based on driver capabilities Instead of hardcoding support for both 2.4 GHz and 5 GHz bands, use driver capabilities to figure out which bands are supported.
2011-08-31 10:53:55 -04:00
if (modes) {
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 04:58:54 -04:00
for (m = 0; m < wpa_s->hw.num_modes; m++) {
WPS: Set RF bands based on driver capabilities Instead of hardcoding support for both 2.4 GHz and 5 GHz bands, use driver capabilities to figure out which bands are supported.
2011-08-31 10:53:55 -04:00
if (modes[m].mode == HOSTAPD_MODE_IEEE80211B ||
modes[m].mode == HOSTAPD_MODE_IEEE80211G)
wps->dev.rf_bands |= WPS_RF_24GHZ;
else if (modes[m].mode == HOSTAPD_MODE_IEEE80211A)
wps->dev.rf_bands |= WPS_RF_50GHZ;
}
}
if (wps->dev.rf_bands == 0) {
/*
* Default to claiming support for both bands if the driver
* does not provide support for fetching supported bands.
*/
wps->dev.rf_bands = WPS_RF_24GHZ | WPS_RF_50GHZ;
}
WPS: Moved mac_addr and uuid configuration into wps_context There is no need to complicate EAPOL and EAP interfaces with WPS specific parameters now that wps_context is passed through.
2008-11-28 13:44:47 -05:00
os_memcpy(wps->dev.mac_addr, wpa_s->own_addr, ETH_ALEN);
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
wpas_wps_set_uuid(wpa_s, wps);
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
wps->auth_types = WPS_AUTH_WPA2PSK | WPS_AUTH_WPAPSK;
wps->encr_types = WPS_ENCR_AES | WPS_ENCR_TKIP;
os_memset(&rcfg, 0, sizeof(rcfg));
rcfg.new_psk_cb = wpas_wps_new_psk_cb;
rcfg.pin_needed_cb = wpas_wps_pin_needed_cb;
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
rcfg.set_sel_reg_cb = wpas_wps_set_sel_reg_cb;
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
rcfg.cb_ctx = wpa_s;
wps->registrar = wps_registrar_init(wps, &rcfg);
if (wps->registrar == NULL) {
wpa_printf(MSG_DEBUG, "Failed to initialize WPS Registrar");
os_free(wps);
return -1;
}
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
wpa_s->wps = wps;
return 0;
}
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
#ifdef CONFIG_WPS_ER
static void wpas_wps_nfc_clear(struct wps_context *wps)
{
wps->ap_nfc_dev_pw_id = 0;
wpabuf_free(wps->ap_nfc_dh_pubkey);
wps->ap_nfc_dh_pubkey = NULL;
wpabuf_free(wps->ap_nfc_dh_privkey);
wps->ap_nfc_dh_privkey = NULL;
wpabuf_free(wps->ap_nfc_dev_pw);
wps->ap_nfc_dev_pw = NULL;
}
#endif /* CONFIG_WPS_ER */
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
void wpas_wps_deinit(struct wpa_supplicant *wpa_s)
{
WPS: Split eapol_cb reconnect to a separate code path Use eloop timeout to run the reconnect command after eapol_cb has returned. This reduces stack use and can simplify the driver command/event sequence by allowing the disconnection events from the provisioning step to be processed before starting the actual data connection. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-13 04:47:03 -04:00
wpas_wps_assoc_with_cred_cancel(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
eloop_cancel_timeout(wpas_wps_timeout, wpa_s, NULL);
WPS: Fix failure path to allow WSC_NACK and EAP-Failure to be exchanged Commit c7a67a77195464d667d6f482777a75325b6f3642 forced disconnection when wpas_clear_wps() is called. Call this function from a registered timeout when processing a failure event in order to allow the WPS handshake to be completed with WSC_NACK and EAP-Failure. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-23 10:43:01 -04:00
eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL);
WPS: Reenable the networks disabled during wpa_wpas_reassoc During the association for the WPS handshake all the other configured networks are disabled. This patch makes wpa_supplicant reenable the disabled networks after the success/failure of the WPS handshake. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-10-04 14:11:04 -04:00
eloop_cancel_timeout(wpas_wps_reenable_networks_cb, wpa_s, NULL);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
wpas_wps_clear_ap_info(wpa_s);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 13:59:45 -05:00
Remove leftover timeouts on cleanup Signed-off-by: Alexandru Costache <alexandru.costache.100@gmail.com>
2014-05-12 12:14:55 -04:00
#ifdef CONFIG_P2P
eloop_cancel_timeout(wpas_p2p_pbc_overlap_cb, wpa_s, NULL);
#endif /* CONFIG_P2P */
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
if (wpa_s->wps == NULL)
return;
WPS ER: Deinit ER before WPS registrar/context ER code may still touch WPS registrar/context during deinit, so better do that before freeing the other WPS components.
2009-11-15 15:52:17 -05:00
#ifdef CONFIG_WPS_ER
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
wps_er_deinit(wpa_s->wps_er, NULL, NULL);
WPS ER: Deinit ER before WPS registrar/context ER code may still touch WPS registrar/context during deinit, so better do that before freeing the other WPS components.
2009-11-15 15:52:17 -05:00
wpa_s->wps_er = NULL;
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
wpas_wps_nfc_clear(wpa_s->wps);
WPS ER: Deinit ER before WPS registrar/context ER code may still touch WPS registrar/context during deinit, so better do that before freeing the other WPS components.
2009-11-15 15:52:17 -05:00
#endif /* CONFIG_WPS_ER */
Moved WPS Registrar initialization from EAP peer to wps_supplicant.c This matches the style used in hostapd, i.e., Registrar is initialized only once and callbacks are now processed in wps_supplicant.c.
2009-01-03 13:18:35 -05:00
wps_registrar_deinit(wpa_s->wps->registrar);
WPS: Add UFD support (USBA out-of-band mechanism) This patch is only for the following use case: - Enrollee = wpa_supplicant - Registrar = hostapd internal Registrar Following UFD methods can be used: - Enrollee PIN with UFD - Registrar PIN with UFD - unencrypted credential with UFD Encrypted credentials are not supported. Enrollee side operation: wpa_cli -i ath0 wps_oob <device type> <mount point> <oob method> oob method = pin-e/pin-r/cred wpa_cli -i ath0 wps_oob ufd /mnt/ pin-r Registrar side operation: ./hostapd_cli -i ath0 wps_oob <device type> <mount point> <oob method> oob method = pin-e/pin-r/cred hostapd_cli -i ath0 wps_oob ufd /mnt/ cred
2009-02-26 14:57:38 -05:00
wpabuf_free(wpa_s->wps->dh_pubkey);
wpabuf_free(wpa_s->wps->dh_privkey);
WPS: Allow vendor specific attribute to be added into M1 wps_vendor_ext_m1 configuration parameter can now be used to add a vendor specific attribute into the WPS M1 message, e.g., for Windows Vertical Pairing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-03 17:08:57 -04:00
wpabuf_free(wpa_s->wps->dev.vendor_ext_m1);
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 13:32:13 -05:00
os_free(wpa_s->wps->network_key);
os_free(wpa_s->wps);
wpa_s->wps = NULL;
}
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s,
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
struct wpa_ssid *ssid, struct wpa_bss *bss)
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
{
struct wpabuf *wps_ie;
if (!(ssid->key_mgmt & WPA_KEY_MGMT_WPS))
return -1;
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
wps_ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
if (!wps_ie) {
wpa_printf(MSG_DEBUG, " skip - non-WPS AP");
return 0;
}
if (!wps_is_selected_pbc_registrar(wps_ie)) {
wpa_printf(MSG_DEBUG, " skip - WPS AP "
"without active PBC Registrar");
wpabuf_free(wps_ie);
return 0;
}
/* TODO: overlap detection */
wpa_printf(MSG_DEBUG, " selected based on WPS IE "
"(Active PBC)");
wpabuf_free(wps_ie);
return 1;
}
if (eap_is_wps_pin_enrollee(&ssid->eap)) {
if (!wps_ie) {
wpa_printf(MSG_DEBUG, " skip - non-WPS AP");
return 0;
}
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
/*
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
* Start with WPS APs that advertise our address as an
* authorized MAC (v2.0) or active PIN Registrar (v1.0) and
* allow any WPS AP after couple of scans since some APs do not
* set Selected Registrar attribute properly when using
* external Registrar.
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
*/
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
if (!wps_is_addr_authorized(wps_ie, wpa_s->own_addr, 1)) {
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
if (wpa_s->scan_runs < WPS_PIN_SCAN_IGNORE_SEL_REG) {
wpa_printf(MSG_DEBUG, " skip - WPS AP "
"without active PIN Registrar");
wpabuf_free(wps_ie);
return 0;
}
wpa_printf(MSG_DEBUG, " selected based on WPS IE");
} else {
wpa_printf(MSG_DEBUG, " selected based on WPS IE "
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
"(Authorized MAC or Active PIN)");
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
}
wpabuf_free(wps_ie);
return 1;
}
if (wps_ie) {
wpa_printf(MSG_DEBUG, " selected based on WPS IE");
wpabuf_free(wps_ie);
return 1;
}
return -1;
}
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
struct wpa_bss *bss)
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
{
struct wpabuf *wps_ie = NULL;
int ret = 0;
if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
wps_ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
if (wps_ie && wps_is_selected_pbc_registrar(wps_ie)) {
/* allow wildcard SSID for WPS PBC */
ret = 1;
}
} else if (eap_is_wps_pin_enrollee(&ssid->eap)) {
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
wps_ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
if (wps_ie &&
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
(wps_is_addr_authorized(wps_ie, wpa_s->own_addr, 1) ||
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 06:10:58 -05:00
wpa_s->scan_runs >= WPS_PIN_SCAN_IGNORE_SEL_REG)) {
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
/* allow wildcard SSID for WPS PIN */
ret = 1;
}
}
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 15:55:02 -05:00
if (!ret && ssid->bssid_set &&
os_memcmp(ssid->bssid, bss->bssid, ETH_ALEN) == 0) {
/* allow wildcard SSID due to hardcoded BSSID match */
ret = 1;
}
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 10:16:14 -04:00
#ifdef CONFIG_WPS_STRICT
if (wps_ie) {
if (wps_validate_beacon_probe_resp(wps_ie, bss->beacon_ie_len >
WPS: Add BSSID to strict validation error messages This makes it easier to figure out which AP is sending invalid Beacon or Probe Response frames.
2010-09-20 17:54:22 -04:00
0, bss->bssid) < 0)
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 10:16:14 -04:00
ret = 0;
if (bss->beacon_ie_len) {
struct wpabuf *bcn_wps;
Use BSS entries instead of scan results for BSS selection This allows the BSS selection functions to be called without having the scan result data structure. This can be used to skip extra scans in cases where previous results can be considered fresh. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 12:56:57 -04:00
bcn_wps = wpa_bss_get_vendor_ie_multi_beacon(
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 10:16:14 -04:00
bss, WPS_IE_VENDOR_TYPE);
if (bcn_wps == NULL) {
wpa_printf(MSG_DEBUG, "WPS: Mandatory WPS IE "
"missing from AP Beacon");
ret = 0;
} else {
if (wps_validate_beacon(wps_ie) < 0)
ret = 0;
wpabuf_free(bcn_wps);
}
}
}
#endif /* CONFIG_WPS_STRICT */
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
wpabuf_free(wps_ie);
return ret;
}
int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
struct wpa_bss *selected, struct wpa_ssid *ssid)
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
{
const u8 *sel_uuid, *uuid;
struct wpabuf *wps_ie;
int ret = 0;
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
struct wpa_bss *bss;
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
if (!eap_is_wps_pbc_enrollee(&ssid->eap))
return 0;
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
wpa_printf(MSG_DEBUG, "WPS: Check whether PBC session overlap is "
"present in scan results; selected BSSID " MACSTR,
MAC2STR(selected->bssid));
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
/* Make sure that only one AP is in active PBC mode */
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
wps_ie = wpa_bss_get_vendor_ie_multi(selected, WPS_IE_VENDOR_TYPE);
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
if (wps_ie) {
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
sel_uuid = wps_get_uuid_e(wps_ie);
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
wpa_hexdump(MSG_DEBUG, "WPS: UUID of the selected BSS",
sel_uuid, UUID_LEN);
} else {
wpa_printf(MSG_DEBUG, "WPS: Selected BSS does not include "
"WPS IE?!");
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
sel_uuid = NULL;
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
}
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
struct wpabuf *ie;
if (bss == selected)
continue;
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
if (!ie)
continue;
if (!wps_is_selected_pbc_registrar(ie)) {
wpabuf_free(ie);
continue;
}
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
wpa_printf(MSG_DEBUG, "WPS: Another BSS in active PBC mode: "
MACSTR, MAC2STR(bss->bssid));
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
uuid = wps_get_uuid_e(ie);
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
wpa_hexdump(MSG_DEBUG, "WPS: UUID of the other BSS",
uuid, UUID_LEN);
WPS: Do not indicate PBC overlap for the same BSS Even if the UUID would have a mismatch, e.g., due to no UUID known for the target in a new WPS PBC instance, do not indicate PBC session overlap if the BSSID is same in the two entries. This should not really happen in normal use cases, but can happen at least in some test scenarios where the same BSSID is used in consecutive test cases and the old BSS entry remains in cfg80211 cache. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-24 11:40:25 -05:00
if (os_memcmp(selected->bssid, bss->bssid, ETH_ALEN) == 0) {
wpabuf_free(ie);
continue;
}
Fixed PBC overlap detection to handle case of missing UUID-E UUID-E is not required to be present in Beacon frame, so we need to accept scan results that do not have UUID-E as a valid PBC situation as long as not more than one AP is in active PBC mode.
2008-12-21 10:28:01 -05:00
if (sel_uuid == NULL || uuid == NULL ||
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
os_memcmp(sel_uuid, uuid, UUID_LEN) != 0) {
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
ret = 1; /* PBC overlap */
WPS: Add more verbose debug info on PBC session overlap detection
2010-09-20 18:08:52 -04:00
wpa_msg(wpa_s, MSG_INFO, "WPS: PBC overlap detected: "
MACSTR " and " MACSTR,
MAC2STR(selected->bssid),
MAC2STR(bss->bssid));
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
wpabuf_free(ie);
break;
}
/* TODO: verify that this is reasonable dual-band situation */
Fixed memory leak in WPS PBC overlap detection
2008-12-15 12:50:53 -05:00
wpabuf_free(ie);
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 15:06:34 -05:00
}
wpabuf_free(wps_ie);
return ret;
}
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s)
{
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
struct wpa_bss *bss;
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
unsigned int pbc = 0, auth = 0, pin = 0, wps = 0;
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
if (wpa_s->disconnected || wpa_s->wpa_state >= WPA_ASSOCIATED)
return;
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
struct wpabuf *ie;
Use BSS table entry instead of raw scan result for connection
2010-01-02 09:16:02 -05:00
ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
if (!ie)
continue;
if (wps_is_selected_pbc_registrar(ie))
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
pbc++;
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
else if (wps_is_addr_authorized(ie, wpa_s->own_addr, 0))
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
auth++;
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
else if (wps_is_selected_pin_registrar(ie))
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
pin++;
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
else
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
wps++;
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
wpabuf_free(ie);
}
WPS: Make WPS-AP-AVAILABLE* events a bit more consistent The BSS table entries may be in more or less random order and it is better to show the most likely WPS configuration method in a way that is somewhat more consistent instead of just showing the method of the first BSS entry found in the table.
2011-01-05 04:49:03 -05:00
if (pbc)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PBC);
else if (auth)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_AUTH);
else if (pin)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
else if (wps)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 13:09:57 -05:00
}
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 15:55:02 -05:00
int wpas_wps_searching(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if ((ssid->key_mgmt & WPA_KEY_MGMT_WPS) && !ssid->disabled)
return 1;
}
return 0;
}
Add parsed information from WPS IE(s) into scan results This makes it easier for external programs to show WPS information since they do not need to parse the WPS IE themselves anymore.
2009-09-11 10:14:49 -04:00
int wpas_wps_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
char *end)
{
struct wpabuf *wps_ie;
int ret;
wps_ie = ieee802_11_vendor_ie_concat(ies, ies_len, WPS_DEV_OUI_WFA);
if (wps_ie == NULL)
return 0;
ret = wps_attr_text(wps_ie, buf, end);
wpabuf_free(wps_ie);
return ret;
}
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
WPS ER: Allow AP filtering based on IP address wps_er_start command now takes an optional parameter that can be used to configure a filter to only allow UPnP SSDP messages from the specified IP address. In practice, this limits the WPS ER operations to a single AP and filters out all other devices in the network.
2010-05-27 08:23:55 -04:00
int wpas_wps_er_start(struct wpa_supplicant *wpa_s, const char *filter)
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
{
#ifdef CONFIG_WPS_ER
if (wpa_s->wps_er) {
WPS ER: Refresh ER data on WPS_ER_START when already started This sends out the AP and Enrollee notifications for all tracked devices and generates a new SSDP search to find more APs.
2009-11-20 14:57:30 -05:00
wps_er_refresh(wpa_s->wps_er);
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
return 0;
}
WPS ER: Allow AP filtering based on IP address wps_er_start command now takes an optional parameter that can be used to configure a filter to only allow UPnP SSDP messages from the specified IP address. In practice, this limits the WPS ER operations to a single AP and filters out all other devices in the network.
2010-05-27 08:23:55 -04:00
wpa_s->wps_er = wps_er_init(wpa_s->wps, wpa_s->ifname, filter);
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
if (wpa_s->wps_er == NULL)
return -1;
return 0;
#else /* CONFIG_WPS_ER */
return 0;
#endif /* CONFIG_WPS_ER */
}
WPS ER: Remove unnecessary return value wps_er_deinit() cannot fail and it does not return anything, so neither should wpas_wps_er_stop(). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-13 12:50:16 -05:00
void wpas_wps_er_stop(struct wpa_supplicant *wpa_s)
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
{
#ifdef CONFIG_WPS_ER
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
wps_er_deinit(wpa_s->wps_er, NULL, NULL);
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 05:41:01 -05:00
wpa_s->wps_er = NULL;
#endif /* CONFIG_WPS_ER */
}
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
#ifdef CONFIG_WPS_ER
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
int wpas_wps_er_add_pin(struct wpa_supplicant *wpa_s, const u8 *addr,
const char *uuid, const char *pin)
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
{
u8 u[UUID_LEN];
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
const u8 *use_uuid = NULL;
u8 addr_buf[ETH_ALEN];
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
if (os_strcmp(uuid, "any") == 0) {
} else if (uuid_str2bin(uuid, u) == 0) {
use_uuid = u;
} else if (hwaddr_aton(uuid, addr_buf) == 0) {
use_uuid = wps_er_get_sta_uuid(wpa_s->wps_er, addr_buf);
if (use_uuid == NULL)
return -1;
} else
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
return -1;
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 09:40:10 -05:00
return wps_registrar_add_pin(wpa_s->wps->registrar, addr,
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
use_uuid,
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
(const u8 *) pin, os_strlen(pin), 300);
}
WPS ER: Add preliminary PBC support This will need some additional code in wps_er_pbc() to handle PBC mode enabling for a single AP only. For now, this can only be expected to work when the ER is connected to a single AP.
2009-11-15 11:46:03 -05:00
int wpas_wps_er_pbc(struct wpa_supplicant *wpa_s, const char *uuid)
{
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS ER: Add preliminary PBC support This will need some additional code in wps_er_pbc() to handle PBC mode enabling for a single AP only. For now, this can only be expected to work when the ER is connected to a single AP.
2009-11-15 11:46:03 -05:00
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS ER: Add preliminary PBC support This will need some additional code in wps_er_pbc() to handle PBC mode enabling for a single AP only. For now, this can only be expected to work when the ER is connected to a single AP.
2009-11-15 11:46:03 -05:00
return -1;
WPS ER: Allow Enrollee to be specified with MAC address wps_er_pbc and wps_er_pin can now be used with both the UUID and MAC Address of the Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:52:44 -04:00
return wps_er_pbc(wpa_s->wps_er, use_uuid, use_addr);
WPS ER: Add preliminary PBC support This will need some additional code in wps_er_pbc() to handle PBC mode enabling for a single AP only. For now, this can only be expected to work when the ER is connected to a single AP.
2009-11-15 11:46:03 -05:00
}
WPS ER: Add command for fetching current AP settings
2009-11-15 15:27:06 -05:00
int wpas_wps_er_learn(struct wpa_supplicant *wpa_s, const char *uuid,
const char *pin)
{
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS ER: Add command for fetching current AP settings
2009-11-15 15:27:06 -05:00
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS ER: Add command for fetching current AP settings
2009-11-15 15:27:06 -05:00
return -1;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
return wps_er_learn(wpa_s->wps_er, use_uuid, use_addr, (const u8 *) pin,
WPS ER: Add command for fetching current AP settings
2009-11-15 15:27:06 -05:00
os_strlen(pin));
}
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
WPS NFC: Allow configuration token to be built from network block "WPS_NFC_CONFIG_TOKEN <WPS/NDEF> <network id>" can now be used to build an NFC configuration token from a locally configured network. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 14:28:57 -04:00
static int wpas_wps_network_to_cred(struct wpa_ssid *ssid,
struct wps_credential *cred)
{
os_memset(cred, 0, sizeof(*cred));
if (ssid->ssid_len > 32)
return -1;
os_memcpy(cred->ssid, ssid->ssid, ssid->ssid_len);
cred->ssid_len = ssid->ssid_len;
if (ssid->key_mgmt & WPA_KEY_MGMT_PSK) {
cred->auth_type = (ssid->proto & WPA_PROTO_RSN) ?
WPS_AUTH_WPA2PSK : WPS_AUTH_WPAPSK;
if (ssid->pairwise_cipher & WPA_CIPHER_CCMP)
cred->encr_type = WPS_ENCR_AES;
else
cred->encr_type = WPS_ENCR_TKIP;
if (ssid->passphrase) {
cred->key_len = os_strlen(ssid->passphrase);
if (cred->key_len >= 64)
return -1;
os_memcpy(cred->key, ssid->passphrase, cred->key_len);
} else if (ssid->psk_set) {
cred->key_len = 32;
os_memcpy(cred->key, ssid->psk, 32);
} else
return -1;
} else {
cred->auth_type = WPS_AUTH_OPEN;
cred->encr_type = WPS_ENCR_NONE;
}
return 0;
}
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
int wpas_wps_er_set_config(struct wpa_supplicant *wpa_s, const char *uuid,
int id)
{
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
struct wpa_ssid *ssid;
struct wps_credential cred;
WPS ER: Explicitly clear PSK from stack after use There is no need to leave the PSK from temporary Credential structure that was built in stack after that Credential has been passed to the WPS module. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 06:07:00 -05:00
int ret;
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
return -1;
ssid = wpa_config_get_network(wpa_s->conf, id);
if (ssid == NULL || ssid->ssid == NULL)
return -1;
WPS NFC: Allow configuration token to be built from network block "WPS_NFC_CONFIG_TOKEN <WPS/NDEF> <network id>" can now be used to build an NFC configuration token from a locally configured network. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 14:28:57 -04:00
if (wpas_wps_network_to_cred(ssid, &cred) < 0)
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
return -1;
WPS ER: Explicitly clear PSK from stack after use There is no need to leave the PSK from temporary Credential structure that was built in stack after that Credential has been passed to the WPS module. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 06:07:00 -05:00
ret = wps_er_set_config(wpa_s->wps_er, use_uuid, use_addr, &cred);
os_memset(&cred, 0, sizeof(cred));
return ret;
WPS ER: Add wps_er_set_config to use local configuration This command can be used to enroll a network based on a local network configuration block instead of having to (re-)learn the current AP settings with wps_er_learn.
2010-10-20 06:37:01 -04:00
}
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
int wpas_wps_er_config(struct wpa_supplicant *wpa_s, const char *uuid,
const char *pin, struct wps_new_ap_settings *settings)
{
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
struct wps_credential cred;
size_t len;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
return -1;
if (settings->ssid_hex == NULL || settings->auth == NULL ||
settings->encr == NULL || settings->key_hex == NULL)
return -1;
os_memset(&cred, 0, sizeof(cred));
len = os_strlen(settings->ssid_hex);
if ((len & 1) || len > 2 * sizeof(cred.ssid) ||
hexstr2bin(settings->ssid_hex, cred.ssid, len / 2))
return -1;
cred.ssid_len = len / 2;
len = os_strlen(settings->key_hex);
if ((len & 1) || len > 2 * sizeof(cred.key) ||
hexstr2bin(settings->key_hex, cred.key, len / 2))
return -1;
cred.key_len = len / 2;
if (os_strcmp(settings->auth, "OPEN") == 0)
cred.auth_type = WPS_AUTH_OPEN;
else if (os_strcmp(settings->auth, "WPAPSK") == 0)
cred.auth_type = WPS_AUTH_WPAPSK;
else if (os_strcmp(settings->auth, "WPA2PSK") == 0)
cred.auth_type = WPS_AUTH_WPA2PSK;
else
return -1;
if (os_strcmp(settings->encr, "NONE") == 0)
cred.encr_type = WPS_ENCR_NONE;
WPS: Remove unused WEP related functionality Now that WPS 2.0 support is enabled unconditionally, WEP and Shared auth type are not allowed. This made some of the older code unused and that can now be removed to clean up the implementation. There is still one place where WEP is allowed for testing purposes: wpa_supplicant as Registrar trying to configure an AP to use WEP. That is now only allowed in CONFIG_TESTING_OPTIONS=y builds, though. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-06 04:18:10 -04:00
#ifdef CONFIG_TESTING_OPTIONS
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
else if (os_strcmp(settings->encr, "WEP") == 0)
cred.encr_type = WPS_ENCR_WEP;
WPS: Remove unused WEP related functionality Now that WPS 2.0 support is enabled unconditionally, WEP and Shared auth type are not allowed. This made some of the older code unused and that can now be removed to clean up the implementation. There is still one place where WEP is allowed for testing purposes: wpa_supplicant as Registrar trying to configure an AP to use WEP. That is now only allowed in CONFIG_TESTING_OPTIONS=y builds, though. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-06 04:18:10 -04:00
#endif /* CONFIG_TESTING_OPTIONS */
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
else if (os_strcmp(settings->encr, "TKIP") == 0)
cred.encr_type = WPS_ENCR_TKIP;
else if (os_strcmp(settings->encr, "CCMP") == 0)
cred.encr_type = WPS_ENCR_AES;
else
return -1;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
return wps_er_config(wpa_s->wps_er, use_uuid, use_addr,
(const u8 *) pin, os_strlen(pin), &cred);
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 17:01:48 -04:00
}
WPS ER: Add support for building NFC configuration token WPS_ER_NFC_CONFIG_TOKEN command can now be used to build a NFC configuration token based on AP Settings learnt with WPS_ER_LEARN or set with WPS_ER_CONFIG. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 09:35:51 -04:00
#ifdef CONFIG_WPS_NFC
struct wpabuf * wpas_wps_er_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef, const char *uuid)
{
struct wpabuf *ret;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS ER: Add support for building NFC configuration token WPS_ER_NFC_CONFIG_TOKEN command can now be used to build a NFC configuration token based on AP Settings learnt with WPS_ER_LEARN or set with WPS_ER_CONFIG. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 09:35:51 -04:00
if (!wpa_s->wps_er)
return NULL;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS ER: Add support for building NFC configuration token WPS_ER_NFC_CONFIG_TOKEN command can now be used to build a NFC configuration token based on AP Settings learnt with WPS_ER_LEARN or set with WPS_ER_CONFIG. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 09:35:51 -04:00
return NULL;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
ret = wps_er_nfc_config_token(wpa_s->wps_er, use_uuid, use_addr);
WPS ER: Add support for building NFC configuration token WPS_ER_NFC_CONFIG_TOKEN command can now be used to build a NFC configuration token based on AP Settings learnt with WPS_ER_LEARN or set with WPS_ER_CONFIG. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 09:35:51 -04:00
if (ndef && ret) {
struct wpabuf *tmp;
tmp = ndef_build_wifi(ret);
wpabuf_free(ret);
if (tmp == NULL)
return NULL;
ret = tmp;
}
return ret;
}
#endif /* CONFIG_WPS_NFC */
WPS ER: Stop eloop only on the last terminate_cb This allows all WPS ER instances to be cleaned up properly if more than one interface has an active WPS ER when wpa_supplicant is being killed.
2011-02-21 14:47:46 -05:00
static int callbacks_pending = 0;
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
static void wpas_wps_terminate_cb(void *ctx)
{
wpa_printf(MSG_DEBUG, "WPS ER: Terminated");
WPS ER: Stop eloop only on the last terminate_cb This allows all WPS ER instances to be cleaned up properly if more than one interface has an active WPS ER when wpa_supplicant is being killed.
2011-02-21 14:47:46 -05:00
if (--callbacks_pending <= 0)
eloop_terminate();
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
}
#endif /* CONFIG_WPS_ER */
int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_WPS_ER
if (wpa_s->wps_er) {
WPS ER: Stop eloop only on the last terminate_cb This allows all WPS ER instances to be cleaned up properly if more than one interface has an active WPS ER when wpa_supplicant is being killed.
2011-02-21 14:47:46 -05:00
callbacks_pending++;
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
wps_er_deinit(wpa_s->wps_er, wpas_wps_terminate_cb, wpa_s);
wpa_s->wps_er = NULL;
return 1;
}
WPS ER: Add PIN configuration and SetSelectedRegistrar call New PINs can now be added to WPS ER. This results in the ER code using SetSelectedRegistrar to modify AP state so that Enrollees will be able to notice the actice registrar more easily.
2009-11-13 15:07:11 -05:00
#endif /* CONFIG_WPS_ER */
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 16:47:54 -05:00
return 0;
}
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 16:50:13 -04:00
Allow ctrl_iface SET command to change global config parameters
2010-07-18 17:30:24 -04:00
void wpas_wps_update_config(struct wpa_supplicant *wpa_s)
{
struct wps_context *wps = wpa_s->wps;
if (wps == NULL)
return;
if (wpa_s->conf->changed_parameters & CFG_CHANGED_CONFIG_METHODS) {
wps->config_methods = wps_config_methods_str2bin(
wpa_s->conf->config_methods);
if ((wps->config_methods &
(WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) ==
(WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) {
wpa_printf(MSG_ERROR, "WPS: Both Label and Display "
"config methods are not allowed at the "
"same time");
wps->config_methods &= ~WPS_CONFIG_LABEL;
}
}
WPS: Add virtual flags in Config Methods for WPS 2.0 if needed This is a workaround for incorrect configuration (missing virtual/physical identifier for config methods) for WPS 2.0 to allow unmodified configuration from WPS 1.0 to be used while enforcing compliant WPS 2.0 values.
2010-10-16 05:57:47 -04:00
wps->config_methods = wps_fix_config_methods(wps->config_methods);
WPS: Update dev.config_methods in wps_update_config dev.config_methods was not updated when wps_update_config was called. This could lead to mismatching config methods between Probe Request and M1 packets. Add missing part for it.
2012-08-04 13:14:59 -04:00
wps->dev.config_methods = wps->config_methods;
Allow ctrl_iface SET command to change global config parameters
2010-07-18 17:30:24 -04:00
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 12:50:22 -04:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_TYPE)
os_memcpy(wps->dev.pri_dev_type, wpa_s->conf->device_type,
WPS_DEV_TYPE_LEN);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 17:30:24 -04:00
WPS: Add secondary device types into Probe Request frames The secondary device type list is an optional attribute in the WSC IE. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 05:09:49 -04:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_SEC_DEVICE_TYPE) {
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 12:50:22 -04:00
wps->dev.num_sec_dev_types = wpa_s->conf->num_sec_device_types;
os_memcpy(wps->dev.sec_dev_type, wpa_s->conf->sec_device_type,
wps->dev.num_sec_dev_types * WPS_DEV_TYPE_LEN);
WPS: Add secondary device types into Probe Request frames The secondary device type list is an optional attribute in the WSC IE. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 05:09:49 -04:00
}
WPS: Allow vendor specific attribute to be added into M1 wps_vendor_ext_m1 configuration parameter can now be used to add a vendor specific attribute into the WPS M1 message, e.g., for Windows Vertical Pairing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-03 17:08:57 -04:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_VENDOR_EXTENSION)
wpas_wps_set_vendor_ext_m1(wpa_s, wps);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 17:30:24 -04:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_OS_VERSION)
wps->dev.os_version = WPA_GET_BE32(wpa_s->conf->os_version);
WPS: Fix copying of UUID from the first interface Use the first interface (last in the list), not the last added interface. In addition, use the same routine to set the UUID after reconfiguration.
2011-03-17 12:07:00 -04:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_UUID)
wpas_wps_set_uuid(wpa_s, wps);
WPS: Fix configuration strings on config reload Previously, freed memory could be used as device name (and other similar parameters) when building WPS IE after SIGHUP.
2010-07-06 19:32:55 -04:00
Trigger WPS configuration update on string changes Previously, only Device Name string was handled, but similar trigger is needed on Manufacturer, Model Name, Model Number, and Serial Number changes.
2010-07-29 20:13:11 -04:00
if (wpa_s->conf->changed_parameters &
(CFG_CHANGED_DEVICE_NAME | CFG_CHANGED_WPS_STRING)) {
WPS: Fix configuration strings on config reload Previously, freed memory could be used as device name (and other similar parameters) when building WPS IE after SIGHUP.
2010-07-06 19:32:55 -04:00
/* Update pointers to make sure they refer current values */
wps->dev.device_name = wpa_s->conf->device_name;
wps->dev.manufacturer = wpa_s->conf->manufacturer;
wps->dev.model_name = wpa_s->conf->model_name;
wps->dev.model_number = wpa_s->conf->model_number;
wps->dev.serial_number = wpa_s->conf->serial_number;
}
Allow ctrl_iface SET command to change global config parameters
2010-07-18 17:30:24 -04:00
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
#ifdef CONFIG_WPS_NFC
WPS NFC: Allow configuration token to be built from network block "WPS_NFC_CONFIG_TOKEN <WPS/NDEF> <network id>" can now be used to build an NFC configuration token from a locally configured network. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 14:28:57 -04:00
#ifdef CONFIG_WPS_ER
static struct wpabuf *
wpas_wps_network_config_token(struct wpa_supplicant *wpa_s, int ndef,
struct wpa_ssid *ssid)
{
struct wpabuf *ret;
struct wps_credential cred;
if (wpas_wps_network_to_cred(ssid, &cred) < 0)
return NULL;
ret = wps_er_config_token_from_cred(wpa_s->wps, &cred);
if (ndef && ret) {
struct wpabuf *tmp;
tmp = ndef_build_wifi(ret);
wpabuf_free(ret);
if (tmp == NULL)
return NULL;
ret = tmp;
}
return ret;
}
#endif /* CONFIG_WPS_ER */
WPS: Add support for config token generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the NFC configuration token similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 04:45:29 -05:00
struct wpabuf * wpas_wps_nfc_config_token(struct wpa_supplicant *wpa_s,
WPS NFC: Allow configuration token to be built from network block "WPS_NFC_CONFIG_TOKEN <WPS/NDEF> <network id>" can now be used to build an NFC configuration token from a locally configured network. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 14:28:57 -04:00
int ndef, const char *id_str)
WPS: Add support for config token generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the NFC configuration token similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 04:45:29 -05:00
{
WPS NFC: Allow configuration token to be built from network block "WPS_NFC_CONFIG_TOKEN <WPS/NDEF> <network id>" can now be used to build an NFC configuration token from a locally configured network. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 14:28:57 -04:00
#ifdef CONFIG_WPS_ER
if (id_str) {
int id;
char *end = NULL;
struct wpa_ssid *ssid;
id = strtol(id_str, &end, 10);
if (end && *end)
return NULL;
ssid = wpa_config_get_network(wpa_s->conf, id);
if (ssid == NULL)
return NULL;
return wpas_wps_network_config_token(wpa_s, ndef, ssid);
}
#endif /* CONFIG_WPS_ER */
WPS: Add support for config token generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the NFC configuration token similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 04:45:29 -05:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface)
return wpas_ap_wps_nfc_config_token(wpa_s, ndef);
#endif /* CONFIG_AP */
return NULL;
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
struct wpabuf * wpas_wps_nfc_token(struct wpa_supplicant *wpa_s, int ndef)
{
WPS: Use pre-configured NFC password token instead of overriding it "WPS_NFC_TOKEN <WPS/NDEF>" used to generate a new NFC password token regardless of whether there was a pre-configured token in the configuration. Change this to use the pre-configured value, if available, instead. This allows the same command to be used to write the password token to an NFC tag more conveniently. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 04:24:29 -05:00
if (wpa_s->conf->wps_nfc_pw_from_config) {
return wps_nfc_token_build(ndef,
wpa_s->conf->wps_nfc_dev_pw_id,
wpa_s->conf->wps_nfc_dh_pubkey,
wpa_s->conf->wps_nfc_dev_pw);
}
WPS: Share a single function for generating NFS password tokens There is no need for both hostapd and wpa_supplicant to have their own functions for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 13:54:53 -04:00
return wps_nfc_token_gen(ndef, &wpa_s->conf->wps_nfc_dev_pw_id,
&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey,
&wpa_s->conf->wps_nfc_dev_pw);
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
int wpas_wps_start_nfc(struct wpa_supplicant *wpa_s, const u8 *go_dev_addr,
const u8 *bssid,
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
const struct wpabuf *dev_pw, u16 dev_pw_id,
WPS: Preparations for allowing SSID filtering for provisioning step If the SSID of the WPS AP is known, it should be possible to limit AP selection based on this when searching for an active WPS AP. This commit adds a mechanism to specify SSID for this type of uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:29:23 -04:00
int p2p_group, const u8 *peer_pubkey_hash,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
const u8 *ssid, size_t ssid_len, int freq)
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
{
struct wps_context *wps = wpa_s->wps;
char pw[32 * 2 + 1];
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
if (dev_pw_id != DEV_PW_NFC_CONNECTION_HANDOVER && dev_pw == NULL) {
WPS NFC: Validate peer public key hash on Enrollee Since the Enrollee can now get the public key hash from the Registrar, there is need to validate this during the WPS protocol run. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 14:29:22 -05:00
dev_pw = wpa_s->conf->wps_nfc_dev_pw;
dev_pw_id = wpa_s->conf->wps_nfc_dev_pw_id;
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL ||
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
wpa_s->conf->wps_nfc_dh_privkey == NULL) {
wpa_printf(MSG_DEBUG, "WPS: Missing DH params - "
"cannot start NFC-triggered connection");
return -1;
}
if (dev_pw_id != DEV_PW_NFC_CONNECTION_HANDOVER && dev_pw == NULL) {
wpa_printf(MSG_DEBUG, "WPS: Missing Device Password (id=%u) - "
"cannot start NFC-triggered connection", dev_pw_id);
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
return -1;
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
dh5_free(wps->dh_ctx);
wpabuf_free(wps->dh_pubkey);
wpabuf_free(wps->dh_privkey);
wps->dh_privkey = wpabuf_dup(wpa_s->conf->wps_nfc_dh_privkey);
wps->dh_pubkey = wpabuf_dup(wpa_s->conf->wps_nfc_dh_pubkey);
if (wps->dh_privkey == NULL || wps->dh_pubkey == NULL) {
wps->dh_ctx = NULL;
wpabuf_free(wps->dh_pubkey);
wps->dh_pubkey = NULL;
wpabuf_free(wps->dh_privkey);
wps->dh_privkey = NULL;
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
wpa_printf(MSG_DEBUG, "WPS: Failed to get DH priv/pub key");
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
return -1;
}
wps->dh_ctx = dh5_init_fixed(wps->dh_privkey, wps->dh_pubkey);
WPS: Be more careful with pre-configured DH parameters Make the implementation more robust against error cases with pre-configured DH parameters. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 12:27:32 -04:00
if (wps->dh_ctx == NULL) {
wpabuf_free(wps->dh_pubkey);
wps->dh_pubkey = NULL;
wpabuf_free(wps->dh_privkey);
wps->dh_privkey = NULL;
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
wpa_printf(MSG_DEBUG, "WPS: Failed to initialize DH context");
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
return -1;
WPS: Be more careful with pre-configured DH parameters Make the implementation more robust against error cases with pre-configured DH parameters. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 12:27:32 -04:00
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
if (dev_pw) {
wpa_snprintf_hex_uppercase(pw, sizeof(pw),
wpabuf_head(dev_pw),
wpabuf_len(dev_pw));
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-07 18:44:29 -04:00
return wpas_wps_start_dev_pw(wpa_s, go_dev_addr, bssid,
dev_pw ? pw : NULL,
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
p2p_group, dev_pw_id, peer_pubkey_hash,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
ssid, ssid_len, freq);
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
}
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
static int wpas_wps_use_cred(struct wpa_supplicant *wpa_s,
struct wps_parse_attr *attr)
{
WPS NFC: Connect using learnt credential after NFC Tag read Instead of just adding the new network, prefer the network learnt from a configuration token during the first connection attempt. This makes the WPS NFC case behave similarly to the in-band provisioning cases if there are more preferred networks in the scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-15 09:46:45 -04:00
/*
* Disable existing networks temporarily to allow the newly learned
* credential to be preferred. Enable the temporarily disabled networks
* after 10 seconds.
*/
wpas_wps_temp_disable(wpa_s, NULL);
eloop_register_timeout(10, 0, wpas_wps_reenable_networks_cb, wpa_s,
NULL);
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
if (wps_oob_use_cred(wpa_s->wps, attr) < 0)
return -1;
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED)
return 0;
WPS: Remove unused Credential AP Channel processing Commit bd3a3737672aaf6eb50dba2b8caa3941c8df42e9 added a mechanism to use AP Channel attribute from within a Credential attribute to optimize scans. However, this design is not actually used with the WPS NFC use cases. With configuration token, the AP Channel attribute is in the same container with the Credential attribute (and that was also handled in the previous implementation). With connection handover, AP Channel information is outside the Credential attribute as well. Simplify implementation by removing the AP Channel within Credential case. This allows wpas_wps_use_cred() to get the AP Channel from the container instead of having to find this during credential iteration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-03 03:54:21 -05:00
if (attr->ap_channel) {
u16 chan = WPA_GET_BE16(attr->ap_channel);
WPS: Use AP Channel attribute in credential to speed up scan When WPS is used with NFC connection handover, the AP may indicate its operating channel within the credential information. Use this informatiom, if present, to speed up the scan process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 12:02:04 -04:00
int freq = 0;
if (chan >= 1 && chan <= 13)
freq = 2407 + 5 * chan;
else if (chan == 14)
freq = 2484;
else if (chan >= 30)
freq = 5000 + 5 * chan;
if (freq) {
WPS: Remove unused Credential AP Channel processing Commit bd3a3737672aaf6eb50dba2b8caa3941c8df42e9 added a mechanism to use AP Channel attribute from within a Credential attribute to optimize scans. However, this design is not actually used with the WPS NFC use cases. With configuration token, the AP Channel attribute is in the same container with the Credential attribute (and that was also handled in the previous implementation). With connection handover, AP Channel information is outside the Credential attribute as well. Simplify implementation by removing the AP Channel within Credential case. This allows wpas_wps_use_cred() to get the AP Channel from the container instead of having to find this during credential iteration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-03 03:54:21 -05:00
wpa_printf(MSG_DEBUG, "WPS: Credential container indicated AP channel %u -> %u MHz",
chan, freq);
WPS: Use AP Channel attribute in credential to speed up scan When WPS is used with NFC connection handover, the AP may indicate its operating channel within the credential information. Use this informatiom, if present, to speed up the scan process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 12:02:04 -04:00
wpa_s->after_wps = 5;
wpa_s->wps_freq = freq;
}
}
WPS: Remove unused Credential AP Channel processing Commit bd3a3737672aaf6eb50dba2b8caa3941c8df42e9 added a mechanism to use AP Channel attribute from within a Credential attribute to optimize scans. However, this design is not actually used with the WPS NFC use cases. With configuration token, the AP Channel attribute is in the same container with the Credential attribute (and that was also handled in the previous implementation). With connection handover, AP Channel information is outside the Credential attribute as well. Simplify implementation by removing the AP Channel within Credential case. This allows wpas_wps_use_cred() to get the AP Channel from the container instead of having to find this during credential iteration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-03 03:54:21 -05:00
wpa_printf(MSG_DEBUG, "WPS: Request reconnection with new network "
"based on the received credential added");
wpa_s->normal_scans = 0;
wpa_supplicant_reinit_autoscan(wpa_s);
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
WPS NFC: Cancel scheduled scan before attempting a scan Cancel scheduled scan (if any) before attempting to scan for the newly received configuration/credential in WPS NFC Config token case. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-10-14 13:42:27 -04:00
wpa_supplicant_cancel_sched_scan(wpa_s);
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
return 0;
}
Remove unused function warning in WPS NFC case When I use CONFIG_WPS_NFC=y a warning appears. wps_supplicant.c:1872:12: warning: 'wpas_wps_add_nfc_password_token' defined but not used [-Wunused-function] This patch removes this warning. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-09-16 01:02:09 -04:00
#ifdef CONFIG_WPS_ER
WPS ER: Add support for using NFC password token from an Enrollee WPS_NFC_TAG_READ ctrl_iface command can now be used to add NFC password tokens to ER. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 10:34:46 -04:00
static int wpas_wps_add_nfc_password_token(struct wpa_supplicant *wpa_s,
struct wps_parse_attr *attr)
{
return wps_registrar_add_nfc_password_token(
wpa_s->wps->registrar, attr->oob_dev_password,
attr->oob_dev_password_len);
}
Remove unused function warning in WPS NFC case When I use CONFIG_WPS_NFC=y a warning appears. wps_supplicant.c:1872:12: warning: 'wpas_wps_add_nfc_password_token' defined but not used [-Wunused-function] This patch removes this warning. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-09-16 01:02:09 -04:00
#endif /* CONFIG_WPS_ER */
WPS ER: Add support for using NFC password token from an Enrollee WPS_NFC_TAG_READ ctrl_iface command can now be used to add NFC password tokens to ER. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 10:34:46 -04:00
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
static int wpas_wps_nfc_tag_process(struct wpa_supplicant *wpa_s,
const struct wpabuf *wps)
{
struct wps_parse_attr attr;
wpa_hexdump_buf(MSG_DEBUG, "WPS: Received NFC tag payload", wps);
if (wps_parse_msg(wps, &attr)) {
wpa_printf(MSG_DEBUG, "WPS: Ignore invalid data from NFC tag");
return -1;
}
if (attr.num_cred)
return wpas_wps_use_cred(wpa_s, &attr);
WPS ER: Add support for using NFC password token from an Enrollee WPS_NFC_TAG_READ ctrl_iface command can now be used to add NFC password tokens to ER. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 10:34:46 -04:00
#ifdef CONFIG_WPS_ER
if (attr.oob_dev_password)
return wpas_wps_add_nfc_password_token(wpa_s, &attr);
#endif /* CONFIG_WPS_ER */
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
wpa_printf(MSG_DEBUG, "WPS: Ignore unrecognized NFC tag");
return -1;
}
int wpas_wps_nfc_tag_read(struct wpa_supplicant *wpa_s,
P2P NFC: Add support for freq option in NFC ctrl_iface commands This can be used to force an operating channel for P2P group formation triggered by NFC operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-03 22:44:56 -05:00
const struct wpabuf *data, int forced_freq)
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
{
const struct wpabuf *wps = data;
struct wpabuf *tmp = NULL;
int ret;
if (wpabuf_len(data) < 4)
return -1;
if (*wpabuf_head_u8(data) != 0x10) {
/* Assume this contains full NDEF record */
tmp = ndef_parse_wifi(data);
if (tmp == NULL) {
P2P NFC: Report handover select from tag for static handover WPS_NFC_TAG_READ can be used to report static connection handover where the connection handover select message was read from an NFC tag. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 11:38:41 -04:00
#ifdef CONFIG_P2P
tmp = ndef_parse_p2p(data);
if (tmp) {
P2P NFC: Add support for freq option in NFC ctrl_iface commands This can be used to force an operating channel for P2P group formation triggered by NFC operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-03 22:44:56 -05:00
ret = wpas_p2p_nfc_tag_process(wpa_s, tmp,
forced_freq);
P2P NFC: Report handover select from tag for static handover WPS_NFC_TAG_READ can be used to report static connection handover where the connection handover select message was read from an NFC tag. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 11:38:41 -04:00
wpabuf_free(tmp);
return ret;
}
#endif /* CONFIG_P2P */
WPS: Add support for NFC configuration token from external program The new wpa_supplicant ctrl_iface command WPS_NFC_TAG_READ can now be used to process NFC tags read by external programs to initiate wpa_supplicant to use NFC Configuration Token to create a new network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-28 06:59:29 -04:00
wpa_printf(MSG_DEBUG, "WPS: Could not parse NDEF");
return -1;
}
wps = tmp;
}
ret = wpas_wps_nfc_tag_process(wpa_s, wps);
wpabuf_free(tmp);
return ret;
}
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
WPS NFC: Build new style carrier record for connection handover request It is more useful to be able to build a single NFC carrier record instead of the full connection handover request message to allow external components to decide whether to negotiate which alternative carrier is used. This updates the carrier record contents to the new design to include Enrollee public key hash and provides this as a carrier record instead of full message. An external program is expected to be used to build the full NFC connection handover message with potentially other alternative carrier records included. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
struct wpabuf * wpas_wps_nfc_handover_req(struct wpa_supplicant *wpa_s,
int ndef)
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
{
WPS NFC: Build new style carrier record for connection handover request It is more useful to be able to build a single NFC carrier record instead of the full connection handover request message to allow external components to decide whether to negotiate which alternative carrier is used. This updates the carrier record contents to the new design to include Enrollee public key hash and provides this as a carrier record instead of full message. An external program is expected to be used to build the full NFC connection handover message with potentially other alternative carrier records included. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
struct wpabuf *ret;
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL &&
wps_nfc_gen_dh(&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey) < 0)
return NULL;
ret = wps_build_nfc_handover_req(wpa_s->wps,
wpa_s->conf->wps_nfc_dh_pubkey);
if (ndef && ret) {
struct wpabuf *tmp;
tmp = ndef_build_wifi(ret);
wpabuf_free(ret);
if (tmp == NULL)
return NULL;
ret = tmp;
}
return ret;
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
}
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
#ifdef CONFIG_WPS_NFC
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
Mark wpas_wps_er_nfc_handover_sel() static This is not used outside wps_supplicant.c. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-31 12:37:15 -05:00
static struct wpabuf *
wpas_wps_er_nfc_handover_sel(struct wpa_supplicant *wpa_s, int ndef,
const char *uuid)
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
{
WPS NFC: Fix build without CONFIG_WPS_ER Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-12 18:01:32 -04:00
#ifdef CONFIG_WPS_ER
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
struct wpabuf *ret;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
u8 u[UUID_LEN], *use_uuid = NULL;
u8 addr[ETH_ALEN], *use_addr = NULL;
WPS NFC: Update DH keys for ER operations Since wpa_s->conf->wps_nfc_dh_* parameters can be set in number of code paths, update the wps_context copy of the DH keys even if no new keys were generated for the request. This tries to avoid some cases where public key hash may not have matched the public key used in the ER operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 09:33:05 -04:00
struct wps_context *wps = wpa_s->wps;
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
WPS NFC: Update DH keys for ER operations Since wpa_s->conf->wps_nfc_dh_* parameters can be set in number of code paths, update the wps_context copy of the DH keys even if no new keys were generated for the request. This tries to avoid some cases where public key hash may not have matched the public key used in the ER operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 09:33:05 -04:00
if (wps == NULL)
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
return NULL;
WPS ER: Allow AP to be specified with BSSID This extends the WPS ER commands that previously accepted only UUID as an identifier for an AP to use either UUID or BSSID for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 13:32:09 -04:00
if (uuid == NULL)
return NULL;
if (uuid_str2bin(uuid, u) == 0)
use_uuid = u;
else if (hwaddr_aton(uuid, addr) == 0)
use_addr = addr;
else
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
return NULL;
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL) {
if (wps_nfc_gen_dh(&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey) < 0)
return NULL;
WPS NFC: Update DH keys for ER operations Since wpa_s->conf->wps_nfc_dh_* parameters can be set in number of code paths, update the wps_context copy of the DH keys even if no new keys were generated for the request. This tries to avoid some cases where public key hash may not have matched the public key used in the ER operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 09:33:05 -04:00
}
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
WPS NFC: Update DH keys for ER operations Since wpa_s->conf->wps_nfc_dh_* parameters can be set in number of code paths, update the wps_context copy of the DH keys even if no new keys were generated for the request. This tries to avoid some cases where public key hash may not have matched the public key used in the ER operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 09:33:05 -04:00
wpas_wps_nfc_clear(wps);
wps->ap_nfc_dev_pw_id = DEV_PW_NFC_CONNECTION_HANDOVER;
wps->ap_nfc_dh_pubkey = wpabuf_dup(wpa_s->conf->wps_nfc_dh_pubkey);
wps->ap_nfc_dh_privkey = wpabuf_dup(wpa_s->conf->wps_nfc_dh_privkey);
if (!wps->ap_nfc_dh_pubkey || !wps->ap_nfc_dh_privkey) {
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
wpas_wps_nfc_clear(wps);
WPS NFC: Update DH keys for ER operations Since wpa_s->conf->wps_nfc_dh_* parameters can be set in number of code paths, update the wps_context copy of the DH keys even if no new keys were generated for the request. This tries to avoid some cases where public key hash may not have matched the public key used in the ER operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 09:33:05 -04:00
return NULL;
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
}
ret = wps_er_nfc_handover_sel(wpa_s->wps_er, wpa_s->wps, use_uuid,
use_addr, wpa_s->conf->wps_nfc_dh_pubkey);
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
if (ndef && ret) {
struct wpabuf *tmp;
tmp = ndef_build_wifi(ret);
wpabuf_free(ret);
if (tmp == NULL)
return NULL;
ret = tmp;
}
return ret;
WPS NFC: Fix build without CONFIG_WPS_ER Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-12 18:01:32 -04:00
#else /* CONFIG_WPS_ER */
return NULL;
#endif /* CONFIG_WPS_ER */
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
}
#endif /* CONFIG_WPS_NFC */
WPS: Add support for NFC handover select generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the alternative carrier record for NFC connection handover select message similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 05:34:55 -05:00
struct wpabuf * wpas_wps_nfc_handover_sel(struct wpa_supplicant *wpa_s,
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
int ndef, int cr, const char *uuid)
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
{
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
struct wpabuf *ret;
WPS: Add support for NFC handover select generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the alternative carrier record for NFC connection handover select message similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 05:34:55 -05:00
if (!cr)
return NULL;
WPS NFC: Add connection handover support for ER wpa_supplicant can now generate the WPS carrier record for connection handover response when acting as an ER. The AP whose configuration is provided in this way is identified with an UUID as an argument to wps-nfc.py. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-24 03:56:29 -05:00
ret = wpas_ap_wps_nfc_handover_sel(wpa_s, ndef);
if (ret)
return ret;
return wpas_wps_er_nfc_handover_sel(wpa_s, ndef, uuid);
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
}
WPS NFC: Remove NFC_RX_HANDOVER_SEL The newer NFC_REPORT_HANDOVER command is more general version that handles the cases where NFC_RX_HANDOVER_SEL could potentially have been used. In addition, with the new WPS NFC design, it is important to receive the handover request message that was used in the handover in addition to the select message, so the NFC_RX_HANDOVER_SEL command on its own would not be sufficient for this. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-06 09:42:27 -04:00
static int wpas_wps_nfc_rx_handover_sel(struct wpa_supplicant *wpa_s,
const struct wpabuf *data)
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
{
struct wpabuf *wps;
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
int ret = -1;
u16 wsc_len;
const u8 *pos;
struct wpabuf msg;
struct wps_parse_attr attr;
u16 dev_pw_id;
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
const u8 *bssid = NULL;
int freq = 0;
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
wps = ndef_parse_wifi(data);
if (wps == NULL)
return -1;
wpa_printf(MSG_DEBUG, "WPS: Received application/vnd.wfa.wsc "
"payload from NFC connection handover");
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
wpa_hexdump_buf(MSG_DEBUG, "WPS: NFC payload", wps);
if (wpabuf_len(wps) < 2) {
wpa_printf(MSG_DEBUG, "WPS: Too short Wi-Fi Handover Select "
"Message");
goto out;
}
pos = wpabuf_head(wps);
wsc_len = WPA_GET_BE16(pos);
if (wsc_len > wpabuf_len(wps) - 2) {
wpa_printf(MSG_DEBUG, "WPS: Invalid WSC attribute length (%u) "
"in Wi-Fi Handover Select Message", wsc_len);
goto out;
}
pos += 2;
wpa_hexdump(MSG_DEBUG,
"WPS: WSC attributes in Wi-Fi Handover Select Message",
pos, wsc_len);
if (wsc_len < wpabuf_len(wps) - 2) {
wpa_hexdump(MSG_DEBUG,
"WPS: Ignore extra data after WSC attributes",
pos + wsc_len, wpabuf_len(wps) - 2 - wsc_len);
}
wpabuf_set(&msg, pos, wsc_len);
ret = wps_parse_msg(&msg, &attr);
if (ret < 0) {
wpa_printf(MSG_DEBUG, "WPS: Could not parse WSC attributes in "
"Wi-Fi Handover Select Message");
goto out;
}
if (attr.oob_dev_password == NULL ||
attr.oob_dev_password_len < WPS_OOB_PUBKEY_HASH_LEN + 2) {
wpa_printf(MSG_DEBUG, "WPS: No Out-of-Band Device Password "
"included in Wi-Fi Handover Select Message");
ret = -1;
goto out;
}
if (attr.ssid == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No SSID included in Wi-Fi Handover "
"Select Message");
ret = -1;
goto out;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: SSID", attr.ssid, attr.ssid_len);
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
if (attr.mac_addr) {
bssid = attr.mac_addr;
wpa_printf(MSG_DEBUG, "WPS: MAC Address (BSSID): " MACSTR,
MAC2STR(bssid));
}
if (attr.rf_bands)
wpa_printf(MSG_DEBUG, "WPS: RF Bands: %d", *attr.rf_bands);
if (attr.ap_channel) {
u16 chan = WPA_GET_BE16(attr.ap_channel);
wpa_printf(MSG_DEBUG, "WPS: AP Channel: %d", chan);
if (chan >= 1 && chan <= 13 &&
(attr.rf_bands == NULL || *attr.rf_bands & WPS_RF_24GHZ))
freq = 2407 + 5 * chan;
else if (chan == 14 &&
(attr.rf_bands == NULL ||
*attr.rf_bands & WPS_RF_24GHZ))
freq = 2484;
else if (chan >= 30 &&
(attr.rf_bands == NULL ||
*attr.rf_bands & WPS_RF_50GHZ))
freq = 5000 + 5 * chan;
if (freq) {
wpa_printf(MSG_DEBUG,
"WPS: AP indicated channel %u -> %u MHz",
chan, freq);
}
}
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
wpa_hexdump(MSG_DEBUG, "WPS: Out-of-Band Device Password",
attr.oob_dev_password, attr.oob_dev_password_len);
dev_pw_id = WPA_GET_BE16(attr.oob_dev_password +
WPS_OOB_PUBKEY_HASH_LEN);
if (dev_pw_id != DEV_PW_NFC_CONNECTION_HANDOVER) {
wpa_printf(MSG_DEBUG, "WPS: Unexpected OOB Device Password ID "
"%u in Wi-Fi Handover Select Message", dev_pw_id);
ret = -1;
goto out;
}
wpa_hexdump(MSG_DEBUG, "WPS: AP Public Key hash",
attr.oob_dev_password, WPS_OOB_PUBKEY_HASH_LEN);
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
ret = wpas_wps_start_nfc(wpa_s, NULL, bssid, NULL, dev_pw_id, 0,
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
attr.oob_dev_password,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 10:48:35 -05:00
attr.ssid, attr.ssid_len, freq);
WPS NFC: Process new style handover select The new WPS connection handover select includes Registrar public key hash instead of credential. Use the new information to start abbreviated WPS handshake instead of configuring a new network directly from the old Credential-from-NFC design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-02 11:30:58 -04:00
out:
WPS: Add preliminary NFC connection handover support for Enrollee This commit adds new wpa_supplicant ctrl_iface commands to allow external programs to go through NFC connection handover mechanism with wpa_supplicant taking care of the WPS processing. This version includes only the case where wpa_supplicant is operating as a station/Enrollee. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 11:39:46 -04:00
wpabuf_free(wps);
return ret;
}
WPS: Report NFC connection handover completion differently Instead of reporting only one connection handover message, report completion of NFC connection handover with carrier record from both the request and select messages. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-11 11:43:46 -05:00
int wpas_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
const struct wpabuf *req,
const struct wpabuf *sel)
{
wpa_printf(MSG_DEBUG, "NFC: WPS connection handover reported");
wpa_hexdump_buf_key(MSG_DEBUG, "WPS: Carrier record in request", req);
wpa_hexdump_buf_key(MSG_DEBUG, "WPS: Carrier record in select", sel);
return wpas_wps_nfc_rx_handover_sel(wpa_s, sel);
}
NFC: Update WPS ER to use the new connection handover design Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-12 00:37:41 -04:00
int wpas_er_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
const struct wpabuf *req,
const struct wpabuf *sel)
{
struct wpabuf *wps;
int ret = -1;
u16 wsc_len;
const u8 *pos;
struct wpabuf msg;
struct wps_parse_attr attr;
u16 dev_pw_id;
/*
* Enrollee/station is always initiator of the NFC connection handover,
* so use the request message here to find Enrollee public key hash.
*/
wps = ndef_parse_wifi(req);
if (wps == NULL)
return -1;
wpa_printf(MSG_DEBUG, "WPS: Received application/vnd.wfa.wsc "
"payload from NFC connection handover");
wpa_hexdump_buf(MSG_DEBUG, "WPS: NFC payload", wps);
if (wpabuf_len(wps) < 2) {
wpa_printf(MSG_DEBUG, "WPS: Too short Wi-Fi Handover Request "
"Message");
goto out;
}
pos = wpabuf_head(wps);
wsc_len = WPA_GET_BE16(pos);
if (wsc_len > wpabuf_len(wps) - 2) {
wpa_printf(MSG_DEBUG, "WPS: Invalid WSC attribute length (%u) "
"in rt Wi-Fi Handover Request Message", wsc_len);
goto out;
}
pos += 2;
wpa_hexdump(MSG_DEBUG,
"WPS: WSC attributes in Wi-Fi Handover Request Message",
pos, wsc_len);
if (wsc_len < wpabuf_len(wps) - 2) {
wpa_hexdump(MSG_DEBUG,
"WPS: Ignore extra data after WSC attributes",
pos + wsc_len, wpabuf_len(wps) - 2 - wsc_len);
}
wpabuf_set(&msg, pos, wsc_len);
ret = wps_parse_msg(&msg, &attr);
if (ret < 0) {
wpa_printf(MSG_DEBUG, "WPS: Could not parse WSC attributes in "
"Wi-Fi Handover Request Message");
goto out;
}
if (attr.oob_dev_password == NULL ||
attr.oob_dev_password_len < WPS_OOB_PUBKEY_HASH_LEN + 2) {
wpa_printf(MSG_DEBUG, "WPS: No Out-of-Band Device Password "
"included in Wi-Fi Handover Request Message");
ret = -1;
goto out;
}
if (attr.uuid_e == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No UUID-E included in Wi-Fi "
"Handover Request Message");
ret = -1;
goto out;
}
wpa_hexdump(MSG_DEBUG, "WPS: UUID-E", attr.uuid_e, WPS_UUID_LEN);
wpa_hexdump(MSG_DEBUG, "WPS: Out-of-Band Device Password",
attr.oob_dev_password, attr.oob_dev_password_len);
dev_pw_id = WPA_GET_BE16(attr.oob_dev_password +
WPS_OOB_PUBKEY_HASH_LEN);
if (dev_pw_id != DEV_PW_NFC_CONNECTION_HANDOVER) {
wpa_printf(MSG_DEBUG, "WPS: Unexpected OOB Device Password ID "
"%u in Wi-Fi Handover Request Message", dev_pw_id);
ret = -1;
goto out;
}
wpa_hexdump(MSG_DEBUG, "WPS: Enrollee Public Key hash",
attr.oob_dev_password, WPS_OOB_PUBKEY_HASH_LEN);
ret = wps_registrar_add_nfc_pw_token(wpa_s->wps->registrar,
attr.oob_dev_password,
DEV_PW_NFC_CONNECTION_HANDOVER,
NULL, 0, 1);
out:
wpabuf_free(wps);
return ret;
}
WPS: Add new mechanism for NFC config method using password token Instead of requiring low-level access to an NFC device and synchronous operations, the new WPS_NFC_TOKEN and WPS_NFC ctrl_iface commands can be used to build a NFC password token and initiate WPS protocol run using that token (or pre-configured values) as separate commands. The WPS_NFC_TOKEN output can be written to a NFC tag using an external program, i.e., wpa_supplicant does not need to have low-level code for NFC operations for this. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-27 11:56:41 -04:00
#endif /* CONFIG_WPS_NFC */
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
static void wpas_wps_dump_ap_info(struct wpa_supplicant *wpa_s)
{
size_t i;
WPS: Use monotonic time for AP connection attempt This is only used for a debug message, but that message prints the time since the last attempt, so it should use monotonic time instead of wall clock. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 15:08:43 -05:00
struct os_reltime now;
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
if (wpa_debug_level > MSG_DEBUG)
return;
if (wpa_s->wps_ap == NULL)
return;
WPS: Use monotonic time for AP connection attempt This is only used for a debug message, but that message prints the time since the last attempt, so it should use monotonic time instead of wall clock. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 15:08:43 -05:00
os_get_reltime(&now);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
for (i = 0; i < wpa_s->num_wps_ap; i++) {
struct wps_ap_info *ap = &wpa_s->wps_ap[i];
struct wpa_blacklist *e = wpa_blacklist_get(wpa_s, ap->bssid);
wpa_printf(MSG_DEBUG, "WPS: AP[%d] " MACSTR " type=%d "
"tries=%d last_attempt=%d sec ago blacklist=%d",
(int) i, MAC2STR(ap->bssid), ap->type, ap->tries,
ap->last_attempt.sec > 0 ?
(int) now.sec - (int) ap->last_attempt.sec : -1,
e ? e->count : 0);
}
}
static struct wps_ap_info * wpas_wps_get_ap_info(struct wpa_supplicant *wpa_s,
const u8 *bssid)
{
size_t i;
if (wpa_s->wps_ap == NULL)
return NULL;
for (i = 0; i < wpa_s->num_wps_ap; i++) {
struct wps_ap_info *ap = &wpa_s->wps_ap[i];
if (os_memcmp(ap->bssid, bssid, ETH_ALEN) == 0)
return ap;
}
return NULL;
}
static void wpas_wps_update_ap_info_bss(struct wpa_supplicant *wpa_s,
struct wpa_scan_res *res)
{
struct wpabuf *wps;
enum wps_ap_info_type type;
struct wps_ap_info *ap;
int r;
if (wpa_scan_get_vendor_ie(res, WPS_IE_VENDOR_TYPE) == NULL)
return;
wps = wpa_scan_get_vendor_ie_multi(res, WPS_IE_VENDOR_TYPE);
if (wps == NULL)
return;
r = wps_is_addr_authorized(wps, wpa_s->own_addr, 1);
if (r == 2)
type = WPS_AP_SEL_REG_OUR;
else if (r == 1)
type = WPS_AP_SEL_REG;
else
type = WPS_AP_NOT_SEL_REG;
wpabuf_free(wps);
ap = wpas_wps_get_ap_info(wpa_s, res->bssid);
if (ap) {
if (ap->type != type) {
wpa_printf(MSG_DEBUG, "WPS: AP " MACSTR
" changed type %d -> %d",
MAC2STR(res->bssid), ap->type, type);
ap->type = type;
WPS: Allow AP that becomes active be tried immediately Clear the possible blacklisting of a WPS AP during WPS PIN iteration if the AP moves to selected registrar TRUE state or if it adds our MAC address to the list of authorized MACs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:51:35 -04:00
if (type != WPS_AP_NOT_SEL_REG)
wpa_blacklist_del(wpa_s, ap->bssid);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
}
return;
}
ap = os_realloc_array(wpa_s->wps_ap, wpa_s->num_wps_ap + 1,
sizeof(struct wps_ap_info));
if (ap == NULL)
return;
wpa_s->wps_ap = ap;
ap = &wpa_s->wps_ap[wpa_s->num_wps_ap];
wpa_s->num_wps_ap++;
os_memset(ap, 0, sizeof(*ap));
os_memcpy(ap->bssid, res->bssid, ETH_ALEN);
ap->type = type;
wpa_printf(MSG_DEBUG, "WPS: AP " MACSTR " type %d added",
MAC2STR(ap->bssid), ap->type);
}
void wpas_wps_update_ap_info(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
size_t i;
for (i = 0; i < scan_res->num; i++)
wpas_wps_update_ap_info_bss(wpa_s, scan_res->res[i]);
wpas_wps_dump_ap_info(wpa_s);
}
void wpas_wps_notify_assoc(struct wpa_supplicant *wpa_s, const u8 *bssid)
{
struct wps_ap_info *ap;
WPS: Clear after_wps from number of new locations This makes it less likely to forget WPS single-channel scan optimization in effect after having completed the WPS operation or in case WPS operating gets cancelled. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 14:34:39 -04:00
wpa_s->after_wps = 0;
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
if (!wpa_s->wps_ap_iter)
return;
ap = wpas_wps_get_ap_info(wpa_s, bssid);
if (ap == NULL)
return;
ap->tries++;
WPS: Use monotonic time for AP connection attempt This is only used for a debug message, but that message prints the time since the last attempt, so it should use monotonic time instead of wall clock. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 15:08:43 -05:00
os_get_reltime(&ap->last_attempt);
WPS: Maintain more AP state during WPS PIN iteration Maintain state of WPS APs during iteration to find the correct AP for WPS PIN operation when no specific BSSID is specified. This information can be used for optimizing the order in which the APs are tried. This commit is only adding the collection of the information and more detailed debug information to make debug logs more helpful in figuring out how the AP selection order could be improved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 06:48:11 -04:00
}
Reference in New Issue Copy Permalink