jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
hostap/src/wps/wps_dev_attr.c

453 lines
11 KiB
C
Raw Normal View History

Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
/*
* Wi-Fi Protected Setup - device attributes
* Copyright (c) 2008, Jouni Malinen <j@w1.fi>
*
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 15:46:35 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
*/
#include "includes.h"
#include "common.h"
#include "wps_i.h"
#include "wps_dev_attr.h"
WPS 2.0: Add device attributes into Probe Request Add Manufacturer, Model Name, Model Number, and Device Name attributes into the WSC IE in the Probe Request frames.
2009-12-23 00:10:25 +01:00
int wps_build_manufacturer(struct wps_device_data *dev, struct wpabuf *msg)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
size_t len;
wpa_printf(MSG_DEBUG, "WPS: * Manufacturer");
wpabuf_put_be16(msg, ATTR_MANUFACTURER);
len = dev->manufacturer ? os_strlen(dev->manufacturer) : 0;
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#ifndef CONFIG_WPS_STRICT
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
if (len == 0) {
/*
* Some deployed WPS implementations fail to parse zero-length
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
* attributes. As a workaround, send a space character if the
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
* device attribute string is empty.
*/
wpabuf_put_be16(msg, 1);
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
wpabuf_put_u8(msg, ' ');
return 0;
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
}
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#endif /* CONFIG_WPS_STRICT */
wpabuf_put_be16(msg, len);
wpabuf_put_data(msg, dev->manufacturer, len);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
WPS 2.0: Add device attributes into Probe Request Add Manufacturer, Model Name, Model Number, and Device Name attributes into the WSC IE in the Probe Request frames.
2009-12-23 00:10:25 +01:00
int wps_build_model_name(struct wps_device_data *dev, struct wpabuf *msg)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
size_t len;
wpa_printf(MSG_DEBUG, "WPS: * Model Name");
wpabuf_put_be16(msg, ATTR_MODEL_NAME);
len = dev->model_name ? os_strlen(dev->model_name) : 0;
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#ifndef CONFIG_WPS_STRICT
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
if (len == 0) {
/*
* Some deployed WPS implementations fail to parse zero-length
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
* attributes. As a workaround, send a space character if the
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
* device attribute string is empty.
*/
wpabuf_put_be16(msg, 1);
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
wpabuf_put_u8(msg, ' ');
return 0;
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
}
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#endif /* CONFIG_WPS_STRICT */
wpabuf_put_be16(msg, len);
wpabuf_put_data(msg, dev->model_name, len);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
WPS 2.0: Add device attributes into Probe Request Add Manufacturer, Model Name, Model Number, and Device Name attributes into the WSC IE in the Probe Request frames.
2009-12-23 00:10:25 +01:00
int wps_build_model_number(struct wps_device_data *dev, struct wpabuf *msg)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
size_t len;
wpa_printf(MSG_DEBUG, "WPS: * Model Number");
wpabuf_put_be16(msg, ATTR_MODEL_NUMBER);
len = dev->model_number ? os_strlen(dev->model_number) : 0;
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#ifndef CONFIG_WPS_STRICT
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
if (len == 0) {
/*
* Some deployed WPS implementations fail to parse zero-length
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
* attributes. As a workaround, send a space character if the
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
* device attribute string is empty.
*/
wpabuf_put_be16(msg, 1);
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
wpabuf_put_u8(msg, ' ');
return 0;
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
}
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#endif /* CONFIG_WPS_STRICT */
wpabuf_put_be16(msg, len);
wpabuf_put_data(msg, dev->model_number, len);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
static int wps_build_serial_number(struct wps_device_data *dev,
struct wpabuf *msg)
{
size_t len;
wpa_printf(MSG_DEBUG, "WPS: * Serial Number");
wpabuf_put_be16(msg, ATTR_SERIAL_NUMBER);
len = dev->serial_number ? os_strlen(dev->serial_number) : 0;
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#ifndef CONFIG_WPS_STRICT
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
if (len == 0) {
/*
* Some deployed WPS implementations fail to parse zero-length
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
* attributes. As a workaround, send a space character if the
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
* device attribute string is empty.
*/
wpabuf_put_be16(msg, 1);
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
wpabuf_put_u8(msg, ' ');
return 0;
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
}
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#endif /* CONFIG_WPS_STRICT */
wpabuf_put_be16(msg, len);
wpabuf_put_data(msg, dev->serial_number, len);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
WPS: Moved device attributes into wps_context::dev for Enrollee case Previously, hardcoded values were used in wps_enrollee.c. These are now moved into shared data in struct wps_context. In case of AP/Authenticator, these are initialized in wps_hostapd.c. In case of client/supplicant, these are now initialized in EAP-WSC peer method, but will probably end up being moved into higher layer for better configuration. EAP-WSC peer method for
2008-11-28 18:29:22 +01:00
int wps_build_primary_dev_type(struct wps_device_data *dev, struct wpabuf *msg)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
wpa_printf(MSG_DEBUG, "WPS: * Primary Device Type");
wpabuf_put_be16(msg, ATTR_PRIMARY_DEV_TYPE);
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 10:39:29 +01:00
wpabuf_put_be16(msg, WPS_DEV_TYPE_LEN);
wpabuf_put_data(msg, dev->pri_dev_type, WPS_DEV_TYPE_LEN);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
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 10:09:49 +01:00
int wps_build_secondary_dev_type(struct wps_device_data *dev,
struct wpabuf *msg)
{
if (!dev->num_sec_dev_types)
return 0;
wpa_printf(MSG_DEBUG, "WPS: * Secondary Device Type");
wpabuf_put_be16(msg, ATTR_SECONDARY_DEV_TYPE_LIST);
wpabuf_put_be16(msg, WPS_DEV_TYPE_LEN * dev->num_sec_dev_types);
wpabuf_put_data(msg, dev->sec_dev_type,
WPS_DEV_TYPE_LEN * dev->num_sec_dev_types);
return 0;
}
P2P: Add option for requested device type in P2P search/scan With this, p2p_find can be extended to find certain requested device types. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:57:46 +01:00
int wps_build_req_dev_type(struct wps_device_data *dev, struct wpabuf *msg,
unsigned int num_req_dev_types,
const u8 *req_dev_types)
{
unsigned int i;
for (i = 0; i < num_req_dev_types; i++) {
wpa_hexdump(MSG_DEBUG, "WPS: * Requested Device Type",
req_dev_types + i * WPS_DEV_TYPE_LEN,
WPS_DEV_TYPE_LEN);
wpabuf_put_be16(msg, ATTR_REQUESTED_DEV_TYPE);
wpabuf_put_be16(msg, WPS_DEV_TYPE_LEN);
wpabuf_put_data(msg, req_dev_types + i * WPS_DEV_TYPE_LEN,
WPS_DEV_TYPE_LEN);
}
return 0;
}
WPS 2.0: Add device attributes into Probe Request Add Manufacturer, Model Name, Model Number, and Device Name attributes into the WSC IE in the Probe Request frames.
2009-12-23 00:10:25 +01:00
int wps_build_dev_name(struct wps_device_data *dev, struct wpabuf *msg)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
size_t len;
wpa_printf(MSG_DEBUG, "WPS: * Device Name");
wpabuf_put_be16(msg, ATTR_DEV_NAME);
len = dev->device_name ? os_strlen(dev->device_name) : 0;
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#ifndef CONFIG_WPS_STRICT
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
if (len == 0) {
/*
* Some deployed WPS implementations fail to parse zero-length
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
* attributes. As a workaround, send a space character if the
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
* device attribute string is empty.
*/
wpabuf_put_be16(msg, 1);
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
wpabuf_put_u8(msg, ' ');
return 0;
WPS: As a workaround, pad zero-length device attributes Some deployed WPS implementations fail to parse zero-length attributes. As a workaround, send a null character if the device attribute string is empty. This allows default values (empty strings) to be used without interop issues.
2008-12-25 20:19:46 +01:00
}
WPS 2.0: Modify empty-string workaround to meet 2.0 rules Instead of using 0x00 as the extra character, use space (' ') to avoid failing tests that verify that the variable length string attributes are not null terminated. In addition, this workaround can now be disabled by defining CONFIG_WPS_STRICT for the build. This can be done by adding following line to .config: CFLAGS += -DCONFIG_WPS_STRICT However, it should be noted that such a build may not interoperate with some deployed WPS 1.0 -based implementations and as such, is mainly designed for testing.
2010-05-26 08:46:48 +02:00
#endif /* CONFIG_WPS_STRICT */
wpabuf_put_be16(msg, len);
wpabuf_put_data(msg, dev->device_name, len);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
int wps_build_device_attrs(struct wps_device_data *dev, struct wpabuf *msg)
{
if (wps_build_manufacturer(dev, msg) ||
wps_build_model_name(dev, msg) ||
wps_build_model_number(dev, msg) ||
wps_build_serial_number(dev, msg) ||
wps_build_primary_dev_type(dev, msg) ||
wps_build_dev_name(dev, msg))
return -1;
return 0;
}
int wps_build_os_version(struct wps_device_data *dev, struct wpabuf *msg)
{
wpa_printf(MSG_DEBUG, "WPS: * OS Version");
wpabuf_put_be16(msg, ATTR_OS_VERSION);
wpabuf_put_be16(msg, 4);
wpabuf_put_be32(msg, 0x80000000 | dev->os_version);
return 0;
}
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 23:08:57 +02:00
int wps_build_vendor_ext_m1(struct wps_device_data *dev, struct wpabuf *msg)
{
if (dev->vendor_ext_m1 != NULL) {
wpa_hexdump(MSG_DEBUG, "WPS: * Vendor Extension M1",
wpabuf_head_u8(dev->vendor_ext_m1),
wpabuf_len(dev->vendor_ext_m1));
wpabuf_put_be16(msg, ATTR_VENDOR_EXT);
wpabuf_put_be16(msg, wpabuf_len(dev->vendor_ext_m1));
wpabuf_put_buf(msg, dev->vendor_ext_m1);
}
return 0;
}
WPS: Moved RF Bands processing into wps_dev_attr.c This allows the RF Bands attribute to be configured and stored.
2008-11-29 11:59:43 +01:00
int wps_build_rf_bands(struct wps_device_data *dev, struct wpabuf *msg)
{
wpa_printf(MSG_DEBUG, "WPS: * RF Bands (%x)", dev->rf_bands);
wpabuf_put_be16(msg, ATTR_RF_BANDS);
wpabuf_put_be16(msg, 1);
wpabuf_put_u8(msg, dev->rf_bands);
return 0;
}
WPS: Add support for adding WPS Vendor Extensions This adds the ability to add WPS vendor extensions to an AP (or GO). They will be added to the WSC IE(s) in Beacon and Probe Response frames. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 10:44:42 +01:00
int wps_build_vendor_ext(struct wps_device_data *dev, struct wpabuf *msg)
{
int i;
for (i = 0; i < MAX_WPS_VENDOR_EXTENSIONS; i++) {
if (dev->vendor_ext[i] == NULL)
continue;
wpa_hexdump(MSG_DEBUG, "WPS: * Vendor Extension",
wpabuf_head_u8(dev->vendor_ext[i]),
wpabuf_len(dev->vendor_ext[i]));
wpabuf_put_be16(msg, ATTR_VENDOR_EXT);
wpabuf_put_be16(msg, wpabuf_len(dev->vendor_ext[i]));
wpabuf_put_buf(msg, dev->vendor_ext[i]);
}
return 0;
}
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
static int wps_process_manufacturer(struct wps_device_data *dev, const u8 *str,
size_t str_len)
{
if (str == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Manufacturer received");
return -1;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Manufacturer", str, str_len);
os_free(dev->manufacturer);
dev->manufacturer = os_malloc(str_len + 1);
if (dev->manufacturer == NULL)
return -1;
os_memcpy(dev->manufacturer, str, str_len);
dev->manufacturer[str_len] = '\0';
return 0;
}
static int wps_process_model_name(struct wps_device_data *dev, const u8 *str,
size_t str_len)
{
if (str == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Model Name received");
return -1;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Model Name", str, str_len);
os_free(dev->model_name);
dev->model_name = os_malloc(str_len + 1);
if (dev->model_name == NULL)
return -1;
os_memcpy(dev->model_name, str, str_len);
dev->model_name[str_len] = '\0';
return 0;
}
static int wps_process_model_number(struct wps_device_data *dev, const u8 *str,
size_t str_len)
{
if (str == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Model Number received");
return -1;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Model Number", str, str_len);
os_free(dev->model_number);
dev->model_number = os_malloc(str_len + 1);
if (dev->model_number == NULL)
return -1;
os_memcpy(dev->model_number, str, str_len);
dev->model_number[str_len] = '\0';
return 0;
}
static int wps_process_serial_number(struct wps_device_data *dev,
const u8 *str, size_t str_len)
{
if (str == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Serial Number received");
return -1;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Serial Number", str, str_len);
os_free(dev->serial_number);
dev->serial_number = os_malloc(str_len + 1);
if (dev->serial_number == NULL)
return -1;
os_memcpy(dev->serial_number, str, str_len);
dev->serial_number[str_len] = '\0';
return 0;
}
static int wps_process_dev_name(struct wps_device_data *dev, const u8 *str,
size_t str_len)
{
if (str == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Device Name received");
return -1;
}
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Device Name", str, str_len);
os_free(dev->device_name);
dev->device_name = os_malloc(str_len + 1);
if (dev->device_name == NULL)
return -1;
os_memcpy(dev->device_name, str, str_len);
dev->device_name[str_len] = '\0';
return 0;
}
static int wps_process_primary_dev_type(struct wps_device_data *dev,
const u8 *dev_type)
{
Avoid warnings on unused function/variables if debug is disabled CONFIG_NO_STDOUT_DEBUG removes wpa_printf() calls, so need to ifdef some function and variable definitions to avoid compiler warnings.
2010-03-06 15:37:57 +01:00
#ifndef CONFIG_NO_STDOUT_DEBUG
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 10:39:29 +01:00
char devtype[WPS_DEV_TYPE_BUFSIZE];
Avoid warnings on unused function/variables if debug is disabled CONFIG_NO_STDOUT_DEBUG removes wpa_printf() calls, so need to ifdef some function and variable definitions to avoid compiler warnings.
2010-03-06 15:37:57 +01:00
#endif /* CONFIG_NO_STDOUT_DEBUG */
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
if (dev_type == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No Primary Device Type received");
return -1;
}
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 10:39:29 +01:00
os_memcpy(dev->pri_dev_type, dev_type, WPS_DEV_TYPE_LEN);
wpa_printf(MSG_DEBUG, "WPS: Primary Device Type: %s",
wps_dev_type_bin2str(dev->pri_dev_type, devtype,
sizeof(devtype)));
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 0;
}
int wps_process_device_attrs(struct wps_device_data *dev,
struct wps_parse_attr *attr)
{
if (wps_process_manufacturer(dev, attr->manufacturer,
attr->manufacturer_len) ||
wps_process_model_name(dev, attr->model_name,
attr->model_name_len) ||
wps_process_model_number(dev, attr->model_number,
attr->model_number_len) ||
wps_process_serial_number(dev, attr->serial_number,
attr->serial_number_len) ||
wps_process_primary_dev_type(dev, attr->primary_dev_type) ||
wps_process_dev_name(dev, attr->dev_name, attr->dev_name_len))
return -1;
return 0;
}
int wps_process_os_version(struct wps_device_data *dev, const u8 *ver)
{
if (ver == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No OS Version received");
return -1;
}
dev->os_version = WPA_GET_BE32(ver);
wpa_printf(MSG_DEBUG, "WPS: OS Version %08x", dev->os_version);
return 0;
}
WPS: Moved RF Bands processing into wps_dev_attr.c This allows the RF Bands attribute to be configured and stored.
2008-11-29 11:59:43 +01:00
int wps_process_rf_bands(struct wps_device_data *dev, const u8 *bands)
{
if (bands == NULL) {
wpa_printf(MSG_DEBUG, "WPS: No RF Bands received");
return -1;
}
dev->rf_bands = *bands;
wpa_printf(MSG_DEBUG, "WPS: Enrollee RF Bands 0x%x", dev->rf_bands);
return 0;
}
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
void wps_device_data_dup(struct wps_device_data *dst,
const struct wps_device_data *src)
{
if (src->device_name)
dst->device_name = os_strdup(src->device_name);
if (src->manufacturer)
dst->manufacturer = os_strdup(src->manufacturer);
if (src->model_name)
dst->model_name = os_strdup(src->model_name);
if (src->model_number)
dst->model_number = os_strdup(src->model_number);
if (src->serial_number)
dst->serial_number = os_strdup(src->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 10:39:29 +01:00
os_memcpy(dst->pri_dev_type, src->pri_dev_type, WPS_DEV_TYPE_LEN);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
dst->os_version = src->os_version;
WPS: Moved RF Bands processing into wps_dev_attr.c This allows the RF Bands attribute to be configured and stored.
2008-11-29 11:59:43 +01:00
dst->rf_bands = src->rf_bands;
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
}
void wps_device_data_free(struct wps_device_data *dev)
{
os_free(dev->device_name);
dev->device_name = NULL;
os_free(dev->manufacturer);
dev->manufacturer = NULL;
os_free(dev->model_name);
dev->model_name = NULL;
os_free(dev->model_number);
dev->model_number = NULL;
os_free(dev->serial_number);
dev->serial_number = NULL;
}
Reference in a new issue Copy permalink