aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-04-07 09:04:58 (GMT)
committerJouni Malinen <j@w1.fi>2015-04-22 08:44:18 (GMT)
commitcc6f24380cdd2f696affc43b38f4b549792d8933 (patch)
treeb3818f2c21a6f2466f43c995b541228582ad586e
parentdd3d8578d08660c9bde0fccb0d3cbbd625c9e4f8 (diff)
downloadhostap-cc6f24380cdd2f696affc43b38f4b549792d8933.zip
hostap-cc6f24380cdd2f696affc43b38f4b549792d8933.tar.gz
hostap-cc6f24380cdd2f696affc43b38f4b549792d8933.tar.bz2
Add WPS_DEV_NAME_MAX_LEN define and use it when comparing length
This make code easier to understand. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
-rw-r--r--hostapd/config_file.c2
-rw-r--r--src/p2p/p2p.h2
-rw-r--r--src/p2p/p2p_i.h2
-rw-r--r--src/p2p/p2p_parse.c9
-rw-r--r--src/wps/wps_defs.h1
-rw-r--r--wpa_supplicant/config.c3
6 files changed, 11 insertions, 8 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 82b08f9..f4cccf5 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2837,7 +2837,7 @@ static int hostapd_config_fill(struct hostapd_config *conf,
os_free(bss->wps_pin_requests);
bss->wps_pin_requests = os_strdup(pos);
} else if (os_strcmp(buf, "device_name") == 0) {
- if (os_strlen(pos) > 32) {
+ if (os_strlen(pos) > WPS_DEV_NAME_MAX_LEN) {
wpa_printf(MSG_ERROR, "Line %d: Too long "
"device_name", line);
return 1;
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 2e5c3dc..889902b 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -268,7 +268,7 @@ struct p2p_peer_info {
/**
* device_name - Device Name (0..32 octets encoded in UTF-8)
*/
- char device_name[33];
+ char device_name[WPS_DEV_NAME_MAX_LEN + 1];
/**
* manufacturer - Manufacturer (0..64 octets encoded in UTF-8)
diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index 6af19ce..6fed932 100644
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -578,7 +578,7 @@ struct p2p_message {
const u8 *p2p_device_addr;
const u8 *pri_dev_type;
u8 num_sec_dev_types;
- char device_name[33];
+ char device_name[WPS_DEV_NAME_MAX_LEN + 1];
u16 config_methods;
/* WPS IE */
diff --git a/src/p2p/p2p_parse.c b/src/p2p/p2p_parse.c
index 4613414..b8c157b 100644
--- a/src/p2p/p2p_parse.c
+++ b/src/p2p/p2p_parse.c
@@ -149,7 +149,8 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
pos += 2;
nlen = WPA_GET_BE16(pos);
pos += 2;
- if (data + len - pos < (int) nlen || nlen > 32) {
+ if (data + len - pos < (int) nlen ||
+ nlen > WPS_DEV_NAME_MAX_LEN) {
wpa_printf(MSG_DEBUG, "P2P: Invalid Device Name "
"length %d (buf len %d)", (int) nlen,
(int) (data + len - pos));
@@ -674,8 +675,8 @@ int p2p_group_info_parse(const u8 *gi, size_t gi_len,
t += 2;
if (count > cend - t)
return -1; /* invalid Device Name TLV */
- if (count >= 32)
- count = 32;
+ if (count >= WPS_DEV_NAME_MAX_LEN)
+ count = WPS_DEV_NAME_MAX_LEN;
cli->dev_name = (const char *) t;
cli->dev_name_len = count;
@@ -703,7 +704,7 @@ static int p2p_group_info_text(const u8 *gi, size_t gi_len, char *buf,
for (i = 0; i < info.num_clients; i++) {
struct p2p_client_info *cli;
- char name[33];
+ char name[WPS_DEV_NAME_MAX_LEN + 1];
char devtype[WPS_DEV_TYPE_BUFSIZE];
u8 s;
int count;
diff --git a/src/wps/wps_defs.h b/src/wps/wps_defs.h
index 25cd14a..5a09063 100644
--- a/src/wps/wps_defs.h
+++ b/src/wps/wps_defs.h
@@ -41,6 +41,7 @@ extern int wps_corrupt_pkhash;
#define WPS_OOB_DEVICE_PASSWORD_MIN_LEN 16
#define WPS_OOB_DEVICE_PASSWORD_LEN 32
#define WPS_OOB_PUBKEY_HASH_LEN 20
+#define WPS_DEV_NAME_MAX_LEN 32
/* Attribute Types */
enum wps_attribute {
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index fb539cc..cf16174 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -4141,7 +4141,8 @@ static const struct global_parse_data global_fields[] = {
{ FUNC_NO_VAR(load_dynamic_eap), 0 },
#ifdef CONFIG_WPS
{ FUNC(uuid), CFG_CHANGED_UUID },
- { STR_RANGE(device_name, 0, 32), CFG_CHANGED_DEVICE_NAME },
+ { STR_RANGE(device_name, 0, WPS_DEV_NAME_MAX_LEN),
+ CFG_CHANGED_DEVICE_NAME },
{ STR_RANGE(manufacturer, 0, 64), CFG_CHANGED_WPS_STRING },
{ STR_RANGE(model_name, 0, 32), CFG_CHANGED_WPS_STRING },
{ STR_RANGE(model_number, 0, 32), CFG_CHANGED_WPS_STRING },