diff options
| author | Jouni Malinen <j@w1.fi> | 2012-06-28 19:43:29 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-06-28 19:43:29 +0300 |
| commit | ffdaa05a6b1b59c4b2e50f9b7fef82769fc2d3fe (patch) | |
| tree | 6929645e340769e4acfd2b56fd165abc75ce1ccb /src/wps | |
| parent | e484e927a6754557599d07b84944a748e77ef85c (diff) | |
| download | external_wpa_supplicant_8_ti-ffdaa05a6b1b59c4b2e50f9b7fef82769fc2d3fe.zip external_wpa_supplicant_8_ti-ffdaa05a6b1b59c4b2e50f9b7fef82769fc2d3fe.tar.gz external_wpa_supplicant_8_ti-ffdaa05a6b1b59c4b2e50f9b7fef82769fc2d3fe.tar.bz2 | |
WPS: Add support for NCF password token from AP
The new hostapd ctrl_iface command WPS_NFC_TOKEN can now be used to
manage AP-as-Enrollee operations with NFC password token. WPS/NDEF
parameters to this command can be used to generate a new NFC password
token. enable/disable parameters can be used to enable/disable use of
NFC password token (instead of AP PIN) for external Registrars.
A preconfigured NFS password token can be used by providing its
parameters with new hostapd.conf fields wps_nfc_dev_pw_id,
wps_nfc_dh_pubkey, wps_nfc_dh_privkey, and wps_nfc_dev_pw. This use
will also depend on WPS_NFC_TOKEN enable/disable commands, i.e., the
configured NFS password token is disabled by default.
Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/wps')
| -rw-r--r-- | src/wps/wps.c | 17 | ||||
| -rw-r--r-- | src/wps/wps.h | 5 | ||||
| -rw-r--r-- | src/wps/wps_attr_build.c | 8 |
3 files changed, 30 insertions, 0 deletions
diff --git a/src/wps/wps.c b/src/wps/wps.c index 26542a0..5453962 100644 --- a/src/wps/wps.c +++ b/src/wps/wps.c @@ -56,6 +56,23 @@ struct wps_data * wps_init(const struct wps_config *cfg) data->dev_password_len = cfg->pin_len; } +#ifdef CONFIG_WPS_NFC + if (cfg->wps->ap && !cfg->registrar && cfg->wps->ap_nfc_dev_pw_id) { + data->dev_pw_id = cfg->wps->ap_nfc_dev_pw_id; + os_free(data->dev_password); + data->dev_password = + os_malloc(wpabuf_len(cfg->wps->ap_nfc_dev_pw)); + if (data->dev_password == NULL) { + os_free(data); + return NULL; + } + os_memcpy(data->dev_password, + wpabuf_head(cfg->wps->ap_nfc_dev_pw), + wpabuf_len(cfg->wps->ap_nfc_dev_pw)); + data->dev_password_len = wpabuf_len(cfg->wps->ap_nfc_dev_pw); + } +#endif /* CONFIG_WPS_NFC */ + data->pbc = cfg->pbc; if (cfg->pbc) { /* Use special PIN '00000000' for PBC */ diff --git a/src/wps/wps.h b/src/wps/wps.h index c5871af..a94a90a 100644 --- a/src/wps/wps.h +++ b/src/wps/wps.h @@ -757,6 +757,11 @@ struct wps_context { /* Pending messages from UPnP PutWLANResponse */ struct upnp_pending_message *upnp_msgs; + + u16 ap_nfc_dev_pw_id; + struct wpabuf *ap_nfc_dh_pubkey; + struct wpabuf *ap_nfc_dh_privkey; + struct wpabuf *ap_nfc_dev_pw; }; struct oob_device_data { diff --git a/src/wps/wps_attr_build.c b/src/wps/wps_attr_build.c index 77f90ef..9be30b9 100644 --- a/src/wps/wps_attr_build.c +++ b/src/wps/wps_attr_build.c @@ -30,6 +30,14 @@ int wps_build_public_key(struct wps_data *wps, struct wpabuf *msg) wps->dh_ctx = wps->wps->dh_ctx; wps->wps->dh_ctx = NULL; pubkey = wpabuf_dup(wps->wps->dh_pubkey); +#ifdef CONFIG_WPS_NFC + } else if (wps->dev_pw_id >= 0x10 && wps->wps->ap && + wps->dev_pw_id == wps->wps->ap_nfc_dev_pw_id) { + wpa_printf(MSG_DEBUG, "WPS: Using NFC password token DH keys"); + wps->dh_privkey = wpabuf_dup(wps->wps->ap_nfc_dh_privkey); + pubkey = wpabuf_dup(wps->wps->ap_nfc_dh_pubkey); + wps->dh_ctx = dh5_init_fixed(wps->dh_privkey, pubkey); +#endif /* CONFIG_WPS_NFC */ } else { wpa_printf(MSG_DEBUG, "WPS: Generate new DH keys"); wps->dh_privkey = NULL; |