2008-02-28 02:34:43 +01:00
|
|
|
/*
|
|
|
|
* WPA Supplicant / Configuration parser and common functions
|
2015-01-25 22:32:01 +01:00
|
|
|
* Copyright (c) 2003-2015, Jouni Malinen <j@w1.fi>
|
2008-02-28 02:34:43 +01:00
|
|
|
*
|
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.
|
2008-02-28 02:34:43 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
|
|
|
|
|
|
|
#include "common.h"
|
2010-07-18 23:30:24 +02:00
|
|
|
#include "utils/uuid.h"
|
2013-03-16 18:13:31 +01:00
|
|
|
#include "utils/ip_addr.h"
|
2009-11-29 22:04:43 +01:00
|
|
|
#include "crypto/sha1.h"
|
2009-11-29 17:28:08 +01:00
|
|
|
#include "rsn_supp/wpa.h"
|
2008-02-28 02:34:43 +01:00
|
|
|
#include "eap_peer/eap.h"
|
2012-03-29 20:28:34 +02:00
|
|
|
#include "p2p/p2p.h"
|
2014-11-16 16:28:53 +01:00
|
|
|
#include "fst/fst.h"
|
2008-02-28 02:34:43 +01:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
|
|
#if !defined(CONFIG_CTRL_IFACE) && defined(CONFIG_NO_CONFIG_WRITE)
|
|
|
|
#define NO_CONFIG_WRITE
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Structure for network configuration parsing. This data is used to implement
|
|
|
|
* a generic parser for each network block variable. The table of configuration
|
|
|
|
* variables is defined below in this file (ssid_fields[]).
|
|
|
|
*/
|
|
|
|
struct parse_data {
|
|
|
|
/* Configuration variable name */
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
/* Parser function for this variable */
|
|
|
|
int (*parser)(const struct parse_data *data, struct wpa_ssid *ssid,
|
|
|
|
int line, const char *value);
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
/* Writer function (i.e., to get the variable in text format from
|
|
|
|
* internal presentation). */
|
|
|
|
char * (*writer)(const struct parse_data *data, struct wpa_ssid *ssid);
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
/* Variable specific parameters for the parser. */
|
|
|
|
void *param1, *param2, *param3, *param4;
|
|
|
|
|
|
|
|
/* 0 = this variable can be included in debug output and ctrl_iface
|
|
|
|
* 1 = this variable contains key/private data and it must not be
|
|
|
|
* included in debug output unless explicitly requested. In
|
|
|
|
* addition, this variable will not be readable through the
|
|
|
|
* ctrl_iface.
|
|
|
|
*/
|
|
|
|
int key_data;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_str(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid,
|
|
|
|
int line, const char *value)
|
|
|
|
{
|
|
|
|
size_t res_len, *dst_len;
|
|
|
|
char **dst, *tmp;
|
|
|
|
|
2008-10-02 11:16:25 +02:00
|
|
|
if (os_strcmp(value, "NULL") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Unset configuration string '%s'",
|
|
|
|
data->name);
|
|
|
|
tmp = NULL;
|
|
|
|
res_len = 0;
|
|
|
|
goto set;
|
|
|
|
}
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
tmp = wpa_config_parse_string(value, &res_len);
|
|
|
|
if (tmp == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: failed to parse %s '%s'.",
|
|
|
|
line, data->name,
|
|
|
|
data->key_data ? "[KEY DATA REMOVED]" : value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->key_data) {
|
|
|
|
wpa_hexdump_ascii_key(MSG_MSGDUMP, data->name,
|
|
|
|
(u8 *) tmp, res_len);
|
|
|
|
} else {
|
|
|
|
wpa_hexdump_ascii(MSG_MSGDUMP, data->name,
|
|
|
|
(u8 *) tmp, res_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->param3 && res_len < (size_t) data->param3) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too short %s (len=%lu "
|
|
|
|
"min_len=%ld)", line, data->name,
|
|
|
|
(unsigned long) res_len, (long) data->param3);
|
|
|
|
os_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->param4 && res_len > (size_t) data->param4) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too long %s (len=%lu "
|
|
|
|
"max_len=%ld)", line, data->name,
|
|
|
|
(unsigned long) res_len, (long) data->param4);
|
|
|
|
os_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-10-02 11:16:25 +02:00
|
|
|
set:
|
2008-02-28 02:34:43 +01:00
|
|
|
dst = (char **) (((u8 *) ssid) + (long) data->param1);
|
|
|
|
dst_len = (size_t *) (((u8 *) ssid) + (long) data->param2);
|
|
|
|
os_free(*dst);
|
|
|
|
*dst = tmp;
|
|
|
|
if (data->param2)
|
|
|
|
*dst_len = res_len;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_string_ascii(const u8 *value, size_t len)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
buf = os_malloc(len + 3);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
buf[0] = '"';
|
|
|
|
os_memcpy(buf + 1, value, len);
|
|
|
|
buf[len + 1] = '"';
|
|
|
|
buf[len + 2] = '\0';
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_string_hex(const u8 *value, size_t len)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
buf = os_zalloc(2 * len + 1);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
wpa_snprintf_hex(buf, 2 * len + 1, value, len);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_string(const u8 *value, size_t len)
|
|
|
|
{
|
|
|
|
if (value == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (is_hex(value, len))
|
|
|
|
return wpa_config_write_string_hex(value, len);
|
|
|
|
else
|
|
|
|
return wpa_config_write_string_ascii(value, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_str(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char **src;
|
|
|
|
|
|
|
|
src = (char **) (((u8 *) ssid) + (long) data->param1);
|
|
|
|
if (*src == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (data->param2)
|
|
|
|
len = *((size_t *) (((u8 *) ssid) + (long) data->param2));
|
|
|
|
else
|
|
|
|
len = os_strlen(*src);
|
|
|
|
|
|
|
|
return wpa_config_write_string((const u8 *) *src, len);
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_int(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid,
|
|
|
|
int line, const char *value)
|
|
|
|
{
|
2013-03-10 16:55:24 +01:00
|
|
|
int val, *dst;
|
|
|
|
char *end;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
dst = (int *) (((u8 *) ssid) + (long) data->param1);
|
2013-03-10 16:55:24 +01:00
|
|
|
val = strtol(value, &end, 0);
|
|
|
|
if (*end) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid number \"%s\"",
|
|
|
|
line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*dst = val;
|
2008-02-28 02:34:43 +01:00
|
|
|
wpa_printf(MSG_MSGDUMP, "%s=%d (0x%x)", data->name, *dst, *dst);
|
|
|
|
|
|
|
|
if (data->param3 && *dst < (long) data->param3) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too small %s (value=%d "
|
|
|
|
"min_value=%ld)", line, data->name, *dst,
|
|
|
|
(long) data->param3);
|
|
|
|
*dst = (long) data->param3;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->param4 && *dst > (long) data->param4) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too large %s (value=%d "
|
|
|
|
"max_value=%ld)", line, data->name, *dst,
|
|
|
|
(long) data->param4);
|
|
|
|
*dst = (long) data->param4;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_int(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
int *src, res;
|
|
|
|
char *value;
|
|
|
|
|
|
|
|
src = (int *) (((u8 *) ssid) + (long) data->param1);
|
|
|
|
|
|
|
|
value = os_malloc(20);
|
|
|
|
if (value == NULL)
|
|
|
|
return NULL;
|
|
|
|
res = os_snprintf(value, 20, "%d", *src);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(20, res)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
value[20 - 1] = '\0';
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2015-01-05 21:08:40 +01:00
|
|
|
static int wpa_config_parse_addr_list(const struct parse_data *data,
|
|
|
|
int line, const char *value,
|
|
|
|
u8 **list, size_t *num, char *name,
|
2015-01-05 21:10:16 +01:00
|
|
|
u8 abort_on_error, u8 masked)
|
2015-01-05 21:08:40 +01:00
|
|
|
{
|
|
|
|
const char *pos;
|
2015-01-05 21:10:16 +01:00
|
|
|
u8 *buf, *n, addr[2 * ETH_ALEN];
|
2015-01-05 21:08:40 +01:00
|
|
|
size_t count;
|
|
|
|
|
|
|
|
buf = NULL;
|
|
|
|
count = 0;
|
|
|
|
|
|
|
|
pos = value;
|
|
|
|
while (pos && *pos) {
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
2015-01-05 21:10:16 +01:00
|
|
|
if (hwaddr_masked_aton(pos, addr, &addr[ETH_ALEN], masked)) {
|
2015-01-05 21:08:40 +01:00
|
|
|
if (abort_on_error || count == 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"Line %d: Invalid %s address '%s'",
|
|
|
|
line, name, value);
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* continue anyway since this could have been from a
|
|
|
|
* truncated configuration file line */
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"Line %d: Ignore likely truncated %s address '%s'",
|
|
|
|
line, name, pos);
|
|
|
|
} else {
|
2015-01-05 21:10:16 +01:00
|
|
|
n = os_realloc_array(buf, count + 1, 2 * ETH_ALEN);
|
2015-01-05 21:08:40 +01:00
|
|
|
if (n == NULL) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
buf = n;
|
2015-01-05 21:10:16 +01:00
|
|
|
os_memmove(buf + 2 * ETH_ALEN, buf,
|
|
|
|
count * 2 * ETH_ALEN);
|
|
|
|
os_memcpy(buf, addr, 2 * ETH_ALEN);
|
2015-01-05 21:08:40 +01:00
|
|
|
count++;
|
2015-01-05 21:10:16 +01:00
|
|
|
wpa_printf(MSG_MSGDUMP,
|
|
|
|
"%s: addr=" MACSTR " mask=" MACSTR,
|
|
|
|
name, MAC2STR(addr),
|
|
|
|
MAC2STR(&addr[ETH_ALEN]));
|
2015-01-05 21:08:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(*list);
|
|
|
|
*list = buf;
|
|
|
|
*num = count;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_addr_list(const struct parse_data *data,
|
|
|
|
const u8 *list, size_t num, char *name)
|
|
|
|
{
|
|
|
|
char *value, *end, *pos;
|
|
|
|
int res;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (list == NULL || num == 0)
|
|
|
|
return NULL;
|
|
|
|
|
2015-01-05 21:10:16 +01:00
|
|
|
value = os_malloc(2 * 20 * num);
|
2015-01-05 21:08:40 +01:00
|
|
|
if (value == NULL)
|
|
|
|
return NULL;
|
|
|
|
pos = value;
|
2015-01-05 21:10:16 +01:00
|
|
|
end = value + 2 * 20 * num;
|
2015-01-05 21:08:40 +01:00
|
|
|
|
|
|
|
for (i = num; i > 0; i--) {
|
2015-01-05 21:10:16 +01:00
|
|
|
const u8 *a = list + (i - 1) * 2 * ETH_ALEN;
|
|
|
|
const u8 *m = a + ETH_ALEN;
|
|
|
|
|
|
|
|
if (i < num)
|
|
|
|
*pos++ = ' ';
|
|
|
|
res = hwaddr_mask_txt(pos, end - pos, a, m);
|
|
|
|
if (res < 0) {
|
2015-01-05 21:08:40 +01:00
|
|
|
os_free(value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
static int wpa_config_parse_bssid(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
2010-09-06 17:00:04 +02:00
|
|
|
if (value[0] == '\0' || os_strcmp(value, "\"\"") == 0 ||
|
|
|
|
os_strcmp(value, "any") == 0) {
|
|
|
|
ssid->bssid_set = 0;
|
|
|
|
wpa_printf(MSG_MSGDUMP, "BSSID any");
|
|
|
|
return 0;
|
|
|
|
}
|
2008-02-28 02:34:43 +01:00
|
|
|
if (hwaddr_aton(value, ssid->bssid)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid BSSID '%s'.",
|
|
|
|
line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ssid->bssid_set = 1;
|
|
|
|
wpa_hexdump(MSG_MSGDUMP, "BSSID", ssid->bssid, ETH_ALEN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_bssid(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (!ssid->bssid_set)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
value = os_malloc(20);
|
|
|
|
if (value == NULL)
|
|
|
|
return NULL;
|
|
|
|
res = os_snprintf(value, 20, MACSTR, MAC2STR(ssid->bssid));
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(20, res)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
value[20 - 1] = '\0';
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2015-01-05 21:08:49 +01:00
|
|
|
static int wpa_config_parse_bssid_blacklist(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_addr_list(data, line, value,
|
|
|
|
&ssid->bssid_blacklist,
|
|
|
|
&ssid->num_bssid_blacklist,
|
2015-01-05 21:10:16 +01:00
|
|
|
"bssid_blacklist", 1, 1);
|
2015-01-05 21:08:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_bssid_blacklist(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_addr_list(data, ssid->bssid_blacklist,
|
|
|
|
ssid->num_bssid_blacklist,
|
|
|
|
"bssid_blacklist");
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_bssid_whitelist(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_addr_list(data, line, value,
|
|
|
|
&ssid->bssid_whitelist,
|
|
|
|
&ssid->num_bssid_whitelist,
|
2015-01-05 21:10:16 +01:00
|
|
|
"bssid_whitelist", 1, 1);
|
2015-01-05 21:08:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_bssid_whitelist(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_addr_list(data, ssid->bssid_whitelist,
|
|
|
|
ssid->num_bssid_whitelist,
|
|
|
|
"bssid_whitelist");
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
static int wpa_config_parse_psk(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
2012-08-03 20:36:38 +02:00
|
|
|
#ifdef CONFIG_EXT_PASSWORD
|
|
|
|
if (os_strncmp(value, "ext:", 4) == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(ssid->passphrase);
|
2012-08-03 20:36:38 +02:00
|
|
|
ssid->passphrase = NULL;
|
|
|
|
ssid->psk_set = 0;
|
|
|
|
os_free(ssid->ext_psk);
|
|
|
|
ssid->ext_psk = os_strdup(value + 4);
|
|
|
|
if (ssid->ext_psk == NULL)
|
|
|
|
return -1;
|
|
|
|
wpa_printf(MSG_DEBUG, "PSK: External password '%s'",
|
|
|
|
ssid->ext_psk);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_EXT_PASSWORD */
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
if (*value == '"') {
|
|
|
|
#ifndef CONFIG_NO_PBKDF2
|
|
|
|
const char *pos;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
value++;
|
|
|
|
pos = os_strrchr(value, '"');
|
|
|
|
if (pos)
|
|
|
|
len = pos - value;
|
|
|
|
else
|
|
|
|
len = os_strlen(value);
|
|
|
|
if (len < 8 || len > 63) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid passphrase "
|
|
|
|
"length %lu (expected: 8..63) '%s'.",
|
|
|
|
line, (unsigned long) len, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
wpa_hexdump_ascii_key(MSG_MSGDUMP, "PSK (ASCII passphrase)",
|
|
|
|
(u8 *) value, len);
|
|
|
|
if (ssid->passphrase && os_strlen(ssid->passphrase) == len &&
|
|
|
|
os_memcmp(ssid->passphrase, value, len) == 0)
|
|
|
|
return 0;
|
|
|
|
ssid->psk_set = 0;
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(ssid->passphrase);
|
2013-04-27 22:44:59 +02:00
|
|
|
ssid->passphrase = dup_binstr(value, len);
|
2008-02-28 02:34:43 +01:00
|
|
|
if (ssid->passphrase == NULL)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
#else /* CONFIG_NO_PBKDF2 */
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: ASCII passphrase not "
|
|
|
|
"supported.", line);
|
|
|
|
return -1;
|
|
|
|
#endif /* CONFIG_NO_PBKDF2 */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hexstr2bin(value, ssid->psk, PMK_LEN) ||
|
|
|
|
value[PMK_LEN * 2] != '\0') {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid PSK '%s'.",
|
|
|
|
line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(ssid->passphrase);
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid->passphrase = NULL;
|
|
|
|
|
|
|
|
ssid->psk_set = 1;
|
|
|
|
wpa_hexdump_key(MSG_MSGDUMP, "PSK", ssid->psk, PMK_LEN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_psk(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
2012-08-03 20:36:38 +02:00
|
|
|
#ifdef CONFIG_EXT_PASSWORD
|
|
|
|
if (ssid->ext_psk) {
|
|
|
|
size_t len = 4 + os_strlen(ssid->ext_psk) + 1;
|
|
|
|
char *buf = os_malloc(len);
|
2014-12-06 20:40:31 +01:00
|
|
|
int res;
|
|
|
|
|
2012-08-03 20:36:38 +02:00
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
2014-12-06 20:40:31 +01:00
|
|
|
res = os_snprintf(buf, len, "ext:%s", ssid->ext_psk);
|
|
|
|
if (os_snprintf_error(len, res)) {
|
|
|
|
os_free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
2012-08-03 20:36:38 +02:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_EXT_PASSWORD */
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
if (ssid->passphrase)
|
|
|
|
return wpa_config_write_string_ascii(
|
|
|
|
(const u8 *) ssid->passphrase,
|
|
|
|
os_strlen(ssid->passphrase));
|
|
|
|
|
|
|
|
if (ssid->psk_set)
|
|
|
|
return wpa_config_write_string_hex(ssid->psk, PMK_LEN);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_proto(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int val = 0, last, errors = 0;
|
|
|
|
char *start, *end, *buf;
|
|
|
|
|
|
|
|
buf = os_strdup(value);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
start = buf;
|
|
|
|
|
|
|
|
while (*start != '\0') {
|
|
|
|
while (*start == ' ' || *start == '\t')
|
|
|
|
start++;
|
|
|
|
if (*start == '\0')
|
|
|
|
break;
|
|
|
|
end = start;
|
|
|
|
while (*end != ' ' && *end != '\t' && *end != '\0')
|
|
|
|
end++;
|
|
|
|
last = *end == '\0';
|
|
|
|
*end = '\0';
|
|
|
|
if (os_strcmp(start, "WPA") == 0)
|
|
|
|
val |= WPA_PROTO_WPA;
|
|
|
|
else if (os_strcmp(start, "RSN") == 0 ||
|
|
|
|
os_strcmp(start, "WPA2") == 0)
|
|
|
|
val |= WPA_PROTO_RSN;
|
2013-07-23 20:24:05 +02:00
|
|
|
else if (os_strcmp(start, "OSEN") == 0)
|
|
|
|
val |= WPA_PROTO_OSEN;
|
2008-02-28 02:34:43 +01:00
|
|
|
else {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid proto '%s'",
|
|
|
|
line, start);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (last)
|
|
|
|
break;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
if (val == 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"Line %d: no proto values configured.", line);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_MSGDUMP, "proto: 0x%x", val);
|
|
|
|
ssid->proto = val;
|
|
|
|
return errors ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_proto(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
2014-06-29 23:50:40 +02:00
|
|
|
int ret;
|
2008-02-28 02:34:43 +01:00
|
|
|
char *buf, *pos, *end;
|
|
|
|
|
2014-03-01 09:48:08 +01:00
|
|
|
pos = buf = os_zalloc(20);
|
2008-02-28 02:34:43 +01:00
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
2014-03-01 09:48:08 +01:00
|
|
|
end = buf + 20;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
if (ssid->proto & WPA_PROTO_WPA) {
|
2014-06-29 23:50:40 +02:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-28 02:34:43 +01:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->proto & WPA_PROTO_RSN) {
|
2014-06-29 23:50:40 +02:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sRSN",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-28 02:34:43 +01:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2014-03-01 09:48:08 +01:00
|
|
|
if (ssid->proto & WPA_PROTO_OSEN) {
|
2014-06-29 23:50:40 +02:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sOSEN",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-03-01 09:48:08 +01:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2014-06-29 23:56:27 +02:00
|
|
|
if (pos == buf) {
|
|
|
|
os_free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_key_mgmt(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int val = 0, last, errors = 0;
|
|
|
|
char *start, *end, *buf;
|
|
|
|
|
|
|
|
buf = os_strdup(value);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
start = buf;
|
|
|
|
|
|
|
|
while (*start != '\0') {
|
|
|
|
while (*start == ' ' || *start == '\t')
|
|
|
|
start++;
|
|
|
|
if (*start == '\0')
|
|
|
|
break;
|
|
|
|
end = start;
|
|
|
|
while (*end != ' ' && *end != '\t' && *end != '\0')
|
|
|
|
end++;
|
|
|
|
last = *end == '\0';
|
|
|
|
*end = '\0';
|
|
|
|
if (os_strcmp(start, "WPA-PSK") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_PSK;
|
|
|
|
else if (os_strcmp(start, "WPA-EAP") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_IEEE8021X;
|
|
|
|
else if (os_strcmp(start, "IEEE8021X") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_IEEE8021X_NO_WPA;
|
|
|
|
else if (os_strcmp(start, "NONE") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_NONE;
|
|
|
|
else if (os_strcmp(start, "WPA-NONE") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_WPA_NONE;
|
|
|
|
#ifdef CONFIG_IEEE80211R
|
|
|
|
else if (os_strcmp(start, "FT-PSK") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_FT_PSK;
|
|
|
|
else if (os_strcmp(start, "FT-EAP") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_FT_IEEE8021X;
|
|
|
|
#endif /* CONFIG_IEEE80211R */
|
2008-08-31 21:57:28 +02:00
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
else if (os_strcmp(start, "WPA-PSK-SHA256") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_PSK_SHA256;
|
|
|
|
else if (os_strcmp(start, "WPA-EAP-SHA256") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_IEEE8021X_SHA256;
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
2008-11-23 18:34:26 +01:00
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
else if (os_strcmp(start, "WPS") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_WPS;
|
|
|
|
#endif /* CONFIG_WPS */
|
2012-09-30 18:51:07 +02:00
|
|
|
#ifdef CONFIG_SAE
|
|
|
|
else if (os_strcmp(start, "SAE") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_SAE;
|
|
|
|
else if (os_strcmp(start, "FT-SAE") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_FT_SAE;
|
|
|
|
#endif /* CONFIG_SAE */
|
2013-07-23 20:24:05 +02:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
else if (os_strcmp(start, "OSEN") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_OSEN;
|
|
|
|
#endif /* CONFIG_HS20 */
|
2015-01-25 22:32:01 +01:00
|
|
|
#ifdef CONFIG_SUITEB
|
2014-11-16 12:20:51 +01:00
|
|
|
else if (os_strcmp(start, "WPA-EAP-SUITE-B") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_IEEE8021X_SUITE_B;
|
2015-01-25 22:32:01 +01:00
|
|
|
#endif /* CONFIG_SUITEB */
|
|
|
|
#ifdef CONFIG_SUITEB192
|
|
|
|
else if (os_strcmp(start, "WPA-EAP-SUITE-B-192") == 0)
|
|
|
|
val |= WPA_KEY_MGMT_IEEE8021X_SUITE_B_192;
|
|
|
|
#endif /* CONFIG_SUITEB192 */
|
2008-02-28 02:34:43 +01:00
|
|
|
else {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid key_mgmt '%s'",
|
|
|
|
line, start);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (last)
|
|
|
|
break;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
if (val == 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"Line %d: no key_mgmt values configured.", line);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_MSGDUMP, "key_mgmt: 0x%x", val);
|
|
|
|
ssid->key_mgmt = val;
|
|
|
|
return errors ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_key_mgmt(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
char *buf, *pos, *end;
|
|
|
|
int ret;
|
|
|
|
|
2013-10-14 19:49:26 +02:00
|
|
|
pos = buf = os_zalloc(100);
|
2008-02-28 02:34:43 +01:00
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
2013-10-14 19:49:26 +02:00
|
|
|
end = buf + 100;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_PSK) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-PSK",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-EAP",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sIEEE8021X",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_NONE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sNONE",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_WPA_NONE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-NONE",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_IEEE80211R
|
2013-10-14 19:49:26 +02:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_FT_PSK) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT-PSK",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2013-10-14 19:49:26 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-28 02:34:43 +01:00
|
|
|
|
2013-10-14 19:49:26 +02:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_FT_IEEE8021X) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT-EAP",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2013-10-14 19:49:26 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-28 02:34:43 +01:00
|
|
|
#endif /* CONFIG_IEEE80211R */
|
|
|
|
|
2008-08-31 21:57:28 +02:00
|
|
|
#ifdef CONFIG_IEEE80211W
|
2013-10-14 19:49:26 +02:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_PSK_SHA256) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-PSK-SHA256",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2013-10-14 19:49:26 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-08-31 21:57:28 +02:00
|
|
|
|
2013-10-14 19:49:26 +02:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SHA256) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-EAP-SHA256",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2013-10-14 19:49:26 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-08-31 21:57:28 +02:00
|
|
|
#endif /* CONFIG_IEEE80211W */
|
|
|
|
|
2008-11-29 20:02:14 +01:00
|
|
|
#ifdef CONFIG_WPS
|
2013-10-14 19:49:26 +02:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPS",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2013-10-14 19:49:26 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-11-29 20:02:14 +01:00
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
2014-09-01 06:23:34 +02:00
|
|
|
#ifdef CONFIG_SAE
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sSAE",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2014-09-01 06:23:34 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_FT_SAE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT-SAE",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2014-09-01 06:23:34 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SAE */
|
|
|
|
|
2014-10-19 11:22:39 +02:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_OSEN) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sOSEN",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2014-10-19 11:22:39 +02:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HS20 */
|
|
|
|
|
2015-01-25 22:32:01 +01:00
|
|
|
#ifdef CONFIG_SUITEB
|
2014-11-16 12:20:51 +01:00
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-EAP-SUITE-B",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2014-11-16 12:20:51 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
2015-01-25 22:32:01 +01:00
|
|
|
#endif /* CONFIG_SUITEB */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SUITEB192
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA-EAP-SUITE-B-192",
|
|
|
|
pos == buf ? "" : " ");
|
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SUITEB192 */
|
2014-11-16 12:20:51 +01:00
|
|
|
|
2014-06-29 23:56:27 +02:00
|
|
|
if (pos == buf) {
|
|
|
|
os_free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_cipher(int line, const char *value)
|
|
|
|
{
|
2015-11-23 22:34:52 +01:00
|
|
|
#ifdef CONFIG_NO_WPA
|
|
|
|
return -1;
|
|
|
|
#else /* CONFIG_NO_WPA */
|
2013-01-13 16:06:22 +01:00
|
|
|
int val = wpa_parse_cipher(value);
|
|
|
|
if (val < 0) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid cipher '%s'.",
|
|
|
|
line, value);
|
2008-02-28 02:34:43 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (val == 0) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: no cipher values configured.",
|
|
|
|
line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return val;
|
2015-11-23 22:34:52 +01:00
|
|
|
#endif /* CONFIG_NO_WPA */
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_cipher(int cipher)
|
|
|
|
{
|
2015-11-23 22:34:52 +01:00
|
|
|
#ifdef CONFIG_NO_WPA
|
|
|
|
return NULL;
|
|
|
|
#else /* CONFIG_NO_WPA */
|
2013-01-13 16:31:36 +01:00
|
|
|
char *buf = os_zalloc(50);
|
2008-02-28 02:34:43 +01:00
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2013-01-13 16:31:36 +01:00
|
|
|
if (wpa_write_ciphers(buf, buf + 50, cipher, " ") < 0) {
|
|
|
|
os_free(buf);
|
|
|
|
return NULL;
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
2015-11-23 22:34:52 +01:00
|
|
|
#endif /* CONFIG_NO_WPA */
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_pairwise(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int val;
|
|
|
|
val = wpa_config_parse_cipher(line, value);
|
|
|
|
if (val == -1)
|
|
|
|
return -1;
|
2013-01-13 16:10:38 +01:00
|
|
|
if (val & ~WPA_ALLOWED_PAIRWISE_CIPHERS) {
|
2008-02-28 02:34:43 +01:00
|
|
|
wpa_printf(MSG_ERROR, "Line %d: not allowed pairwise cipher "
|
|
|
|
"(0x%x).", line, val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_MSGDUMP, "pairwise: 0x%x", val);
|
|
|
|
ssid->pairwise_cipher = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_pairwise(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_cipher(ssid->pairwise_cipher);
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_group(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int val;
|
|
|
|
val = wpa_config_parse_cipher(line, value);
|
|
|
|
if (val == -1)
|
|
|
|
return -1;
|
2015-06-20 17:25:15 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Backwards compatibility - filter out WEP ciphers that were previously
|
|
|
|
* allowed.
|
|
|
|
*/
|
|
|
|
val &= ~(WPA_CIPHER_WEP104 | WPA_CIPHER_WEP40);
|
|
|
|
|
2013-01-13 16:10:38 +01:00
|
|
|
if (val & ~WPA_ALLOWED_GROUP_CIPHERS) {
|
2008-02-28 02:34:43 +01:00
|
|
|
wpa_printf(MSG_ERROR, "Line %d: not allowed group cipher "
|
|
|
|
"(0x%x).", line, val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_MSGDUMP, "group: 0x%x", val);
|
|
|
|
ssid->group_cipher = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_group(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_cipher(ssid->group_cipher);
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_auth_alg(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int val = 0, last, errors = 0;
|
|
|
|
char *start, *end, *buf;
|
|
|
|
|
|
|
|
buf = os_strdup(value);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
start = buf;
|
|
|
|
|
|
|
|
while (*start != '\0') {
|
|
|
|
while (*start == ' ' || *start == '\t')
|
|
|
|
start++;
|
|
|
|
if (*start == '\0')
|
|
|
|
break;
|
|
|
|
end = start;
|
|
|
|
while (*end != ' ' && *end != '\t' && *end != '\0')
|
|
|
|
end++;
|
|
|
|
last = *end == '\0';
|
|
|
|
*end = '\0';
|
|
|
|
if (os_strcmp(start, "OPEN") == 0)
|
|
|
|
val |= WPA_AUTH_ALG_OPEN;
|
|
|
|
else if (os_strcmp(start, "SHARED") == 0)
|
|
|
|
val |= WPA_AUTH_ALG_SHARED;
|
|
|
|
else if (os_strcmp(start, "LEAP") == 0)
|
|
|
|
val |= WPA_AUTH_ALG_LEAP;
|
|
|
|
else {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid auth_alg '%s'",
|
|
|
|
line, start);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (last)
|
|
|
|
break;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
if (val == 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"Line %d: no auth_alg values configured.", line);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_MSGDUMP, "auth_alg: 0x%x", val);
|
|
|
|
ssid->auth_alg = val;
|
|
|
|
return errors ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_auth_alg(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
char *buf, *pos, *end;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pos = buf = os_zalloc(30);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
end = buf + 30;
|
|
|
|
|
|
|
|
if (ssid->auth_alg & WPA_AUTH_ALG_OPEN) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sOPEN",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->auth_alg & WPA_AUTH_ALG_SHARED) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sSHARED",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid->auth_alg & WPA_AUTH_ALG_LEAP) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sLEAP",
|
|
|
|
pos == buf ? "" : " ");
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2008-02-28 02:34:43 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2014-06-29 23:56:27 +02:00
|
|
|
if (pos == buf) {
|
|
|
|
os_free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2013-01-01 15:23:47 +01:00
|
|
|
static int * wpa_config_parse_int_array(const char *value)
|
2009-03-26 20:55:01 +01:00
|
|
|
{
|
|
|
|
int *freqs;
|
|
|
|
size_t used, len;
|
|
|
|
const char *pos;
|
|
|
|
|
|
|
|
used = 0;
|
|
|
|
len = 10;
|
2012-08-13 19:44:21 +02:00
|
|
|
freqs = os_calloc(len + 1, sizeof(int));
|
2009-03-26 20:55:01 +01:00
|
|
|
if (freqs == NULL)
|
2010-03-27 06:45:50 +01:00
|
|
|
return NULL;
|
2009-03-26 20:55:01 +01:00
|
|
|
|
|
|
|
pos = value;
|
|
|
|
while (pos) {
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
if (used == len) {
|
|
|
|
int *n;
|
|
|
|
size_t i;
|
2012-08-13 20:21:23 +02:00
|
|
|
n = os_realloc_array(freqs, len * 2 + 1, sizeof(int));
|
2009-03-26 20:55:01 +01:00
|
|
|
if (n == NULL) {
|
|
|
|
os_free(freqs);
|
2010-03-27 06:45:50 +01:00
|
|
|
return NULL;
|
2009-03-26 20:55:01 +01:00
|
|
|
}
|
|
|
|
for (i = len; i <= len * 2; i++)
|
|
|
|
n[i] = 0;
|
|
|
|
freqs = n;
|
|
|
|
len *= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
freqs[used] = atoi(pos);
|
|
|
|
if (freqs[used] == 0)
|
|
|
|
break;
|
|
|
|
used++;
|
|
|
|
pos = os_strchr(pos + 1, ' ');
|
|
|
|
}
|
|
|
|
|
2010-03-27 06:45:50 +01:00
|
|
|
return freqs;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_scan_freq(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int *freqs;
|
|
|
|
|
2013-01-01 15:23:47 +01:00
|
|
|
freqs = wpa_config_parse_int_array(value);
|
2010-03-27 06:45:50 +01:00
|
|
|
if (freqs == NULL)
|
|
|
|
return -1;
|
2013-09-23 15:22:16 +02:00
|
|
|
if (freqs[0] == 0) {
|
|
|
|
os_free(freqs);
|
|
|
|
freqs = NULL;
|
|
|
|
}
|
2009-03-26 20:55:01 +01:00
|
|
|
os_free(ssid->scan_freq);
|
|
|
|
ssid->scan_freq = freqs;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-03-27 06:45:50 +01:00
|
|
|
static int wpa_config_parse_freq_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int *freqs;
|
|
|
|
|
2013-01-01 15:23:47 +01:00
|
|
|
freqs = wpa_config_parse_int_array(value);
|
2010-03-27 06:45:50 +01:00
|
|
|
if (freqs == NULL)
|
|
|
|
return -1;
|
2013-09-23 15:22:16 +02:00
|
|
|
if (freqs[0] == 0) {
|
|
|
|
os_free(freqs);
|
|
|
|
freqs = NULL;
|
|
|
|
}
|
2010-03-27 06:45:50 +01:00
|
|
|
os_free(ssid->freq_list);
|
|
|
|
ssid->freq_list = freqs;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-26 20:55:01 +01:00
|
|
|
#ifndef NO_CONFIG_WRITE
|
2010-03-27 06:45:50 +01:00
|
|
|
static char * wpa_config_write_freqs(const struct parse_data *data,
|
|
|
|
const int *freqs)
|
2009-03-26 20:55:01 +01:00
|
|
|
{
|
|
|
|
char *buf, *pos, *end;
|
|
|
|
int i, ret;
|
|
|
|
size_t count;
|
|
|
|
|
2010-03-27 06:45:50 +01:00
|
|
|
if (freqs == NULL)
|
2009-03-26 20:55:01 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
count = 0;
|
2010-03-27 06:45:50 +01:00
|
|
|
for (i = 0; freqs[i]; i++)
|
2009-03-26 20:55:01 +01:00
|
|
|
count++;
|
|
|
|
|
|
|
|
pos = buf = os_zalloc(10 * count + 1);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
end = buf + 10 * count + 1;
|
|
|
|
|
2010-03-27 06:45:50 +01:00
|
|
|
for (i = 0; freqs[i]; i++) {
|
2009-03-26 20:55:01 +01:00
|
|
|
ret = os_snprintf(pos, end - pos, "%s%u",
|
2010-03-27 06:45:50 +01:00
|
|
|
i == 0 ? "" : " ", freqs[i]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2009-03-26 20:55:01 +01:00
|
|
|
end[-1] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
2010-03-27 06:45:50 +01:00
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_scan_freq(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_freqs(data, ssid->scan_freq);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_freq_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_freqs(data, ssid->freq_list);
|
|
|
|
}
|
2009-03-26 20:55:01 +01:00
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
static int wpa_config_parse_eap(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int last, errors = 0;
|
|
|
|
char *start, *end, *buf;
|
|
|
|
struct eap_method_type *methods = NULL, *tmp;
|
|
|
|
size_t num_methods = 0;
|
|
|
|
|
|
|
|
buf = os_strdup(value);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
start = buf;
|
|
|
|
|
|
|
|
while (*start != '\0') {
|
|
|
|
while (*start == ' ' || *start == '\t')
|
|
|
|
start++;
|
|
|
|
if (*start == '\0')
|
|
|
|
break;
|
|
|
|
end = start;
|
|
|
|
while (*end != ' ' && *end != '\t' && *end != '\0')
|
|
|
|
end++;
|
|
|
|
last = *end == '\0';
|
|
|
|
*end = '\0';
|
|
|
|
tmp = methods;
|
2012-08-13 20:21:23 +02:00
|
|
|
methods = os_realloc_array(methods, num_methods + 1,
|
|
|
|
sizeof(*methods));
|
2008-02-28 02:34:43 +01:00
|
|
|
if (methods == NULL) {
|
|
|
|
os_free(tmp);
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
methods[num_methods].method = eap_peer_get_type(
|
|
|
|
start, &methods[num_methods].vendor);
|
|
|
|
if (methods[num_methods].vendor == EAP_VENDOR_IETF &&
|
|
|
|
methods[num_methods].method == EAP_TYPE_NONE) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: unknown EAP method "
|
|
|
|
"'%s'", line, start);
|
|
|
|
wpa_printf(MSG_ERROR, "You may need to add support for"
|
|
|
|
" this EAP method during wpa_supplicant\n"
|
|
|
|
"build time configuration.\n"
|
|
|
|
"See README for more information.");
|
|
|
|
errors++;
|
|
|
|
} else if (methods[num_methods].vendor == EAP_VENDOR_IETF &&
|
|
|
|
methods[num_methods].method == EAP_TYPE_LEAP)
|
|
|
|
ssid->leap++;
|
|
|
|
else
|
|
|
|
ssid->non_leap++;
|
|
|
|
num_methods++;
|
|
|
|
if (last)
|
|
|
|
break;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
tmp = methods;
|
2012-08-13 20:21:23 +02:00
|
|
|
methods = os_realloc_array(methods, num_methods + 1, sizeof(*methods));
|
2008-02-28 02:34:43 +01:00
|
|
|
if (methods == NULL) {
|
|
|
|
os_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
methods[num_methods].vendor = EAP_VENDOR_IETF;
|
|
|
|
methods[num_methods].method = EAP_TYPE_NONE;
|
|
|
|
num_methods++;
|
|
|
|
|
|
|
|
wpa_hexdump(MSG_MSGDUMP, "eap methods",
|
|
|
|
(u8 *) methods, num_methods * sizeof(*methods));
|
2012-03-04 15:13:00 +01:00
|
|
|
os_free(ssid->eap.eap_methods);
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid->eap.eap_methods = methods;
|
|
|
|
return errors ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-04 10:52:03 +02:00
|
|
|
#ifndef NO_CONFIG_WRITE
|
2008-02-28 02:34:43 +01:00
|
|
|
static char * wpa_config_write_eap(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
int i, ret;
|
|
|
|
char *buf, *pos, *end;
|
|
|
|
const struct eap_method_type *eap_methods = ssid->eap.eap_methods;
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
if (eap_methods == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pos = buf = os_zalloc(100);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
end = buf + 100;
|
|
|
|
|
|
|
|
for (i = 0; eap_methods[i].vendor != EAP_VENDOR_IETF ||
|
|
|
|
eap_methods[i].method != EAP_TYPE_NONE; i++) {
|
|
|
|
name = eap_get_name(eap_methods[i].vendor,
|
|
|
|
eap_methods[i].method);
|
|
|
|
if (name) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
|
|
|
pos == buf ? "" : " ", name);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-28 02:34:43 +01:00
|
|
|
break;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
end[-1] = '\0';
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
2015-04-04 10:52:03 +02:00
|
|
|
#endif /* NO_CONFIG_WRITE */
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_password(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
u8 *hash;
|
|
|
|
|
2008-10-02 11:16:25 +02:00
|
|
|
if (os_strcmp(value, "NULL") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Unset configuration string 'password'");
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(ssid->eap.password, ssid->eap.password_len);
|
2008-10-02 11:16:25 +02:00
|
|
|
ssid->eap.password = NULL;
|
|
|
|
ssid->eap.password_len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-03 20:47:31 +02:00
|
|
|
#ifdef CONFIG_EXT_PASSWORD
|
|
|
|
if (os_strncmp(value, "ext:", 4) == 0) {
|
|
|
|
char *name = os_strdup(value + 4);
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(ssid->eap.password, ssid->eap.password_len);
|
2012-08-03 20:47:31 +02:00
|
|
|
ssid->eap.password = (u8 *) name;
|
|
|
|
ssid->eap.password_len = os_strlen(name);
|
|
|
|
ssid->eap.flags &= ~EAP_CONFIG_FLAGS_PASSWORD_NTHASH;
|
|
|
|
ssid->eap.flags |= EAP_CONFIG_FLAGS_EXT_PASSWORD;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_EXT_PASSWORD */
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
if (os_strncmp(value, "hash:", 5) != 0) {
|
|
|
|
char *tmp;
|
|
|
|
size_t res_len;
|
|
|
|
|
|
|
|
tmp = wpa_config_parse_string(value, &res_len);
|
|
|
|
if (tmp == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: failed to parse "
|
|
|
|
"password.", line);
|
|
|
|
return -1;
|
|
|
|
}
|
2008-12-09 20:56:47 +01:00
|
|
|
wpa_hexdump_ascii_key(MSG_MSGDUMP, data->name,
|
|
|
|
(u8 *) tmp, res_len);
|
2008-02-28 02:34:43 +01:00
|
|
|
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(ssid->eap.password, ssid->eap.password_len);
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid->eap.password = (u8 *) tmp;
|
|
|
|
ssid->eap.password_len = res_len;
|
|
|
|
ssid->eap.flags &= ~EAP_CONFIG_FLAGS_PASSWORD_NTHASH;
|
2012-08-03 20:47:31 +02:00
|
|
|
ssid->eap.flags &= ~EAP_CONFIG_FLAGS_EXT_PASSWORD;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* NtPasswordHash: hash:<32 hex digits> */
|
|
|
|
if (os_strlen(value + 5) != 2 * 16) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid password hash length "
|
|
|
|
"(expected 32 hex digits)", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
hash = os_malloc(16);
|
|
|
|
if (hash == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(value + 5, hash, 16)) {
|
|
|
|
os_free(hash);
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid password hash", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_hexdump_key(MSG_MSGDUMP, data->name, hash, 16);
|
|
|
|
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(ssid->eap.password, ssid->eap.password_len);
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid->eap.password = hash;
|
|
|
|
ssid->eap.password_len = 16;
|
|
|
|
ssid->eap.flags |= EAP_CONFIG_FLAGS_PASSWORD_NTHASH;
|
2012-08-03 20:47:31 +02:00
|
|
|
ssid->eap.flags &= ~EAP_CONFIG_FLAGS_EXT_PASSWORD;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-04 10:52:03 +02:00
|
|
|
#ifndef NO_CONFIG_WRITE
|
2008-02-28 02:34:43 +01:00
|
|
|
static char * wpa_config_write_password(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
if (ssid->eap.password == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2012-08-03 20:47:31 +02:00
|
|
|
#ifdef CONFIG_EXT_PASSWORD
|
|
|
|
if (ssid->eap.flags & EAP_CONFIG_FLAGS_EXT_PASSWORD) {
|
|
|
|
buf = os_zalloc(4 + ssid->eap.password_len + 1);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
os_memcpy(buf, "ext:", 4);
|
|
|
|
os_memcpy(buf + 4, ssid->eap.password, ssid->eap.password_len);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_EXT_PASSWORD */
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
if (!(ssid->eap.flags & EAP_CONFIG_FLAGS_PASSWORD_NTHASH)) {
|
|
|
|
return wpa_config_write_string(
|
|
|
|
ssid->eap.password, ssid->eap.password_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
buf = os_malloc(5 + 32 + 1);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
os_memcpy(buf, "hash:", 5);
|
|
|
|
wpa_snprintf_hex(buf + 5, 32 + 1, ssid->eap.password, 16);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
2015-04-04 10:52:03 +02:00
|
|
|
#endif /* NO_CONFIG_WRITE */
|
2008-02-28 02:34:43 +01:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_wep_key(u8 *key, size_t *len, int line,
|
|
|
|
const char *value, int idx)
|
|
|
|
{
|
|
|
|
char *buf, title[20];
|
|
|
|
int res;
|
|
|
|
|
|
|
|
buf = wpa_config_parse_string(value, len);
|
|
|
|
if (buf == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid WEP key %d '%s'.",
|
|
|
|
line, idx, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (*len > MAX_WEP_KEY_LEN) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Too long WEP key %d '%s'.",
|
|
|
|
line, idx, value);
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
2012-05-07 12:39:33 +02:00
|
|
|
if (*len && *len != 5 && *len != 13 && *len != 16) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid WEP key length %u - "
|
|
|
|
"this network block will be ignored",
|
|
|
|
line, (unsigned int) *len);
|
|
|
|
}
|
2008-02-28 02:34:43 +01:00
|
|
|
os_memcpy(key, buf, *len);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(buf);
|
2008-02-28 02:34:43 +01:00
|
|
|
res = os_snprintf(title, sizeof(title), "wep_key%d", idx);
|
2014-12-07 11:15:34 +01:00
|
|
|
if (!os_snprintf_error(sizeof(title), res))
|
2008-02-28 02:34:43 +01:00
|
|
|
wpa_hexdump_key(MSG_MSGDUMP, title, key, *len);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_wep_key0(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_wep_key(ssid->wep_key[0],
|
|
|
|
&ssid->wep_key_len[0], line,
|
|
|
|
value, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_wep_key1(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_wep_key(ssid->wep_key[1],
|
|
|
|
&ssid->wep_key_len[1], line,
|
|
|
|
value, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_wep_key2(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_wep_key(ssid->wep_key[2],
|
|
|
|
&ssid->wep_key_len[2], line,
|
|
|
|
value, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_parse_wep_key3(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
return wpa_config_parse_wep_key(ssid->wep_key[3],
|
|
|
|
&ssid->wep_key_len[3], line,
|
|
|
|
value, 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_wep_key(struct wpa_ssid *ssid, int idx)
|
|
|
|
{
|
|
|
|
if (ssid->wep_key_len[idx] == 0)
|
|
|
|
return NULL;
|
|
|
|
return wpa_config_write_string(ssid->wep_key[idx],
|
|
|
|
ssid->wep_key_len[idx]);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_wep_key0(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_wep_key(ssid, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_wep_key1(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_wep_key(ssid, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_wep_key2(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_wep_key(ssid, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_config_write_wep_key3(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_wep_key(ssid, 3);
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2011-12-22 21:47:41 +01:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
|
2013-09-08 00:42:53 +02:00
|
|
|
static int wpa_config_parse_go_p2p_dev_addr(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
if (value[0] == '\0' || os_strcmp(value, "\"\"") == 0 ||
|
|
|
|
os_strcmp(value, "any") == 0) {
|
|
|
|
os_memset(ssid->go_p2p_dev_addr, 0, ETH_ALEN);
|
|
|
|
wpa_printf(MSG_MSGDUMP, "GO P2P Device Address any");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (hwaddr_aton(value, ssid->go_p2p_dev_addr)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid GO P2P Device Address '%s'.",
|
|
|
|
line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ssid->bssid_set = 1;
|
|
|
|
wpa_printf(MSG_MSGDUMP, "GO P2P Device Address " MACSTR,
|
|
|
|
MAC2STR(ssid->go_p2p_dev_addr));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_go_p2p_dev_addr(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (is_zero_ether_addr(ssid->go_p2p_dev_addr))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
value = os_malloc(20);
|
|
|
|
if (value == NULL)
|
|
|
|
return NULL;
|
|
|
|
res = os_snprintf(value, 20, MACSTR, MAC2STR(ssid->go_p2p_dev_addr));
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(20, res)) {
|
2013-09-08 00:42:53 +02:00
|
|
|
os_free(value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
value[20 - 1] = '\0';
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2011-12-22 21:47:41 +01:00
|
|
|
static int wpa_config_parse_p2p_client_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
2015-01-05 21:08:40 +01:00
|
|
|
return wpa_config_parse_addr_list(data, line, value,
|
|
|
|
&ssid->p2p_client_list,
|
|
|
|
&ssid->num_p2p_clients,
|
2015-01-05 21:10:16 +01:00
|
|
|
"p2p_client_list", 0, 0);
|
2011-12-22 21:47:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_p2p_client_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
2015-01-05 21:08:40 +01:00
|
|
|
return wpa_config_write_addr_list(data, ssid->p2p_client_list,
|
|
|
|
ssid->num_p2p_clients,
|
|
|
|
"p2p_client_list");
|
2011-12-22 21:47:41 +01:00
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
2013-09-01 12:40:33 +02:00
|
|
|
|
|
|
|
static int wpa_config_parse_psk_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
struct psk_list_entry *p;
|
|
|
|
const char *pos;
|
|
|
|
|
|
|
|
p = os_zalloc(sizeof(*p));
|
|
|
|
if (p == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = value;
|
|
|
|
if (os_strncmp(pos, "P2P-", 4) == 0) {
|
|
|
|
p->p2p = 1;
|
|
|
|
pos += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hwaddr_aton(pos, p->addr)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid psk_list address '%s'",
|
|
|
|
line, pos);
|
|
|
|
os_free(p);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
pos += 17;
|
|
|
|
if (*pos != '-') {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid psk_list '%s'",
|
|
|
|
line, pos);
|
|
|
|
os_free(p);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, p->psk, PMK_LEN) || pos[PMK_LEN * 2] != '\0') {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid psk_list PSK '%s'",
|
|
|
|
line, pos);
|
|
|
|
os_free(p);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dl_list_add(&ssid->psk_list, &p->list);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
static char * wpa_config_write_psk_list(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
2011-12-22 21:47:41 +01:00
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
2014-09-01 06:23:36 +02:00
|
|
|
|
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
|
2014-09-01 06:23:38 +02:00
|
|
|
static int wpa_config_parse_mesh_basic_rates(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int *rates = wpa_config_parse_int_array(value);
|
|
|
|
|
|
|
|
if (rates == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid mesh_basic_rates '%s'",
|
|
|
|
line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (rates[0] == 0) {
|
|
|
|
os_free(rates);
|
|
|
|
rates = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(ssid->mesh_basic_rates);
|
|
|
|
ssid->mesh_basic_rates = rates;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-01 06:23:36 +02:00
|
|
|
#ifndef NO_CONFIG_WRITE
|
2014-09-01 06:23:38 +02:00
|
|
|
|
|
|
|
static char * wpa_config_write_mesh_basic_rates(const struct parse_data *data,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
return wpa_config_write_freqs(data, ssid->mesh_basic_rates);
|
|
|
|
}
|
|
|
|
|
2014-09-01 06:23:36 +02:00
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
#endif /* CONFIG_MESH */
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
/* Helper macros for network block parser */
|
|
|
|
|
|
|
|
#ifdef OFFSET
|
|
|
|
#undef OFFSET
|
|
|
|
#endif /* OFFSET */
|
|
|
|
/* OFFSET: Get offset of a variable within the wpa_ssid structure */
|
|
|
|
#define OFFSET(v) ((void *) &((struct wpa_ssid *) 0)->v)
|
|
|
|
|
|
|
|
/* STR: Define a string variable for an ASCII string; f = field name */
|
|
|
|
#ifdef NO_CONFIG_WRITE
|
|
|
|
#define _STR(f) #f, wpa_config_parse_str, OFFSET(f)
|
|
|
|
#define _STRe(f) #f, wpa_config_parse_str, OFFSET(eap.f)
|
|
|
|
#else /* NO_CONFIG_WRITE */
|
|
|
|
#define _STR(f) #f, wpa_config_parse_str, wpa_config_write_str, OFFSET(f)
|
|
|
|
#define _STRe(f) #f, wpa_config_parse_str, wpa_config_write_str, OFFSET(eap.f)
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
#define STR(f) _STR(f), NULL, NULL, NULL, 0
|
|
|
|
#define STRe(f) _STRe(f), NULL, NULL, NULL, 0
|
|
|
|
#define STR_KEY(f) _STR(f), NULL, NULL, NULL, 1
|
|
|
|
#define STR_KEYe(f) _STRe(f), NULL, NULL, NULL, 1
|
|
|
|
|
|
|
|
/* STR_LEN: Define a string variable with a separate variable for storing the
|
|
|
|
* data length. Unlike STR(), this can be used to store arbitrary binary data
|
|
|
|
* (i.e., even nul termination character). */
|
|
|
|
#define _STR_LEN(f) _STR(f), OFFSET(f ## _len)
|
|
|
|
#define _STR_LENe(f) _STRe(f), OFFSET(eap.f ## _len)
|
|
|
|
#define STR_LEN(f) _STR_LEN(f), NULL, NULL, 0
|
|
|
|
#define STR_LENe(f) _STR_LENe(f), NULL, NULL, 0
|
|
|
|
#define STR_LEN_KEY(f) _STR_LEN(f), NULL, NULL, 1
|
|
|
|
|
|
|
|
/* STR_RANGE: Like STR_LEN(), but with minimum and maximum allowed length
|
|
|
|
* explicitly specified. */
|
|
|
|
#define _STR_RANGE(f, min, max) _STR_LEN(f), (void *) (min), (void *) (max)
|
|
|
|
#define STR_RANGE(f, min, max) _STR_RANGE(f, min, max), 0
|
|
|
|
#define STR_RANGE_KEY(f, min, max) _STR_RANGE(f, min, max), 1
|
|
|
|
|
|
|
|
#ifdef NO_CONFIG_WRITE
|
|
|
|
#define _INT(f) #f, wpa_config_parse_int, OFFSET(f), (void *) 0
|
|
|
|
#define _INTe(f) #f, wpa_config_parse_int, OFFSET(eap.f), (void *) 0
|
|
|
|
#else /* NO_CONFIG_WRITE */
|
|
|
|
#define _INT(f) #f, wpa_config_parse_int, wpa_config_write_int, \
|
|
|
|
OFFSET(f), (void *) 0
|
|
|
|
#define _INTe(f) #f, wpa_config_parse_int, wpa_config_write_int, \
|
|
|
|
OFFSET(eap.f), (void *) 0
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
/* INT: Define an integer variable */
|
|
|
|
#define INT(f) _INT(f), NULL, NULL, 0
|
|
|
|
#define INTe(f) _INTe(f), NULL, NULL, 0
|
|
|
|
|
|
|
|
/* INT_RANGE: Define an integer variable with allowed value range */
|
|
|
|
#define INT_RANGE(f, min, max) _INT(f), (void *) (min), (void *) (max), 0
|
|
|
|
|
|
|
|
/* FUNC: Define a configuration variable that uses a custom function for
|
|
|
|
* parsing and writing the value. */
|
|
|
|
#ifdef NO_CONFIG_WRITE
|
|
|
|
#define _FUNC(f) #f, wpa_config_parse_ ## f, NULL, NULL, NULL, NULL
|
|
|
|
#else /* NO_CONFIG_WRITE */
|
|
|
|
#define _FUNC(f) #f, wpa_config_parse_ ## f, wpa_config_write_ ## f, \
|
|
|
|
NULL, NULL, NULL, NULL
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
#define FUNC(f) _FUNC(f), 0
|
|
|
|
#define FUNC_KEY(f) _FUNC(f), 1
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Table of network configuration variables. This table is used to parse each
|
|
|
|
* network configuration variable, e.g., each line in wpa_supplicant.conf file
|
|
|
|
* that is inside a network block.
|
|
|
|
*
|
|
|
|
* This table is generated using the helper macros defined above and with
|
|
|
|
* generous help from the C pre-processor. The field name is stored as a string
|
|
|
|
* into .name and for STR and INT types, the offset of the target buffer within
|
|
|
|
* struct wpa_ssid is stored in .param1. .param2 (if not NULL) is similar
|
|
|
|
* offset to the field containing the length of the configuration variable.
|
|
|
|
* .param3 and .param4 can be used to mark the allowed range (length for STR
|
|
|
|
* and value for INT).
|
|
|
|
*
|
|
|
|
* For each configuration line in wpa_supplicant.conf, the parser goes through
|
|
|
|
* this table and select the entry that matches with the field name. The parser
|
|
|
|
* function (.parser) is then called to parse the actual value of the field.
|
|
|
|
*
|
|
|
|
* This kind of mechanism makes it easy to add new configuration parameters,
|
|
|
|
* since only one line needs to be added into this table and into the
|
|
|
|
* struct wpa_ssid definition if the new variable is either a string or
|
|
|
|
* integer. More complex types will need to use their own parser and writer
|
|
|
|
* functions.
|
|
|
|
*/
|
|
|
|
static const struct parse_data ssid_fields[] = {
|
2015-04-07 11:44:39 +02:00
|
|
|
{ STR_RANGE(ssid, 0, SSID_MAX_LEN) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ INT_RANGE(scan_ssid, 0, 1) },
|
|
|
|
{ FUNC(bssid) },
|
2015-01-05 21:08:49 +01:00
|
|
|
{ FUNC(bssid_blacklist) },
|
|
|
|
{ FUNC(bssid_whitelist) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ FUNC_KEY(psk) },
|
2015-03-28 10:05:13 +01:00
|
|
|
{ INT(mem_only_psk) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ FUNC(proto) },
|
|
|
|
{ FUNC(key_mgmt) },
|
2012-03-30 14:20:35 +02:00
|
|
|
{ INT(bg_scan_period) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ FUNC(pairwise) },
|
|
|
|
{ FUNC(group) },
|
|
|
|
{ FUNC(auth_alg) },
|
2009-03-26 20:55:01 +01:00
|
|
|
{ FUNC(scan_freq) },
|
2010-03-27 06:45:50 +01:00
|
|
|
{ FUNC(freq_list) },
|
2015-11-25 04:51:43 +01:00
|
|
|
{ INT_RANGE(max_oper_chwidth, VHT_CHANWIDTH_USE_HT,
|
|
|
|
VHT_CHANWIDTH_80P80MHZ) },
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
{ FUNC(eap) },
|
|
|
|
{ STR_LENe(identity) },
|
|
|
|
{ STR_LENe(anonymous_identity) },
|
2008-12-09 20:56:47 +01:00
|
|
|
{ FUNC_KEY(password) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ STRe(ca_cert) },
|
|
|
|
{ STRe(ca_path) },
|
|
|
|
{ STRe(client_cert) },
|
|
|
|
{ STRe(private_key) },
|
|
|
|
{ STR_KEYe(private_key_passwd) },
|
|
|
|
{ STRe(dh_file) },
|
|
|
|
{ STRe(subject_match) },
|
|
|
|
{ STRe(altsubject_match) },
|
2013-10-07 03:02:16 +02:00
|
|
|
{ STRe(domain_suffix_match) },
|
2015-01-14 14:31:28 +01:00
|
|
|
{ STRe(domain_match) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ STRe(ca_cert2) },
|
|
|
|
{ STRe(ca_path2) },
|
|
|
|
{ STRe(client_cert2) },
|
|
|
|
{ STRe(private_key2) },
|
|
|
|
{ STR_KEYe(private_key2_passwd) },
|
|
|
|
{ STRe(dh_file2) },
|
|
|
|
{ STRe(subject_match2) },
|
|
|
|
{ STRe(altsubject_match2) },
|
2013-10-07 03:02:16 +02:00
|
|
|
{ STRe(domain_suffix_match2) },
|
2015-01-14 14:31:28 +01:00
|
|
|
{ STRe(domain_match2) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ STRe(phase1) },
|
|
|
|
{ STRe(phase2) },
|
|
|
|
{ STRe(pcsc) },
|
|
|
|
{ STR_KEYe(pin) },
|
|
|
|
{ STRe(engine_id) },
|
|
|
|
{ STRe(key_id) },
|
2008-05-23 09:55:30 +02:00
|
|
|
{ STRe(cert_id) },
|
|
|
|
{ STRe(ca_cert_id) },
|
2008-11-18 15:53:32 +01:00
|
|
|
{ STR_KEYe(pin2) },
|
|
|
|
{ STRe(engine2_id) },
|
2008-05-23 09:55:30 +02:00
|
|
|
{ STRe(key2_id) },
|
|
|
|
{ STRe(cert2_id) },
|
|
|
|
{ STRe(ca_cert2_id) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ INTe(engine) },
|
2008-11-18 15:53:32 +01:00
|
|
|
{ INTe(engine2) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ INT(eapol_flags) },
|
2014-03-28 16:01:44 +01:00
|
|
|
{ INTe(sim_num) },
|
2014-10-12 10:53:51 +02:00
|
|
|
{ STRe(openssl_ciphers) },
|
2014-11-29 22:14:40 +01:00
|
|
|
{ INTe(erp) },
|
2008-02-28 02:34:43 +01:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
{ FUNC_KEY(wep_key0) },
|
|
|
|
{ FUNC_KEY(wep_key1) },
|
|
|
|
{ FUNC_KEY(wep_key2) },
|
|
|
|
{ FUNC_KEY(wep_key3) },
|
|
|
|
{ INT(wep_tx_keyidx) },
|
|
|
|
{ INT(priority) },
|
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
{ INT(eap_workaround) },
|
|
|
|
{ STRe(pac_file) },
|
|
|
|
{ INTe(fragment_size) },
|
2013-06-29 23:54:24 +02:00
|
|
|
{ INTe(ocsp) },
|
2008-02-28 02:34:43 +01:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
2014-09-01 06:23:26 +02:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
{ INT_RANGE(mode, 0, 5) },
|
2014-09-01 06:23:26 +02:00
|
|
|
{ INT_RANGE(no_auto_peer, 0, 1) },
|
2014-09-01 06:23:26 +02:00
|
|
|
#else /* CONFIG_MESH */
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT_RANGE(mode, 0, 4) },
|
2014-09-01 06:23:26 +02:00
|
|
|
#endif /* CONFIG_MESH */
|
2008-02-28 02:34:43 +01:00
|
|
|
{ INT_RANGE(proactive_key_caching, 0, 1) },
|
2010-07-18 23:30:25 +02:00
|
|
|
{ INT_RANGE(disabled, 0, 2) },
|
2008-02-28 02:34:43 +01:00
|
|
|
{ STR(id_str) },
|
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
{ INT_RANGE(ieee80211w, 0, 2) },
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
|
|
|
{ INT_RANGE(peerkey, 0, 1) },
|
|
|
|
{ INT_RANGE(mixed_cell, 0, 1) },
|
2012-12-18 10:50:35 +01:00
|
|
|
{ INT_RANGE(frequency, 0, 65000) },
|
2015-02-19 07:15:45 +01:00
|
|
|
{ INT_RANGE(fixed_freq, 0, 1) },
|
2015-11-27 12:40:37 +01:00
|
|
|
#ifdef CONFIG_ACS
|
|
|
|
{ INT_RANGE(acs, 0, 1) },
|
|
|
|
#endif /* CONFIG_ACS */
|
2014-09-01 06:23:36 +02:00
|
|
|
#ifdef CONFIG_MESH
|
2014-09-01 06:23:38 +02:00
|
|
|
{ FUNC(mesh_basic_rates) },
|
2014-11-15 02:35:32 +01:00
|
|
|
{ INT(dot11MeshMaxRetries) },
|
|
|
|
{ INT(dot11MeshRetryTimeout) },
|
|
|
|
{ INT(dot11MeshConfirmTimeout) },
|
|
|
|
{ INT(dot11MeshHoldingTimeout) },
|
2014-09-01 06:23:36 +02:00
|
|
|
#endif /* CONFIG_MESH */
|
2009-09-14 23:08:24 +02:00
|
|
|
{ INT(wpa_ptk_rekey) },
|
|
|
|
{ STR(bgscan) },
|
2012-02-27 15:28:45 +01:00
|
|
|
{ INT_RANGE(ignore_broadcast_ssid, 0, 2) },
|
2011-12-22 21:47:41 +01:00
|
|
|
#ifdef CONFIG_P2P
|
2013-09-08 00:42:53 +02:00
|
|
|
{ FUNC(go_p2p_dev_addr) },
|
2011-12-22 21:47:41 +01:00
|
|
|
{ FUNC(p2p_client_list) },
|
2013-09-01 12:40:33 +02:00
|
|
|
{ FUNC(psk_list) },
|
2011-12-22 21:47:41 +01:00
|
|
|
#endif /* CONFIG_P2P */
|
2012-01-29 20:01:31 +01:00
|
|
|
#ifdef CONFIG_HT_OVERRIDES
|
|
|
|
{ INT_RANGE(disable_ht, 0, 1) },
|
|
|
|
{ INT_RANGE(disable_ht40, -1, 1) },
|
2012-12-18 13:44:15 +01:00
|
|
|
{ INT_RANGE(disable_sgi, 0, 1) },
|
2014-04-01 07:16:00 +02:00
|
|
|
{ INT_RANGE(disable_ldpc, 0, 1) },
|
2014-04-15 16:22:47 +02:00
|
|
|
{ INT_RANGE(ht40_intolerant, 0, 1) },
|
2012-01-29 20:01:31 +01:00
|
|
|
{ INT_RANGE(disable_max_amsdu, -1, 1) },
|
|
|
|
{ INT_RANGE(ampdu_factor, -1, 3) },
|
|
|
|
{ INT_RANGE(ampdu_density, -1, 7) },
|
|
|
|
{ STR(ht_mcs) },
|
|
|
|
#endif /* CONFIG_HT_OVERRIDES */
|
2013-03-10 17:04:39 +01:00
|
|
|
#ifdef CONFIG_VHT_OVERRIDES
|
|
|
|
{ INT_RANGE(disable_vht, 0, 1) },
|
|
|
|
{ INT(vht_capa) },
|
|
|
|
{ INT(vht_capa_mask) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_1, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_2, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_3, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_4, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_5, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_6, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_7, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_rx_mcs_nss_8, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_1, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_2, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_3, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_4, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_5, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_6, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_7, -1, 3) },
|
|
|
|
{ INT_RANGE(vht_tx_mcs_nss_8, -1, 3) },
|
|
|
|
#endif /* CONFIG_VHT_OVERRIDES */
|
2012-03-27 19:41:27 +02:00
|
|
|
{ INT(ap_max_inactivity) },
|
2012-06-04 16:52:37 +02:00
|
|
|
{ INT(dtim_period) },
|
2013-03-01 19:50:08 +01:00
|
|
|
{ INT(beacon_int) },
|
2014-03-25 20:39:02 +01:00
|
|
|
#ifdef CONFIG_MACSEC
|
|
|
|
{ INT_RANGE(macsec_policy, 0, 1) },
|
|
|
|
#endif /* CONFIG_MACSEC */
|
2014-06-30 18:59:17 +02:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
{ INT(update_identifier) },
|
|
|
|
#endif /* CONFIG_HS20 */
|
2014-09-29 22:24:19 +02:00
|
|
|
{ INT_RANGE(mac_addr, 0, 2) },
|
2016-02-08 11:30:04 +01:00
|
|
|
{ INT_RANGE(pbss, 0, 1) },
|
2008-02-28 02:34:43 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
#undef OFFSET
|
|
|
|
#undef _STR
|
|
|
|
#undef STR
|
|
|
|
#undef STR_KEY
|
|
|
|
#undef _STR_LEN
|
|
|
|
#undef STR_LEN
|
|
|
|
#undef STR_LEN_KEY
|
|
|
|
#undef _STR_RANGE
|
|
|
|
#undef STR_RANGE
|
|
|
|
#undef STR_RANGE_KEY
|
|
|
|
#undef _INT
|
|
|
|
#undef INT
|
|
|
|
#undef INT_RANGE
|
|
|
|
#undef _FUNC
|
|
|
|
#undef FUNC
|
|
|
|
#undef FUNC_KEY
|
2013-10-26 16:00:57 +02:00
|
|
|
#define NUM_SSID_FIELDS ARRAY_SIZE(ssid_fields)
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_add_prio_network - Add a network to priority lists
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @ssid: Pointer to the network configuration to be added to the list
|
|
|
|
* Returns: 0 on success, -1 on failure
|
|
|
|
*
|
|
|
|
* This function is used to add a network block to the priority list of
|
|
|
|
* networks. This must be called for each network when reading in the full
|
|
|
|
* configuration. In addition, this can be used indirectly when updating
|
|
|
|
* priorities by calling wpa_config_update_prio_list().
|
|
|
|
*/
|
|
|
|
int wpa_config_add_prio_network(struct wpa_config *config,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
int prio;
|
|
|
|
struct wpa_ssid *prev, **nlist;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add to an existing priority list if one is available for the
|
|
|
|
* configured priority level for this network.
|
|
|
|
*/
|
|
|
|
for (prio = 0; prio < config->num_prio; prio++) {
|
|
|
|
prev = config->pssid[prio];
|
|
|
|
if (prev->priority == ssid->priority) {
|
|
|
|
while (prev->pnext)
|
|
|
|
prev = prev->pnext;
|
|
|
|
prev->pnext = ssid;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First network for this priority - add a new priority list */
|
2012-08-13 20:21:23 +02:00
|
|
|
nlist = os_realloc_array(config->pssid, config->num_prio + 1,
|
|
|
|
sizeof(struct wpa_ssid *));
|
2008-02-28 02:34:43 +01:00
|
|
|
if (nlist == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (prio = 0; prio < config->num_prio; prio++) {
|
2012-02-19 15:44:30 +01:00
|
|
|
if (nlist[prio]->priority < ssid->priority) {
|
|
|
|
os_memmove(&nlist[prio + 1], &nlist[prio],
|
|
|
|
(config->num_prio - prio) *
|
|
|
|
sizeof(struct wpa_ssid *));
|
2008-02-28 02:34:43 +01:00
|
|
|
break;
|
2012-02-19 15:44:30 +01:00
|
|
|
}
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
nlist[prio] = ssid;
|
|
|
|
config->num_prio++;
|
|
|
|
config->pssid = nlist;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_update_prio_list - Update network priority list
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* Returns: 0 on success, -1 on failure
|
|
|
|
*
|
|
|
|
* This function is called to update the priority list of networks in the
|
|
|
|
* configuration when a network is being added or removed. This is also called
|
|
|
|
* if a priority for a network is changed.
|
|
|
|
*/
|
2010-03-06 10:13:50 +01:00
|
|
|
int wpa_config_update_prio_list(struct wpa_config *config)
|
2008-02-28 02:34:43 +01:00
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
os_free(config->pssid);
|
|
|
|
config->pssid = NULL;
|
|
|
|
config->num_prio = 0;
|
|
|
|
|
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
ssid->pnext = NULL;
|
|
|
|
if (wpa_config_add_prio_network(config, ssid) < 0)
|
|
|
|
ret = -1;
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
static void eap_peer_config_free(struct eap_peer_config *eap)
|
|
|
|
{
|
|
|
|
os_free(eap->eap_methods);
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(eap->identity, eap->identity_len);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->anonymous_identity);
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(eap->password, eap->password_len);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->ca_cert);
|
|
|
|
os_free(eap->ca_path);
|
|
|
|
os_free(eap->client_cert);
|
|
|
|
os_free(eap->private_key);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(eap->private_key_passwd);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->dh_file);
|
|
|
|
os_free(eap->subject_match);
|
|
|
|
os_free(eap->altsubject_match);
|
2013-10-07 03:02:16 +02:00
|
|
|
os_free(eap->domain_suffix_match);
|
2015-01-14 14:31:28 +01:00
|
|
|
os_free(eap->domain_match);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->ca_cert2);
|
|
|
|
os_free(eap->ca_path2);
|
|
|
|
os_free(eap->client_cert2);
|
|
|
|
os_free(eap->private_key2);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(eap->private_key2_passwd);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->dh_file2);
|
|
|
|
os_free(eap->subject_match2);
|
|
|
|
os_free(eap->altsubject_match2);
|
2013-10-07 03:02:16 +02:00
|
|
|
os_free(eap->domain_suffix_match2);
|
2015-01-14 14:31:28 +01:00
|
|
|
os_free(eap->domain_match2);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->phase1);
|
|
|
|
os_free(eap->phase2);
|
|
|
|
os_free(eap->pcsc);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(eap->pin);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->engine_id);
|
|
|
|
os_free(eap->key_id);
|
2008-05-23 09:55:30 +02:00
|
|
|
os_free(eap->cert_id);
|
|
|
|
os_free(eap->ca_cert_id);
|
|
|
|
os_free(eap->key2_id);
|
|
|
|
os_free(eap->cert2_id);
|
|
|
|
os_free(eap->ca_cert2_id);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(eap->pin2);
|
2008-11-18 15:53:32 +01:00
|
|
|
os_free(eap->engine2_id);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(eap->otp);
|
|
|
|
os_free(eap->pending_req_otp);
|
|
|
|
os_free(eap->pac_file);
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(eap->new_password, eap->new_password_len);
|
|
|
|
str_clear_free(eap->external_sim_resp);
|
2014-10-12 10:53:51 +02:00
|
|
|
os_free(eap->openssl_ciphers);
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_free_ssid - Free network/ssid configuration data
|
|
|
|
* @ssid: Configuration data for the network
|
|
|
|
*
|
|
|
|
* This function frees all resources allocated for the network configuration
|
|
|
|
* data.
|
|
|
|
*/
|
|
|
|
void wpa_config_free_ssid(struct wpa_ssid *ssid)
|
|
|
|
{
|
2013-09-01 12:40:33 +02:00
|
|
|
struct psk_list_entry *psk;
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(ssid->ssid);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(ssid->passphrase);
|
2012-08-03 20:36:38 +02:00
|
|
|
os_free(ssid->ext_psk);
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
eap_peer_config_free(&ssid->eap);
|
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
os_free(ssid->id_str);
|
2009-03-26 20:55:01 +01:00
|
|
|
os_free(ssid->scan_freq);
|
2010-03-27 06:45:50 +01:00
|
|
|
os_free(ssid->freq_list);
|
2009-09-14 23:08:24 +02:00
|
|
|
os_free(ssid->bgscan);
|
2011-12-22 21:47:41 +01:00
|
|
|
os_free(ssid->p2p_client_list);
|
2015-01-05 21:10:16 +01:00
|
|
|
os_free(ssid->bssid_blacklist);
|
|
|
|
os_free(ssid->bssid_whitelist);
|
2012-01-29 20:01:31 +01:00
|
|
|
#ifdef CONFIG_HT_OVERRIDES
|
|
|
|
os_free(ssid->ht_mcs);
|
|
|
|
#endif /* CONFIG_HT_OVERRIDES */
|
2014-09-01 06:23:38 +02:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
os_free(ssid->mesh_basic_rates);
|
|
|
|
#endif /* CONFIG_MESH */
|
2013-09-01 12:40:33 +02:00
|
|
|
while ((psk = dl_list_first(&ssid->psk_list, struct psk_list_entry,
|
|
|
|
list))) {
|
|
|
|
dl_list_del(&psk->list);
|
2014-12-29 12:11:29 +01:00
|
|
|
bin_clear_free(psk, sizeof(*psk));
|
2013-09-01 12:40:33 +02:00
|
|
|
}
|
2014-12-29 12:11:29 +01:00
|
|
|
bin_clear_free(ssid, sizeof(*ssid));
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
void wpa_config_free_cred(struct wpa_cred *cred)
|
|
|
|
{
|
2013-08-02 17:42:54 +02:00
|
|
|
size_t i;
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
os_free(cred->realm);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->username);
|
|
|
|
str_clear_free(cred->password);
|
2012-02-16 15:34:22 +01:00
|
|
|
os_free(cred->ca_cert);
|
2012-02-29 15:40:17 +01:00
|
|
|
os_free(cred->client_cert);
|
|
|
|
os_free(cred->private_key);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->private_key_passwd);
|
2012-02-16 15:34:22 +01:00
|
|
|
os_free(cred->imsi);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->milenage);
|
2013-08-02 17:42:54 +02:00
|
|
|
for (i = 0; i < cred->num_domain; i++)
|
|
|
|
os_free(cred->domain[i]);
|
2012-02-16 15:34:22 +01:00
|
|
|
os_free(cred->domain);
|
2013-10-07 03:14:51 +02:00
|
|
|
os_free(cred->domain_suffix_match);
|
2012-08-02 17:40:45 +02:00
|
|
|
os_free(cred->eap_method);
|
|
|
|
os_free(cred->phase1);
|
|
|
|
os_free(cred->phase2);
|
2012-12-16 11:01:50 +01:00
|
|
|
os_free(cred->excluded_ssid);
|
2012-12-06 07:48:18 +01:00
|
|
|
os_free(cred->roaming_partner);
|
2013-08-02 18:09:11 +02:00
|
|
|
os_free(cred->provisioning_sp);
|
2013-08-08 19:31:41 +02:00
|
|
|
for (i = 0; i < cred->num_req_conn_capab; i++)
|
|
|
|
os_free(cred->req_conn_capab_port[i]);
|
|
|
|
os_free(cred->req_conn_capab_port);
|
|
|
|
os_free(cred->req_conn_capab_proto);
|
2012-02-16 15:34:22 +01:00
|
|
|
os_free(cred);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-08 15:14:30 +01:00
|
|
|
void wpa_config_flush_blobs(struct wpa_config *config)
|
|
|
|
{
|
|
|
|
#ifndef CONFIG_NO_CONFIG_BLOBS
|
|
|
|
struct wpa_config_blob *blob, *prev;
|
|
|
|
|
|
|
|
blob = config->blobs;
|
|
|
|
config->blobs = NULL;
|
|
|
|
while (blob) {
|
|
|
|
prev = blob;
|
|
|
|
blob = blob->next;
|
|
|
|
wpa_config_free_blob(prev);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_CONFIG_BLOBS */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
/**
|
|
|
|
* wpa_config_free - Free configuration data
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
*
|
|
|
|
* This function frees all resources allocated for the configuration data by
|
|
|
|
* wpa_config_read().
|
|
|
|
*/
|
|
|
|
void wpa_config_free(struct wpa_config *config)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid, *prev = NULL;
|
2012-02-16 15:34:22 +01:00
|
|
|
struct wpa_cred *cred, *cprev;
|
2014-12-31 12:05:51 +01:00
|
|
|
int i;
|
2010-07-18 23:30:24 +02:00
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
prev = ssid;
|
|
|
|
ssid = ssid->next;
|
|
|
|
wpa_config_free_ssid(prev);
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
cred = config->cred;
|
|
|
|
while (cred) {
|
|
|
|
cprev = cred;
|
|
|
|
cred = cred->next;
|
|
|
|
wpa_config_free_cred(cprev);
|
|
|
|
}
|
|
|
|
|
2014-01-08 15:14:30 +01:00
|
|
|
wpa_config_flush_blobs(config);
|
2008-02-28 02:34:43 +01:00
|
|
|
|
2012-04-03 23:08:57 +02:00
|
|
|
wpabuf_free(config->wps_vendor_ext_m1);
|
2014-12-31 12:05:51 +01:00
|
|
|
for (i = 0; i < MAX_WPS_VENDOR_EXT; i++)
|
|
|
|
wpabuf_free(config->wps_vendor_ext[i]);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(config->ctrl_interface);
|
|
|
|
os_free(config->ctrl_interface_group);
|
|
|
|
os_free(config->opensc_engine_path);
|
|
|
|
os_free(config->pkcs11_engine_path);
|
|
|
|
os_free(config->pkcs11_module_path);
|
2014-10-12 10:53:51 +02:00
|
|
|
os_free(config->openssl_ciphers);
|
2012-02-26 12:07:05 +01:00
|
|
|
os_free(config->pcsc_reader);
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(config->pcsc_pin);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(config->driver_param);
|
2008-12-13 16:20:46 +01:00
|
|
|
os_free(config->device_name);
|
|
|
|
os_free(config->manufacturer);
|
|
|
|
os_free(config->model_name);
|
|
|
|
os_free(config->model_number);
|
|
|
|
os_free(config->serial_number);
|
2009-12-21 14:59:25 +01:00
|
|
|
os_free(config->config_methods);
|
2010-07-18 23:30:24 +02:00
|
|
|
os_free(config->p2p_ssid_postfix);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(config->pssid);
|
2012-03-29 20:28:34 +02:00
|
|
|
os_free(config->p2p_pref_chan);
|
2013-10-22 18:45:46 +02:00
|
|
|
os_free(config->p2p_no_go_freq.range);
|
2012-06-26 17:09:57 +02:00
|
|
|
os_free(config->autoscan);
|
2013-05-05 10:46:54 +02:00
|
|
|
os_free(config->freq_list);
|
2012-06-27 17:56:41 +02:00
|
|
|
wpabuf_free(config->wps_nfc_dh_pubkey);
|
|
|
|
wpabuf_free(config->wps_nfc_dh_privkey);
|
|
|
|
wpabuf_free(config->wps_nfc_dev_pw);
|
2012-08-03 20:28:42 +02:00
|
|
|
os_free(config->ext_password_backend);
|
2013-01-01 15:23:47 +01:00
|
|
|
os_free(config->sae_groups);
|
2013-03-21 14:52:41 +01:00
|
|
|
wpabuf_free(config->ap_vendor_elements);
|
2013-01-25 23:10:41 +01:00
|
|
|
os_free(config->osu_dir);
|
2015-01-19 02:44:35 +01:00
|
|
|
os_free(config->bgscan);
|
2014-04-24 07:45:39 +02:00
|
|
|
os_free(config->wowlan_triggers);
|
2014-11-16 16:28:53 +01:00
|
|
|
os_free(config->fst_group_id);
|
2015-11-17 14:08:24 +01:00
|
|
|
os_free(config->sched_scan_plans);
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(config);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-20 11:12:12 +01:00
|
|
|
/**
|
|
|
|
* wpa_config_foreach_network - Iterate over each configured network
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @func: Callback function to process each network
|
|
|
|
* @arg: Opaque argument to pass to callback function
|
|
|
|
*
|
|
|
|
* Iterate over the set of configured networks calling the specified
|
|
|
|
* function for each item. We guard against callbacks removing the
|
|
|
|
* supplied network.
|
|
|
|
*/
|
|
|
|
void wpa_config_foreach_network(struct wpa_config *config,
|
|
|
|
void (*func)(void *, struct wpa_ssid *),
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid, *next;
|
|
|
|
|
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
next = ssid->next;
|
|
|
|
func(arg, ssid);
|
|
|
|
ssid = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
/**
|
|
|
|
* wpa_config_get_network - Get configured network based on id
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @id: Unique network id to search for
|
|
|
|
* Returns: Network configuration or %NULL if not found
|
|
|
|
*/
|
|
|
|
struct wpa_ssid * wpa_config_get_network(struct wpa_config *config, int id)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
if (id == ssid->id)
|
|
|
|
break;
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ssid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_add_network - Add a new network with empty configuration
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* Returns: The new network configuration or %NULL if operation failed
|
|
|
|
*/
|
|
|
|
struct wpa_ssid * wpa_config_add_network(struct wpa_config *config)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid, *last = NULL;
|
|
|
|
|
|
|
|
id = -1;
|
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
if (ssid->id > id)
|
|
|
|
id = ssid->id;
|
|
|
|
last = ssid;
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
id++;
|
|
|
|
|
|
|
|
ssid = os_zalloc(sizeof(*ssid));
|
|
|
|
if (ssid == NULL)
|
|
|
|
return NULL;
|
|
|
|
ssid->id = id;
|
2013-09-01 12:40:33 +02:00
|
|
|
dl_list_init(&ssid->psk_list);
|
2008-02-28 02:34:43 +01:00
|
|
|
if (last)
|
|
|
|
last->next = ssid;
|
|
|
|
else
|
|
|
|
config->ssid = ssid;
|
|
|
|
|
|
|
|
wpa_config_update_prio_list(config);
|
|
|
|
|
|
|
|
return ssid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_remove_network - Remove a configured network based on id
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @id: Unique network id to search for
|
|
|
|
* Returns: 0 on success, or -1 if the network was not found
|
|
|
|
*/
|
|
|
|
int wpa_config_remove_network(struct wpa_config *config, int id)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid, *prev = NULL;
|
|
|
|
|
|
|
|
ssid = config->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
if (id == ssid->id)
|
|
|
|
break;
|
|
|
|
prev = ssid;
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = ssid->next;
|
|
|
|
else
|
|
|
|
config->ssid = ssid->next;
|
|
|
|
|
|
|
|
wpa_config_update_prio_list(config);
|
|
|
|
wpa_config_free_ssid(ssid);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_set_network_defaults - Set network default values
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
*/
|
|
|
|
void wpa_config_set_network_defaults(struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
ssid->proto = DEFAULT_PROTO;
|
|
|
|
ssid->pairwise_cipher = DEFAULT_PAIRWISE;
|
|
|
|
ssid->group_cipher = DEFAULT_GROUP;
|
|
|
|
ssid->key_mgmt = DEFAULT_KEY_MGMT;
|
2012-03-30 14:20:35 +02:00
|
|
|
ssid->bg_scan_period = DEFAULT_BG_SCAN_PERIOD;
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
ssid->eapol_flags = DEFAULT_EAPOL_FLAGS;
|
|
|
|
ssid->eap_workaround = DEFAULT_EAP_WORKAROUND;
|
|
|
|
ssid->eap.fragment_size = DEFAULT_FRAGMENT_SIZE;
|
2014-03-28 16:01:44 +01:00
|
|
|
ssid->eap.sim_num = DEFAULT_USER_SELECTED_SIM;
|
2008-02-28 02:34:43 +01:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
2014-09-01 06:23:36 +02:00
|
|
|
#ifdef CONFIG_MESH
|
2014-11-15 02:35:32 +01:00
|
|
|
ssid->dot11MeshMaxRetries = DEFAULT_MESH_MAX_RETRIES;
|
|
|
|
ssid->dot11MeshRetryTimeout = DEFAULT_MESH_RETRY_TIMEOUT;
|
|
|
|
ssid->dot11MeshConfirmTimeout = DEFAULT_MESH_CONFIRM_TIMEOUT;
|
|
|
|
ssid->dot11MeshHoldingTimeout = DEFAULT_MESH_HOLDING_TIMEOUT;
|
2014-09-01 06:23:36 +02:00
|
|
|
#endif /* CONFIG_MESH */
|
2012-01-29 20:01:31 +01:00
|
|
|
#ifdef CONFIG_HT_OVERRIDES
|
|
|
|
ssid->disable_ht = DEFAULT_DISABLE_HT;
|
|
|
|
ssid->disable_ht40 = DEFAULT_DISABLE_HT40;
|
2012-12-18 13:44:15 +01:00
|
|
|
ssid->disable_sgi = DEFAULT_DISABLE_SGI;
|
2014-04-01 07:16:00 +02:00
|
|
|
ssid->disable_ldpc = DEFAULT_DISABLE_LDPC;
|
2012-01-29 20:01:31 +01:00
|
|
|
ssid->disable_max_amsdu = DEFAULT_DISABLE_MAX_AMSDU;
|
|
|
|
ssid->ampdu_factor = DEFAULT_AMPDU_FACTOR;
|
|
|
|
ssid->ampdu_density = DEFAULT_AMPDU_DENSITY;
|
|
|
|
#endif /* CONFIG_HT_OVERRIDES */
|
2013-03-10 17:04:39 +01:00
|
|
|
#ifdef CONFIG_VHT_OVERRIDES
|
|
|
|
ssid->vht_rx_mcs_nss_1 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_2 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_3 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_4 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_5 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_6 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_7 = -1;
|
|
|
|
ssid->vht_rx_mcs_nss_8 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_1 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_2 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_3 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_4 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_5 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_6 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_7 = -1;
|
|
|
|
ssid->vht_tx_mcs_nss_8 = -1;
|
|
|
|
#endif /* CONFIG_VHT_OVERRIDES */
|
2012-11-12 19:07:53 +01:00
|
|
|
ssid->proactive_key_caching = -1;
|
2012-11-24 21:21:29 +01:00
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
ssid->ieee80211w = MGMT_FRAME_PROTECTION_DEFAULT;
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
2014-09-27 18:12:41 +02:00
|
|
|
ssid->mac_addr = -1;
|
2008-02-28 02:34:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_set - Set a variable in network configuration
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
* @var: Variable name, e.g., "ssid"
|
|
|
|
* @value: Variable value
|
|
|
|
* @line: Line number in configuration file or 0 if not used
|
|
|
|
* Returns: 0 on success, -1 on failure
|
|
|
|
*
|
|
|
|
* This function can be used to set network configuration variables based on
|
|
|
|
* both the configuration file and management interface input. The value
|
|
|
|
* parameter must be in the same format as the text-based configuration file is
|
|
|
|
* using. For example, strings are using double quotation marks.
|
|
|
|
*/
|
|
|
|
int wpa_config_set(struct wpa_ssid *ssid, const char *var, const char *value,
|
|
|
|
int line)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (ssid == NULL || var == NULL || value == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_SSID_FIELDS; i++) {
|
|
|
|
const struct parse_data *field = &ssid_fields[i];
|
|
|
|
if (os_strcmp(var, field->name) != 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (field->parser(field, ssid, line, value)) {
|
|
|
|
if (line) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: failed to "
|
|
|
|
"parse %s '%s'.", line, var, value);
|
|
|
|
}
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == NUM_SSID_FIELDS) {
|
|
|
|
if (line) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: unknown network field "
|
|
|
|
"'%s'.", line, var);
|
|
|
|
}
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-05 16:08:18 +02:00
|
|
|
int wpa_config_set_quoted(struct wpa_ssid *ssid, const char *var,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char *buf;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
len = os_strlen(value);
|
|
|
|
buf = os_malloc(len + 3);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
buf[0] = '"';
|
|
|
|
os_memcpy(buf + 1, value, len);
|
|
|
|
buf[len + 1] = '"';
|
|
|
|
buf[len + 2] = '\0';
|
|
|
|
ret = wpa_config_set(ssid, var, buf, 0);
|
|
|
|
os_free(buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-11 16:17:00 +01:00
|
|
|
/**
|
|
|
|
* wpa_config_get_all - Get all options from network configuration
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
* @get_keys: Determines if keys/passwords will be included in returned list
|
2011-02-02 16:00:12 +01:00
|
|
|
* (if they may be exported)
|
2009-11-11 16:17:00 +01:00
|
|
|
* Returns: %NULL terminated list of all set keys and their values in the form
|
|
|
|
* of [key1, val1, key2, val2, ... , NULL]
|
|
|
|
*
|
|
|
|
* This function can be used to get list of all configured network properties.
|
|
|
|
* The caller is responsible for freeing the returned list and all its
|
|
|
|
* elements.
|
|
|
|
*/
|
|
|
|
char ** wpa_config_get_all(struct wpa_ssid *ssid, int get_keys)
|
|
|
|
{
|
2015-04-04 10:52:03 +02:00
|
|
|
#ifdef NO_CONFIG_WRITE
|
|
|
|
return NULL;
|
|
|
|
#else /* NO_CONFIG_WRITE */
|
2009-11-11 16:17:00 +01:00
|
|
|
const struct parse_data *field;
|
|
|
|
char *key, *value;
|
|
|
|
size_t i;
|
|
|
|
char **props;
|
|
|
|
int fields_num;
|
|
|
|
|
2011-02-02 16:00:12 +01:00
|
|
|
get_keys = get_keys && ssid->export_keys;
|
|
|
|
|
2012-08-13 19:44:21 +02:00
|
|
|
props = os_calloc(2 * NUM_SSID_FIELDS + 1, sizeof(char *));
|
2009-11-11 16:17:00 +01:00
|
|
|
if (!props)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fields_num = 0;
|
|
|
|
for (i = 0; i < NUM_SSID_FIELDS; i++) {
|
|
|
|
field = &ssid_fields[i];
|
|
|
|
if (field->key_data && !get_keys)
|
|
|
|
continue;
|
|
|
|
value = field->writer(field, ssid);
|
2009-12-30 21:37:23 +01:00
|
|
|
if (value == NULL)
|
2009-11-11 16:17:00 +01:00
|
|
|
continue;
|
2009-12-30 21:37:23 +01:00
|
|
|
if (os_strlen(value) == 0) {
|
|
|
|
os_free(value);
|
|
|
|
continue;
|
|
|
|
}
|
2009-11-11 16:17:00 +01:00
|
|
|
|
|
|
|
key = os_strdup(field->name);
|
2009-12-30 21:37:23 +01:00
|
|
|
if (key == NULL) {
|
|
|
|
os_free(value);
|
2009-11-11 16:17:00 +01:00
|
|
|
goto err;
|
2009-12-30 21:37:23 +01:00
|
|
|
}
|
2009-11-11 16:17:00 +01:00
|
|
|
|
|
|
|
props[fields_num * 2] = key;
|
|
|
|
props[fields_num * 2 + 1] = value;
|
|
|
|
|
|
|
|
fields_num++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return props;
|
|
|
|
|
|
|
|
err:
|
|
|
|
value = *props;
|
|
|
|
while (value)
|
|
|
|
os_free(value++);
|
|
|
|
os_free(props);
|
|
|
|
return NULL;
|
2015-04-04 10:52:03 +02:00
|
|
|
#endif /* NO_CONFIG_WRITE */
|
2009-11-11 16:17:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifndef NO_CONFIG_WRITE
|
|
|
|
/**
|
|
|
|
* wpa_config_get - Get a variable in network configuration
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
* @var: Variable name, e.g., "ssid"
|
|
|
|
* Returns: Value of the variable or %NULL on failure
|
|
|
|
*
|
|
|
|
* This function can be used to get network configuration variables. The
|
|
|
|
* returned value is a copy of the configuration variable in text format, i.e,.
|
|
|
|
* the same format that the text-based configuration file and wpa_config_set()
|
|
|
|
* are using for the value. The caller is responsible for freeing the returned
|
|
|
|
* value.
|
|
|
|
*/
|
|
|
|
char * wpa_config_get(struct wpa_ssid *ssid, const char *var)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (ssid == NULL || var == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_SSID_FIELDS; i++) {
|
|
|
|
const struct parse_data *field = &ssid_fields[i];
|
|
|
|
if (os_strcmp(var, field->name) == 0)
|
|
|
|
return field->writer(field, ssid);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_get_no_key - Get a variable in network configuration (no keys)
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
* @var: Variable name, e.g., "ssid"
|
|
|
|
* Returns: Value of the variable or %NULL on failure
|
|
|
|
*
|
|
|
|
* This function can be used to get network configuration variable like
|
|
|
|
* wpa_config_get(). The only difference is that this functions does not expose
|
|
|
|
* key/password material from the configuration. In case a key/password field
|
|
|
|
* is requested, the returned value is an empty string or %NULL if the variable
|
|
|
|
* is not set or "*" if the variable is set (regardless of its value). The
|
|
|
|
* returned value is a copy of the configuration variable in text format, i.e,.
|
|
|
|
* the same format that the text-based configuration file and wpa_config_set()
|
|
|
|
* are using for the value. The caller is responsible for freeing the returned
|
|
|
|
* value.
|
|
|
|
*/
|
|
|
|
char * wpa_config_get_no_key(struct wpa_ssid *ssid, const char *var)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (ssid == NULL || var == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_SSID_FIELDS; i++) {
|
|
|
|
const struct parse_data *field = &ssid_fields[i];
|
|
|
|
if (os_strcmp(var, field->name) == 0) {
|
|
|
|
char *res = field->writer(field, ssid);
|
|
|
|
if (field->key_data) {
|
|
|
|
if (res && res[0]) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Do not allow "
|
|
|
|
"key_data field to be "
|
|
|
|
"exposed");
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(res);
|
2008-02-28 02:34:43 +01:00
|
|
|
return os_strdup("*");
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(res);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_update_psk - Update WPA PSK based on passphrase and SSID
|
|
|
|
* @ssid: Pointer to network configuration data
|
|
|
|
*
|
|
|
|
* This function must be called to update WPA PSK when either SSID or the
|
|
|
|
* passphrase has changed for the network configuration.
|
|
|
|
*/
|
|
|
|
void wpa_config_update_psk(struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
#ifndef CONFIG_NO_PBKDF2
|
2012-08-07 15:07:25 +02:00
|
|
|
pbkdf2_sha1(ssid->passphrase, ssid->ssid, ssid->ssid_len, 4096,
|
2008-02-28 02:34:43 +01:00
|
|
|
ssid->psk, PMK_LEN);
|
|
|
|
wpa_hexdump_key(MSG_MSGDUMP, "PSK (from passphrase)",
|
|
|
|
ssid->psk, PMK_LEN);
|
|
|
|
ssid->psk_set = 1;
|
|
|
|
#endif /* CONFIG_NO_PBKDF2 */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-08-08 19:31:41 +02:00
|
|
|
static int wpa_config_set_cred_req_conn_capab(struct wpa_cred *cred,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
u8 *proto;
|
|
|
|
int **port;
|
|
|
|
int *ports, *nports;
|
|
|
|
const char *pos;
|
|
|
|
unsigned int num_ports;
|
|
|
|
|
|
|
|
proto = os_realloc_array(cred->req_conn_capab_proto,
|
|
|
|
cred->num_req_conn_capab + 1, sizeof(u8));
|
|
|
|
if (proto == NULL)
|
|
|
|
return -1;
|
|
|
|
cred->req_conn_capab_proto = proto;
|
|
|
|
|
|
|
|
port = os_realloc_array(cred->req_conn_capab_port,
|
|
|
|
cred->num_req_conn_capab + 1, sizeof(int *));
|
|
|
|
if (port == NULL)
|
|
|
|
return -1;
|
|
|
|
cred->req_conn_capab_port = port;
|
|
|
|
|
|
|
|
proto[cred->num_req_conn_capab] = atoi(value);
|
|
|
|
|
|
|
|
pos = os_strchr(value, ':');
|
|
|
|
if (pos == NULL) {
|
|
|
|
port[cred->num_req_conn_capab] = NULL;
|
|
|
|
cred->num_req_conn_capab++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
ports = NULL;
|
|
|
|
num_ports = 0;
|
|
|
|
|
|
|
|
while (*pos) {
|
|
|
|
nports = os_realloc_array(ports, num_ports + 1, sizeof(int));
|
|
|
|
if (nports == NULL) {
|
|
|
|
os_free(ports);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ports = nports;
|
|
|
|
ports[num_ports++] = atoi(pos);
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
nports = os_realloc_array(ports, num_ports + 1, sizeof(int));
|
|
|
|
if (nports == NULL) {
|
|
|
|
os_free(ports);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ports = nports;
|
|
|
|
ports[num_ports] = -1;
|
|
|
|
|
|
|
|
port[cred->num_req_conn_capab] = ports;
|
|
|
|
cred->num_req_conn_capab++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
int wpa_config_set_cred(struct wpa_cred *cred, const char *var,
|
|
|
|
const char *value, int line)
|
|
|
|
{
|
|
|
|
char *val;
|
|
|
|
size_t len;
|
|
|
|
|
2013-12-30 14:43:55 +01:00
|
|
|
if (os_strcmp(var, "temporary") == 0) {
|
|
|
|
cred->temporary = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:37:21 +01:00
|
|
|
if (os_strcmp(var, "priority") == 0) {
|
|
|
|
cred->priority = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-29 18:14:40 +01:00
|
|
|
if (os_strcmp(var, "sp_priority") == 0) {
|
|
|
|
int prio = atoi(value);
|
|
|
|
if (prio < 0 || prio > 255)
|
|
|
|
return -1;
|
|
|
|
cred->sp_priority = prio;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-04 15:02:56 +01:00
|
|
|
if (os_strcmp(var, "pcsc") == 0) {
|
|
|
|
cred->pcsc = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-02 17:40:45 +02:00
|
|
|
if (os_strcmp(var, "eap") == 0) {
|
|
|
|
struct eap_method_type method;
|
|
|
|
method.method = eap_peer_get_type(value, &method.vendor);
|
|
|
|
if (method.vendor == EAP_VENDOR_IETF &&
|
|
|
|
method.method == EAP_TYPE_NONE) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: unknown EAP type '%s' "
|
|
|
|
"for a credential", line, value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_free(cred->eap_method);
|
|
|
|
cred->eap_method = os_malloc(sizeof(*cred->eap_method));
|
|
|
|
if (cred->eap_method == NULL)
|
|
|
|
return -1;
|
|
|
|
os_memcpy(cred->eap_method, &method, sizeof(method));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-03 21:12:55 +02:00
|
|
|
if (os_strcmp(var, "password") == 0 &&
|
|
|
|
os_strncmp(value, "ext:", 4) == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->password);
|
2012-08-03 21:12:55 +02:00
|
|
|
cred->password = os_strdup(value);
|
|
|
|
cred->ext_password = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-02 11:08:11 +01:00
|
|
|
if (os_strcmp(var, "update_identifier") == 0) {
|
|
|
|
cred->update_identifier = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-06 00:06:44 +02:00
|
|
|
if (os_strcmp(var, "min_dl_bandwidth_home") == 0) {
|
|
|
|
cred->min_dl_bandwidth_home = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_ul_bandwidth_home") == 0) {
|
|
|
|
cred->min_ul_bandwidth_home = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_dl_bandwidth_roaming") == 0) {
|
|
|
|
cred->min_dl_bandwidth_roaming = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_ul_bandwidth_roaming") == 0) {
|
|
|
|
cred->min_ul_bandwidth_roaming = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-06 15:14:25 +02:00
|
|
|
if (os_strcmp(var, "max_bss_load") == 0) {
|
|
|
|
cred->max_bss_load = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-08 19:31:41 +02:00
|
|
|
if (os_strcmp(var, "req_conn_capab") == 0)
|
|
|
|
return wpa_config_set_cred_req_conn_capab(cred, value);
|
|
|
|
|
2013-12-09 02:30:01 +01:00
|
|
|
if (os_strcmp(var, "ocsp") == 0) {
|
|
|
|
cred->ocsp = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-28 16:01:44 +01:00
|
|
|
if (os_strcmp(var, "sim_num") == 0) {
|
|
|
|
cred->sim_num = atoi(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
val = wpa_config_parse_string(value, &len);
|
2012-02-16 15:38:10 +01:00
|
|
|
if (val == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid field '%s' string "
|
|
|
|
"value '%s'.", line, var, value);
|
2012-02-16 15:34:22 +01:00
|
|
|
return -1;
|
2012-02-16 15:38:10 +01:00
|
|
|
}
|
2012-02-16 15:34:22 +01:00
|
|
|
|
|
|
|
if (os_strcmp(var, "realm") == 0) {
|
|
|
|
os_free(cred->realm);
|
|
|
|
cred->realm = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "username") == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->username);
|
2012-02-16 15:34:22 +01:00
|
|
|
cred->username = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "password") == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->password);
|
2012-02-16 15:34:22 +01:00
|
|
|
cred->password = val;
|
2012-08-03 21:12:55 +02:00
|
|
|
cred->ext_password = 0;
|
2012-02-16 15:34:22 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "ca_cert") == 0) {
|
|
|
|
os_free(cred->ca_cert);
|
|
|
|
cred->ca_cert = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-29 15:40:17 +01:00
|
|
|
if (os_strcmp(var, "client_cert") == 0) {
|
|
|
|
os_free(cred->client_cert);
|
|
|
|
cred->client_cert = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "private_key") == 0) {
|
|
|
|
os_free(cred->private_key);
|
|
|
|
cred->private_key = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "private_key_passwd") == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->private_key_passwd);
|
2012-02-29 15:40:17 +01:00
|
|
|
cred->private_key_passwd = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
if (os_strcmp(var, "imsi") == 0) {
|
|
|
|
os_free(cred->imsi);
|
|
|
|
cred->imsi = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "milenage") == 0) {
|
2014-06-30 00:32:07 +02:00
|
|
|
str_clear_free(cred->milenage);
|
2012-02-16 15:34:22 +01:00
|
|
|
cred->milenage = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-07 03:14:51 +02:00
|
|
|
if (os_strcmp(var, "domain_suffix_match") == 0) {
|
|
|
|
os_free(cred->domain_suffix_match);
|
|
|
|
cred->domain_suffix_match = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
if (os_strcmp(var, "domain") == 0) {
|
2013-08-02 17:42:54 +02:00
|
|
|
char **new_domain;
|
|
|
|
new_domain = os_realloc_array(cred->domain,
|
|
|
|
cred->num_domain + 1,
|
|
|
|
sizeof(char *));
|
|
|
|
if (new_domain == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
new_domain[cred->num_domain++] = val;
|
|
|
|
cred->domain = new_domain;
|
2012-02-16 15:34:22 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-02 17:40:45 +02:00
|
|
|
if (os_strcmp(var, "phase1") == 0) {
|
|
|
|
os_free(cred->phase1);
|
|
|
|
cred->phase1 = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "phase2") == 0) {
|
|
|
|
os_free(cred->phase2);
|
|
|
|
cred->phase2 = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-02 17:48:31 +02:00
|
|
|
if (os_strcmp(var, "roaming_consortium") == 0) {
|
|
|
|
if (len < 3 || len > sizeof(cred->roaming_consortium)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid "
|
|
|
|
"roaming_consortium length %d (3..15 "
|
|
|
|
"expected)", line, (int) len);
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_memcpy(cred->roaming_consortium, val, len);
|
|
|
|
cred->roaming_consortium_len = len;
|
|
|
|
os_free(val);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-30 06:34:47 +01:00
|
|
|
if (os_strcmp(var, "required_roaming_consortium") == 0) {
|
|
|
|
if (len < 3 || len > sizeof(cred->required_roaming_consortium))
|
|
|
|
{
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid "
|
|
|
|
"required_roaming_consortium length %d "
|
|
|
|
"(3..15 expected)", line, (int) len);
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_memcpy(cred->required_roaming_consortium, val, len);
|
|
|
|
cred->required_roaming_consortium_len = len;
|
|
|
|
os_free(val);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-12-16 11:01:50 +01:00
|
|
|
if (os_strcmp(var, "excluded_ssid") == 0) {
|
|
|
|
struct excluded_ssid *e;
|
|
|
|
|
2015-04-07 11:44:39 +02:00
|
|
|
if (len > SSID_MAX_LEN) {
|
2012-12-16 11:01:50 +01:00
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid "
|
|
|
|
"excluded_ssid length %d", line, (int) len);
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
e = os_realloc_array(cred->excluded_ssid,
|
|
|
|
cred->num_excluded_ssid + 1,
|
|
|
|
sizeof(struct excluded_ssid));
|
|
|
|
if (e == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cred->excluded_ssid = e;
|
|
|
|
|
|
|
|
e = &cred->excluded_ssid[cred->num_excluded_ssid++];
|
|
|
|
os_memcpy(e->ssid, val, len);
|
|
|
|
e->ssid_len = len;
|
|
|
|
|
|
|
|
os_free(val);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-12-06 07:48:18 +01:00
|
|
|
if (os_strcmp(var, "roaming_partner") == 0) {
|
|
|
|
struct roaming_partner *p;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
p = os_realloc_array(cred->roaming_partner,
|
|
|
|
cred->num_roaming_partner + 1,
|
|
|
|
sizeof(struct roaming_partner));
|
|
|
|
if (p == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cred->roaming_partner = p;
|
|
|
|
|
|
|
|
p = &cred->roaming_partner[cred->num_roaming_partner];
|
|
|
|
|
|
|
|
pos = os_strchr(val, ',');
|
|
|
|
if (pos == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (pos - val - 1 >= (int) sizeof(p->fqdn)) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_memcpy(p->fqdn, val, pos - val);
|
|
|
|
|
|
|
|
p->exact_match = atoi(pos);
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
p->priority = atoi(pos);
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (os_strlen(pos) >= sizeof(p->country)) {
|
|
|
|
os_free(val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_memcpy(p->country, pos, os_strlen(pos) + 1);
|
|
|
|
|
|
|
|
cred->num_roaming_partner++;
|
|
|
|
os_free(val);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-02 18:09:11 +02:00
|
|
|
if (os_strcmp(var, "provisioning_sp") == 0) {
|
|
|
|
os_free(cred->provisioning_sp);
|
|
|
|
cred->provisioning_sp = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
if (line) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: unknown cred field '%s'.",
|
|
|
|
line, var);
|
|
|
|
}
|
|
|
|
|
2012-02-19 13:29:38 +01:00
|
|
|
os_free(val);
|
|
|
|
|
2012-02-16 15:34:22 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-02 12:03:22 +02:00
|
|
|
static char * alloc_int_str(int val)
|
2014-04-04 19:10:49 +02:00
|
|
|
{
|
2014-12-06 20:40:31 +01:00
|
|
|
const unsigned int bufsize = 20;
|
2014-04-04 19:10:49 +02:00
|
|
|
char *buf;
|
2014-12-06 20:40:31 +01:00
|
|
|
int res;
|
2014-04-04 19:10:49 +02:00
|
|
|
|
2014-12-06 20:40:31 +01:00
|
|
|
buf = os_malloc(bufsize);
|
2014-04-04 19:10:49 +02:00
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
2014-12-06 20:40:31 +01:00
|
|
|
res = os_snprintf(buf, bufsize, "%d", val);
|
|
|
|
if (os_snprintf_error(bufsize, res)) {
|
|
|
|
os_free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-02 12:03:22 +02:00
|
|
|
static char * alloc_strdup(const char *str)
|
2014-04-04 19:10:49 +02:00
|
|
|
{
|
|
|
|
if (str == NULL)
|
|
|
|
return NULL;
|
|
|
|
return os_strdup(str);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char * wpa_config_get_cred_no_key(struct wpa_cred *cred, const char *var)
|
|
|
|
{
|
|
|
|
if (os_strcmp(var, "temporary") == 0)
|
|
|
|
return alloc_int_str(cred->temporary);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "priority") == 0)
|
|
|
|
return alloc_int_str(cred->priority);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "sp_priority") == 0)
|
|
|
|
return alloc_int_str(cred->sp_priority);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "pcsc") == 0)
|
|
|
|
return alloc_int_str(cred->pcsc);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "eap") == 0) {
|
|
|
|
if (!cred->eap_method)
|
|
|
|
return NULL;
|
|
|
|
return alloc_strdup(eap_get_name(cred->eap_method[0].vendor,
|
|
|
|
cred->eap_method[0].method));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "update_identifier") == 0)
|
|
|
|
return alloc_int_str(cred->update_identifier);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_dl_bandwidth_home") == 0)
|
|
|
|
return alloc_int_str(cred->min_dl_bandwidth_home);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_ul_bandwidth_home") == 0)
|
|
|
|
return alloc_int_str(cred->min_ul_bandwidth_home);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_dl_bandwidth_roaming") == 0)
|
|
|
|
return alloc_int_str(cred->min_dl_bandwidth_roaming);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "min_ul_bandwidth_roaming") == 0)
|
|
|
|
return alloc_int_str(cred->min_ul_bandwidth_roaming);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "max_bss_load") == 0)
|
|
|
|
return alloc_int_str(cred->max_bss_load);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "req_conn_capab") == 0) {
|
|
|
|
unsigned int i;
|
|
|
|
char *buf, *end, *pos;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!cred->num_req_conn_capab)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
buf = os_malloc(4000);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
pos = buf;
|
|
|
|
end = pos + 4000;
|
|
|
|
for (i = 0; i < cred->num_req_conn_capab; i++) {
|
|
|
|
int *ports;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%u",
|
|
|
|
i > 0 ? "\n" : "",
|
|
|
|
cred->req_conn_capab_proto[i]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ports = cred->req_conn_capab_port[i];
|
|
|
|
if (ports) {
|
|
|
|
int j;
|
|
|
|
for (j = 0; ports[j] != -1; j++) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"%s%d",
|
|
|
|
j > 0 ? "," : ":",
|
|
|
|
ports[j]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "ocsp") == 0)
|
|
|
|
return alloc_int_str(cred->ocsp);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "realm") == 0)
|
|
|
|
return alloc_strdup(cred->realm);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "username") == 0)
|
|
|
|
return alloc_strdup(cred->username);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "password") == 0) {
|
|
|
|
if (!cred->password)
|
|
|
|
return NULL;
|
|
|
|
return alloc_strdup("*");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "ca_cert") == 0)
|
|
|
|
return alloc_strdup(cred->ca_cert);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "client_cert") == 0)
|
|
|
|
return alloc_strdup(cred->client_cert);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "private_key") == 0)
|
|
|
|
return alloc_strdup(cred->private_key);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "private_key_passwd") == 0) {
|
|
|
|
if (!cred->private_key_passwd)
|
|
|
|
return NULL;
|
|
|
|
return alloc_strdup("*");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "imsi") == 0)
|
|
|
|
return alloc_strdup(cred->imsi);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "milenage") == 0) {
|
|
|
|
if (!(cred->milenage))
|
|
|
|
return NULL;
|
|
|
|
return alloc_strdup("*");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "domain_suffix_match") == 0)
|
|
|
|
return alloc_strdup(cred->domain_suffix_match);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "domain") == 0) {
|
|
|
|
unsigned int i;
|
|
|
|
char *buf, *end, *pos;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!cred->num_domain)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
buf = os_malloc(4000);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
pos = buf;
|
|
|
|
end = pos + 4000;
|
|
|
|
|
|
|
|
for (i = 0; i < cred->num_domain; i++) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
|
|
|
i > 0 ? "\n" : "", cred->domain[i]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "phase1") == 0)
|
|
|
|
return alloc_strdup(cred->phase1);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "phase2") == 0)
|
|
|
|
return alloc_strdup(cred->phase2);
|
|
|
|
|
|
|
|
if (os_strcmp(var, "roaming_consortium") == 0) {
|
|
|
|
size_t buflen;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
if (!cred->roaming_consortium_len)
|
|
|
|
return NULL;
|
|
|
|
buflen = cred->roaming_consortium_len * 2 + 1;
|
|
|
|
buf = os_malloc(buflen);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
wpa_snprintf_hex(buf, buflen, cred->roaming_consortium,
|
|
|
|
cred->roaming_consortium_len);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "required_roaming_consortium") == 0) {
|
|
|
|
size_t buflen;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
if (!cred->required_roaming_consortium_len)
|
|
|
|
return NULL;
|
|
|
|
buflen = cred->required_roaming_consortium_len * 2 + 1;
|
|
|
|
buf = os_malloc(buflen);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
wpa_snprintf_hex(buf, buflen, cred->required_roaming_consortium,
|
|
|
|
cred->required_roaming_consortium_len);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "excluded_ssid") == 0) {
|
|
|
|
unsigned int i;
|
|
|
|
char *buf, *end, *pos;
|
|
|
|
|
|
|
|
if (!cred->num_excluded_ssid)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
buf = os_malloc(4000);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
pos = buf;
|
|
|
|
end = pos + 4000;
|
|
|
|
|
|
|
|
for (i = 0; i < cred->num_excluded_ssid; i++) {
|
|
|
|
struct excluded_ssid *e;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
e = &cred->excluded_ssid[i];
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
|
|
|
i > 0 ? "\n" : "",
|
|
|
|
wpa_ssid_txt(e->ssid, e->ssid_len));
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "roaming_partner") == 0) {
|
|
|
|
unsigned int i;
|
|
|
|
char *buf, *end, *pos;
|
|
|
|
|
|
|
|
if (!cred->num_roaming_partner)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
buf = os_malloc(4000);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
pos = buf;
|
|
|
|
end = pos + 4000;
|
|
|
|
|
|
|
|
for (i = 0; i < cred->num_roaming_partner; i++) {
|
|
|
|
struct roaming_partner *p;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
p = &cred->roaming_partner[i];
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s,%d,%u,%s",
|
|
|
|
i > 0 ? "\n" : "",
|
|
|
|
p->fqdn, p->exact_match, p->priority,
|
|
|
|
p->country);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-04-04 19:10:49 +02:00
|
|
|
return buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(var, "provisioning_sp") == 0)
|
|
|
|
return alloc_strdup(cred->provisioning_sp);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 15:36:00 +01:00
|
|
|
struct wpa_cred * wpa_config_get_cred(struct wpa_config *config, int id)
|
|
|
|
{
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
|
|
|
|
cred = config->cred;
|
|
|
|
while (cred) {
|
|
|
|
if (id == cred->id)
|
|
|
|
break;
|
|
|
|
cred = cred->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cred;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct wpa_cred * wpa_config_add_cred(struct wpa_config *config)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_cred *cred, *last = NULL;
|
|
|
|
|
|
|
|
id = -1;
|
|
|
|
cred = config->cred;
|
|
|
|
while (cred) {
|
|
|
|
if (cred->id > id)
|
|
|
|
id = cred->id;
|
|
|
|
last = cred;
|
|
|
|
cred = cred->next;
|
|
|
|
}
|
|
|
|
id++;
|
|
|
|
|
|
|
|
cred = os_zalloc(sizeof(*cred));
|
|
|
|
if (cred == NULL)
|
|
|
|
return NULL;
|
|
|
|
cred->id = id;
|
2014-03-28 16:01:44 +01:00
|
|
|
cred->sim_num = DEFAULT_USER_SELECTED_SIM;
|
2012-02-16 15:36:00 +01:00
|
|
|
if (last)
|
|
|
|
last->next = cred;
|
|
|
|
else
|
|
|
|
config->cred = cred;
|
|
|
|
|
|
|
|
return cred;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int wpa_config_remove_cred(struct wpa_config *config, int id)
|
|
|
|
{
|
|
|
|
struct wpa_cred *cred, *prev = NULL;
|
|
|
|
|
|
|
|
cred = config->cred;
|
|
|
|
while (cred) {
|
|
|
|
if (id == cred->id)
|
|
|
|
break;
|
|
|
|
prev = cred;
|
|
|
|
cred = cred->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cred == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = cred->next;
|
|
|
|
else
|
|
|
|
config->cred = cred->next;
|
|
|
|
|
|
|
|
wpa_config_free_cred(cred);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-28 02:34:43 +01:00
|
|
|
#ifndef CONFIG_NO_CONFIG_BLOBS
|
|
|
|
/**
|
|
|
|
* wpa_config_get_blob - Get a named configuration blob
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @name: Name of the blob
|
|
|
|
* Returns: Pointer to blob data or %NULL if not found
|
|
|
|
*/
|
|
|
|
const struct wpa_config_blob * wpa_config_get_blob(struct wpa_config *config,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
struct wpa_config_blob *blob = config->blobs;
|
|
|
|
|
|
|
|
while (blob) {
|
|
|
|
if (os_strcmp(blob->name, name) == 0)
|
|
|
|
return blob;
|
|
|
|
blob = blob->next;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_set_blob - Set or add a named configuration blob
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @blob: New value for the blob
|
|
|
|
*
|
|
|
|
* Adds a new configuration blob or replaces the current value of an existing
|
|
|
|
* blob.
|
|
|
|
*/
|
|
|
|
void wpa_config_set_blob(struct wpa_config *config,
|
|
|
|
struct wpa_config_blob *blob)
|
|
|
|
{
|
|
|
|
wpa_config_remove_blob(config, blob->name);
|
|
|
|
blob->next = config->blobs;
|
|
|
|
config->blobs = blob;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_free_blob - Free blob data
|
|
|
|
* @blob: Pointer to blob to be freed
|
|
|
|
*/
|
|
|
|
void wpa_config_free_blob(struct wpa_config_blob *blob)
|
|
|
|
{
|
|
|
|
if (blob) {
|
|
|
|
os_free(blob->name);
|
2014-06-30 00:32:07 +02:00
|
|
|
bin_clear_free(blob->data, blob->len);
|
2008-02-28 02:34:43 +01:00
|
|
|
os_free(blob);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_remove_blob - Remove a named configuration blob
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
* @name: Name of the blob to remove
|
|
|
|
* Returns: 0 if blob was removed or -1 if blob was not found
|
|
|
|
*/
|
|
|
|
int wpa_config_remove_blob(struct wpa_config *config, const char *name)
|
|
|
|
{
|
|
|
|
struct wpa_config_blob *pos = config->blobs, *prev = NULL;
|
|
|
|
|
|
|
|
while (pos) {
|
|
|
|
if (os_strcmp(pos->name, name) == 0) {
|
|
|
|
if (prev)
|
|
|
|
prev->next = pos->next;
|
|
|
|
else
|
|
|
|
config->blobs = pos->next;
|
|
|
|
wpa_config_free_blob(pos);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
prev = pos;
|
|
|
|
pos = pos->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_CONFIG_BLOBS */
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpa_config_alloc_empty - Allocate an empty configuration
|
|
|
|
* @ctrl_interface: Control interface parameters, e.g., path to UNIX domain
|
|
|
|
* socket
|
|
|
|
* @driver_param: Driver parameters
|
|
|
|
* Returns: Pointer to allocated configuration data or %NULL on failure
|
|
|
|
*/
|
|
|
|
struct wpa_config * wpa_config_alloc_empty(const char *ctrl_interface,
|
|
|
|
const char *driver_param)
|
|
|
|
{
|
|
|
|
struct wpa_config *config;
|
2012-08-12 10:34:07 +02:00
|
|
|
const int aCWmin = 4, aCWmax = 10;
|
|
|
|
const struct hostapd_wmm_ac_params ac_bk =
|
|
|
|
{ aCWmin, aCWmax, 7, 0, 0 }; /* background traffic */
|
|
|
|
const struct hostapd_wmm_ac_params ac_be =
|
|
|
|
{ aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */
|
|
|
|
const struct hostapd_wmm_ac_params ac_vi = /* video traffic */
|
2012-08-12 10:36:45 +02:00
|
|
|
{ aCWmin - 1, aCWmin, 2, 3000 / 32, 0 };
|
2012-08-12 10:34:07 +02:00
|
|
|
const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */
|
2012-08-12 10:36:45 +02:00
|
|
|
{ aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 0 };
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
config = os_zalloc(sizeof(*config));
|
|
|
|
if (config == NULL)
|
|
|
|
return NULL;
|
|
|
|
config->eapol_version = DEFAULT_EAPOL_VERSION;
|
|
|
|
config->ap_scan = DEFAULT_AP_SCAN;
|
2014-09-01 06:23:26 +02:00
|
|
|
config->user_mpm = DEFAULT_USER_MPM;
|
2014-12-19 06:59:52 +01:00
|
|
|
config->max_peer_links = DEFAULT_MAX_PEER_LINKS;
|
2015-01-16 10:29:17 +01:00
|
|
|
config->mesh_max_inactivity = DEFAULT_MESH_MAX_INACTIVITY;
|
2015-07-08 15:41:36 +02:00
|
|
|
config->dot11RSNASAERetransPeriod =
|
|
|
|
DEFAULT_DOT11_RSNA_SAE_RETRANS_PERIOD;
|
2008-02-28 02:34:43 +01:00
|
|
|
config->fast_reauth = DEFAULT_FAST_REAUTH;
|
2010-07-18 23:30:24 +02:00
|
|
|
config->p2p_go_intent = DEFAULT_P2P_GO_INTENT;
|
2010-09-08 20:18:10 +02:00
|
|
|
config->p2p_intra_bss = DEFAULT_P2P_INTRA_BSS;
|
2015-07-27 21:24:19 +02:00
|
|
|
config->p2p_go_freq_change_policy = DEFAULT_P2P_GO_FREQ_MOVE;
|
2012-08-10 15:28:38 +02:00
|
|
|
config->p2p_go_max_inactivity = DEFAULT_P2P_GO_MAX_INACTIVITY;
|
2014-05-19 09:05:39 +02:00
|
|
|
config->p2p_optimize_listen_chan = DEFAULT_P2P_OPTIMIZE_LISTEN_CHAN;
|
2015-02-18 03:35:12 +01:00
|
|
|
config->p2p_go_ctwindow = DEFAULT_P2P_GO_CTWINDOW;
|
2010-03-05 19:20:09 +01:00
|
|
|
config->bss_max_count = DEFAULT_BSS_MAX_COUNT;
|
2011-03-20 11:40:59 +01:00
|
|
|
config->bss_expiration_age = DEFAULT_BSS_EXPIRATION_AGE;
|
|
|
|
config->bss_expiration_scan_count = DEFAULT_BSS_EXPIRATION_SCAN_COUNT;
|
2010-10-19 16:08:20 +02:00
|
|
|
config->max_num_sta = DEFAULT_MAX_NUM_STA;
|
2011-10-21 11:44:29 +02:00
|
|
|
config->access_network_type = DEFAULT_ACCESS_NETWORK_TYPE;
|
2013-05-09 11:43:40 +02:00
|
|
|
config->scan_cur_freq = DEFAULT_SCAN_CUR_FREQ;
|
2012-08-12 10:34:07 +02:00
|
|
|
config->wmm_ac_params[0] = ac_be;
|
|
|
|
config->wmm_ac_params[1] = ac_bk;
|
|
|
|
config->wmm_ac_params[2] = ac_vi;
|
|
|
|
config->wmm_ac_params[3] = ac_vo;
|
2014-06-09 18:43:26 +02:00
|
|
|
config->p2p_search_delay = DEFAULT_P2P_SEARCH_DELAY;
|
2014-09-27 18:12:41 +02:00
|
|
|
config->rand_addr_lifetime = DEFAULT_RAND_ADDR_LIFETIME;
|
2014-10-23 17:21:49 +02:00
|
|
|
config->key_mgmt_offload = DEFAULT_KEY_MGMT_OFFLOAD;
|
2015-01-14 11:14:31 +01:00
|
|
|
config->cert_in_cb = DEFAULT_CERT_IN_CB;
|
2015-10-14 11:26:33 +02:00
|
|
|
config->wpa_rsc_relaxation = DEFAULT_WPA_RSC_RELAXATION;
|
2008-02-28 02:34:43 +01:00
|
|
|
|
|
|
|
if (ctrl_interface)
|
|
|
|
config->ctrl_interface = os_strdup(ctrl_interface);
|
|
|
|
if (driver_param)
|
|
|
|
config->driver_param = os_strdup(driver_param);
|
|
|
|
|
|
|
|
return config;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef CONFIG_NO_STDOUT_DEBUG
|
|
|
|
/**
|
|
|
|
* wpa_config_debug_dump_networks - Debug dump of configured networks
|
|
|
|
* @config: Configuration data from wpa_config_read()
|
|
|
|
*/
|
|
|
|
void wpa_config_debug_dump_networks(struct wpa_config *config)
|
|
|
|
{
|
|
|
|
int prio;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
for (prio = 0; prio < config->num_prio; prio++) {
|
|
|
|
ssid = config->pssid[prio];
|
|
|
|
wpa_printf(MSG_DEBUG, "Priority group %d",
|
|
|
|
ssid->priority);
|
|
|
|
while (ssid) {
|
|
|
|
wpa_printf(MSG_DEBUG, " id=%d ssid='%s'",
|
|
|
|
ssid->id,
|
|
|
|
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
|
|
|
|
ssid = ssid->pnext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_STDOUT_DEBUG */
|
2010-07-18 23:30:24 +02:00
|
|
|
|
|
|
|
|
|
|
|
struct global_parse_data {
|
|
|
|
char *name;
|
|
|
|
int (*parser)(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *value);
|
2015-01-28 00:22:06 +01:00
|
|
|
int (*get)(const char *name, struct wpa_config *config, long offset,
|
|
|
|
char *buf, size_t buflen, int pretty_print);
|
2010-07-18 23:30:24 +02:00
|
|
|
void *param1, *param2, *param3;
|
2010-07-18 23:30:24 +02:00
|
|
|
unsigned int changed_flag;
|
2010-07-18 23:30:24 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_global_config_parse_int(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
2013-03-10 16:55:24 +01:00
|
|
|
int val, *dst;
|
|
|
|
char *end;
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
dst = (int *) (((u8 *) config) + (long) data->param1);
|
2013-03-10 16:55:24 +01:00
|
|
|
val = strtol(pos, &end, 0);
|
|
|
|
if (*end) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid number \"%s\"",
|
|
|
|
line, pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*dst = val;
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
wpa_printf(MSG_DEBUG, "%s=%d", data->name, *dst);
|
|
|
|
|
|
|
|
if (data->param2 && *dst < (long) data->param2) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too small %s (value=%d "
|
|
|
|
"min_value=%ld)", line, data->name, *dst,
|
|
|
|
(long) data->param2);
|
|
|
|
*dst = (long) data->param2;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->param3 && *dst > (long) data->param3) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too large %s (value=%d "
|
|
|
|
"max_value=%ld)", line, data->name, *dst,
|
|
|
|
(long) data->param3);
|
|
|
|
*dst = (long) data->param3;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_global_config_parse_str(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char **dst, *tmp;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (data->param2 && len < (size_t) data->param2) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too short %s (len=%lu "
|
|
|
|
"min_len=%ld)", line, data->name,
|
|
|
|
(unsigned long) len, (long) data->param2);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->param3 && len > (size_t) data->param3) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too long %s (len=%lu "
|
|
|
|
"max_len=%ld)", line, data->name,
|
|
|
|
(unsigned long) len, (long) data->param3);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = os_strdup(pos);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
dst = (char **) (((u8 *) config) + (long) data->param1);
|
|
|
|
os_free(*dst);
|
|
|
|
*dst = tmp;
|
|
|
|
wpa_printf(MSG_DEBUG, "%s='%s'", data->name, *dst);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-03 14:19:59 +01:00
|
|
|
static int wpa_config_process_bgscan(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char *tmp;
|
2014-01-28 08:32:35 +01:00
|
|
|
int res;
|
2013-11-03 14:19:59 +01:00
|
|
|
|
|
|
|
tmp = wpa_config_parse_string(pos, &len);
|
|
|
|
if (tmp == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: failed to parse %s",
|
|
|
|
line, data->name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-01-28 08:32:35 +01:00
|
|
|
res = wpa_global_config_parse_str(data, config, line, tmp);
|
|
|
|
os_free(tmp);
|
|
|
|
return res;
|
2013-11-03 14:19:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-27 17:56:41 +02:00
|
|
|
static int wpa_global_config_parse_bin(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf **dst, *tmp;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 0x01)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
tmp = wpabuf_alloc(len / 2);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(tmp, len / 2), len / 2)) {
|
|
|
|
wpabuf_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dst = (struct wpabuf **) (((u8 *) config) + (long) data->param1);
|
|
|
|
wpabuf_free(*dst);
|
|
|
|
*dst = tmp;
|
|
|
|
wpa_printf(MSG_DEBUG, "%s", data->name);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-05 10:46:54 +02:00
|
|
|
static int wpa_config_process_freq_list(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *value)
|
|
|
|
{
|
|
|
|
int *freqs;
|
|
|
|
|
|
|
|
freqs = wpa_config_parse_int_array(value);
|
|
|
|
if (freqs == NULL)
|
|
|
|
return -1;
|
2013-09-23 15:22:16 +02:00
|
|
|
if (freqs[0] == 0) {
|
|
|
|
os_free(freqs);
|
|
|
|
freqs = NULL;
|
|
|
|
}
|
2013-05-05 10:46:54 +02:00
|
|
|
os_free(config->freq_list);
|
|
|
|
config->freq_list = freqs;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-16 18:13:31 +01:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
static int wpa_global_config_parse_ipv4(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
u32 *dst;
|
|
|
|
struct hostapd_ip_addr addr;
|
|
|
|
|
|
|
|
if (hostapd_parse_ip_addr(pos, &addr) < 0)
|
|
|
|
return -1;
|
|
|
|
if (addr.af != AF_INET)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
dst = (u32 *) (((u8 *) config) + (long) data->param1);
|
|
|
|
os_memcpy(dst, &addr.u.v4.s_addr, 4);
|
|
|
|
wpa_printf(MSG_DEBUG, "%s = 0x%x", data->name,
|
|
|
|
WPA_GET_BE32((u8 *) dst));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
static int wpa_config_process_country(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
if (!pos[0] || !pos[1]) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Invalid country set");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
config->country[0] = pos[0];
|
|
|
|
config->country[1] = pos[1];
|
|
|
|
wpa_printf(MSG_DEBUG, "country='%c%c'",
|
|
|
|
config->country[0], config->country[1]);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_process_load_dynamic_eap(
|
|
|
|
const struct global_parse_data *data, struct wpa_config *config,
|
|
|
|
int line, const char *so)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
wpa_printf(MSG_DEBUG, "load_dynamic_eap=%s", so);
|
|
|
|
ret = eap_peer_method_load(so);
|
|
|
|
if (ret == -2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "This EAP type was already loaded - not "
|
|
|
|
"reloading.");
|
|
|
|
} else if (ret) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Failed to load dynamic EAP "
|
|
|
|
"method '%s'.", line, so);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
|
|
|
|
static int wpa_config_process_uuid(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
char buf[40];
|
|
|
|
if (uuid_str2bin(pos, config->uuid)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid UUID", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
uuid_bin2str(config->uuid, buf, sizeof(buf));
|
|
|
|
wpa_printf(MSG_DEBUG, "uuid=%s", buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-17 17:50:22 +01:00
|
|
|
static int wpa_config_process_device_type(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
return wps_dev_type_str2bin(pos, config->device_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
static int wpa_config_process_os_version(const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line,
|
|
|
|
const char *pos)
|
|
|
|
{
|
|
|
|
if (hexstr2bin(pos, config->os_version, 4)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid os_version", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
wpa_printf(MSG_DEBUG, "os_version=%08x",
|
|
|
|
WPA_GET_BE32(config->os_version));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-03 23:08:57 +02:00
|
|
|
|
|
|
|
static int wpa_config_process_wps_vendor_ext_m1(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
struct wpabuf *tmp;
|
|
|
|
int len = os_strlen(pos) / 2;
|
|
|
|
u8 *p;
|
|
|
|
|
|
|
|
if (!len) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: "
|
|
|
|
"invalid wps_vendor_ext_m1", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = wpabuf_alloc(len);
|
|
|
|
if (tmp) {
|
|
|
|
p = wpabuf_put(tmp, len);
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, p, len)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: "
|
|
|
|
"invalid wps_vendor_ext_m1", line);
|
|
|
|
wpabuf_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpabuf_free(config->wps_vendor_ext_m1);
|
|
|
|
config->wps_vendor_ext_m1 = tmp;
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_ERROR, "Can not allocate "
|
|
|
|
"memory for wps_vendor_ext_m1");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
static int wpa_config_process_sec_device_type(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
|
2011-03-17 17:50:22 +01:00
|
|
|
if (config->num_sec_device_types >= MAX_SEC_DEVICE_TYPES) {
|
2010-07-18 23:30:24 +02:00
|
|
|
wpa_printf(MSG_ERROR, "Line %d: too many sec_device_type "
|
|
|
|
"items", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-03-17 17:50:22 +01:00
|
|
|
idx = config->num_sec_device_types;
|
|
|
|
|
|
|
|
if (wps_dev_type_str2bin(pos, config->sec_device_type[idx]))
|
2010-07-18 23:30:24 +02:00
|
|
|
return -1;
|
2011-03-17 17:50:22 +01:00
|
|
|
|
|
|
|
config->num_sec_device_types++;
|
2010-07-18 23:30:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2012-03-29 20:28:34 +02:00
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_process_p2p_pref_chan(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
struct p2p_channel *pref = NULL, *n;
|
|
|
|
unsigned int num = 0;
|
|
|
|
const char *pos2;
|
|
|
|
u8 op_class, chan;
|
|
|
|
|
|
|
|
/* format: class:chan,class:chan,... */
|
|
|
|
|
|
|
|
while (*pos) {
|
|
|
|
op_class = atoi(pos);
|
|
|
|
pos2 = os_strchr(pos, ':');
|
|
|
|
if (pos2 == NULL)
|
|
|
|
goto fail;
|
|
|
|
pos2++;
|
|
|
|
chan = atoi(pos2);
|
|
|
|
|
2012-08-13 20:21:23 +02:00
|
|
|
n = os_realloc_array(pref, num + 1,
|
|
|
|
sizeof(struct p2p_channel));
|
2012-03-29 20:28:34 +02:00
|
|
|
if (n == NULL)
|
|
|
|
goto fail;
|
|
|
|
pref = n;
|
|
|
|
pref[num].op_class = op_class;
|
|
|
|
pref[num].chan = chan;
|
|
|
|
num++;
|
|
|
|
|
|
|
|
pos = os_strchr(pos2, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(config->p2p_pref_chan);
|
|
|
|
config->p2p_pref_chan = pref;
|
|
|
|
config->num_p2p_pref_chan = num;
|
|
|
|
wpa_hexdump(MSG_DEBUG, "P2P: Preferred class/channel pairs",
|
|
|
|
(u8 *) config->p2p_pref_chan,
|
|
|
|
config->num_p2p_pref_chan * sizeof(struct p2p_channel));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
os_free(pref);
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid p2p_pref_chan list", line);
|
|
|
|
return -1;
|
|
|
|
}
|
2013-10-22 18:45:46 +02:00
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_process_p2p_no_go_freq(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = freq_range_list_parse(&config->p2p_no_go_freq, pos);
|
|
|
|
if (ret < 0) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid p2p_no_go_freq", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "P2P: p2p_no_go_freq with %u items",
|
|
|
|
config->p2p_no_go_freq.num);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
|
2011-09-27 22:15:05 +02:00
|
|
|
static int wpa_config_process_hessid(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
if (hwaddr_aton2(pos, config->hessid) < 0) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid hessid '%s'",
|
|
|
|
line, pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-01-01 15:23:47 +01:00
|
|
|
static int wpa_config_process_sae_groups(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
int *groups = wpa_config_parse_int_array(pos);
|
|
|
|
if (groups == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: Invalid sae_groups '%s'",
|
|
|
|
line, pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(config->sae_groups);
|
|
|
|
config->sae_groups = groups;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-21 14:52:41 +01:00
|
|
|
static int wpa_config_process_ap_vendor_elements(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
struct wpabuf *tmp;
|
|
|
|
int len = os_strlen(pos) / 2;
|
|
|
|
u8 *p;
|
|
|
|
|
|
|
|
if (!len) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid ap_vendor_elements",
|
|
|
|
line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = wpabuf_alloc(len);
|
|
|
|
if (tmp) {
|
|
|
|
p = wpabuf_put(tmp, len);
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, p, len)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid "
|
|
|
|
"ap_vendor_elements", line);
|
|
|
|
wpabuf_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpabuf_free(config->ap_vendor_elements);
|
|
|
|
config->ap_vendor_elements = tmp;
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_ERROR, "Cannot allocate memory for "
|
|
|
|
"ap_vendor_elements");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-27 22:42:37 +02:00
|
|
|
#ifdef CONFIG_CTRL_IFACE
|
2013-09-27 22:30:20 +02:00
|
|
|
static int wpa_config_process_no_ctrl_interface(
|
|
|
|
const struct global_parse_data *data,
|
|
|
|
struct wpa_config *config, int line, const char *pos)
|
|
|
|
{
|
|
|
|
wpa_printf(MSG_DEBUG, "no_ctrl_interface -> ctrl_interface=NULL");
|
|
|
|
os_free(config->ctrl_interface);
|
|
|
|
config->ctrl_interface = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
2013-09-27 22:42:37 +02:00
|
|
|
#endif /* CONFIG_CTRL_IFACE */
|
2013-09-27 22:30:20 +02:00
|
|
|
|
|
|
|
|
2015-01-28 00:22:06 +01:00
|
|
|
static int wpa_config_get_int(const char *name, struct wpa_config *config,
|
|
|
|
long offset, char *buf, size_t buflen,
|
|
|
|
int pretty_print)
|
|
|
|
{
|
|
|
|
int *val = (int *) (((u8 *) config) + (long) offset);
|
|
|
|
|
|
|
|
if (pretty_print)
|
|
|
|
return os_snprintf(buf, buflen, "%s=%d\n", name, *val);
|
|
|
|
return os_snprintf(buf, buflen, "%d", *val);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_config_get_str(const char *name, struct wpa_config *config,
|
|
|
|
long offset, char *buf, size_t buflen,
|
|
|
|
int pretty_print)
|
|
|
|
{
|
|
|
|
char **val = (char **) (((u8 *) config) + (long) offset);
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (pretty_print)
|
|
|
|
res = os_snprintf(buf, buflen, "%s=%s\n", name,
|
|
|
|
*val ? *val : "null");
|
|
|
|
else if (!*val)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
res = os_snprintf(buf, buflen, "%s", *val);
|
|
|
|
if (os_snprintf_error(buflen, res))
|
|
|
|
res = -1;
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-03-15 00:37:06 +01:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
static int wpa_config_get_ipv4(const char *name, struct wpa_config *config,
|
|
|
|
long offset, char *buf, size_t buflen,
|
|
|
|
int pretty_print)
|
|
|
|
{
|
|
|
|
void *val = ((u8 *) config) + (long) offset;
|
|
|
|
int res;
|
|
|
|
char addr[INET_ADDRSTRLEN];
|
|
|
|
|
|
|
|
if (!val || !inet_ntop(AF_INET, val, addr, sizeof(addr)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (pretty_print)
|
|
|
|
res = os_snprintf(buf, buflen, "%s=%s\n", name, addr);
|
|
|
|
else
|
|
|
|
res = os_snprintf(buf, buflen, "%s", addr);
|
|
|
|
|
|
|
|
if (os_snprintf_error(buflen, res))
|
|
|
|
res = -1;
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
#ifdef OFFSET
|
|
|
|
#undef OFFSET
|
|
|
|
#endif /* OFFSET */
|
|
|
|
/* OFFSET: Get offset of a variable within the wpa_config structure */
|
|
|
|
#define OFFSET(v) ((void *) &((struct wpa_config *) 0)->v)
|
|
|
|
|
2015-01-28 00:22:06 +01:00
|
|
|
#define FUNC(f) #f, wpa_config_process_ ## f, NULL, OFFSET(f), NULL, NULL
|
|
|
|
#define FUNC_NO_VAR(f) #f, wpa_config_process_ ## f, NULL, NULL, NULL, NULL
|
|
|
|
#define _INT(f) #f, wpa_global_config_parse_int, wpa_config_get_int, OFFSET(f)
|
2010-07-18 23:30:24 +02:00
|
|
|
#define INT(f) _INT(f), NULL, NULL
|
|
|
|
#define INT_RANGE(f, min, max) _INT(f), (void *) min, (void *) max
|
2015-01-28 00:22:06 +01:00
|
|
|
#define _STR(f) #f, wpa_global_config_parse_str, wpa_config_get_str, OFFSET(f)
|
2010-07-18 23:30:24 +02:00
|
|
|
#define STR(f) _STR(f), NULL, NULL
|
|
|
|
#define STR_RANGE(f, min, max) _STR(f), (void *) min, (void *) max
|
2015-01-28 00:22:06 +01:00
|
|
|
#define BIN(f) #f, wpa_global_config_parse_bin, NULL, OFFSET(f), NULL, NULL
|
2015-03-15 00:37:06 +01:00
|
|
|
#define IPV4(f) #f, wpa_global_config_parse_ipv4, wpa_config_get_ipv4, \
|
|
|
|
OFFSET(f), NULL, NULL
|
2010-07-18 23:30:24 +02:00
|
|
|
|
|
|
|
static const struct global_parse_data global_fields[] = {
|
|
|
|
#ifdef CONFIG_CTRL_IFACE
|
2010-07-18 23:30:24 +02:00
|
|
|
{ STR(ctrl_interface), 0 },
|
2013-09-27 22:30:20 +02:00
|
|
|
{ FUNC_NO_VAR(no_ctrl_interface), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
{ STR(ctrl_interface_group), 0 } /* deprecated */,
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_CTRL_IFACE */
|
2014-03-31 16:36:55 +02:00
|
|
|
#ifdef CONFIG_MACSEC
|
|
|
|
{ INT_RANGE(eapol_version, 1, 3), 0 },
|
|
|
|
#else /* CONFIG_MACSEC */
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT_RANGE(eapol_version, 1, 2), 0 },
|
2014-03-31 16:36:55 +02:00
|
|
|
#endif /* CONFIG_MACSEC */
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT(ap_scan), 0 },
|
2013-11-03 14:19:59 +01:00
|
|
|
{ FUNC(bgscan), 0 },
|
2014-09-01 06:23:26 +02:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
{ INT(user_mpm), 0 },
|
2014-12-19 06:59:52 +01:00
|
|
|
{ INT_RANGE(max_peer_links, 0, 255), 0 },
|
2015-01-16 10:29:17 +01:00
|
|
|
{ INT(mesh_max_inactivity), 0 },
|
2015-07-08 15:41:36 +02:00
|
|
|
{ INT(dot11RSNASAERetransPeriod), 0 },
|
2014-09-01 06:23:26 +02:00
|
|
|
#endif /* CONFIG_MESH */
|
2012-04-17 15:30:15 +02:00
|
|
|
{ INT(disable_scan_offload), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT(fast_reauth), 0 },
|
|
|
|
{ STR(opensc_engine_path), 0 },
|
|
|
|
{ STR(pkcs11_engine_path), 0 },
|
|
|
|
{ STR(pkcs11_module_path), 0 },
|
2014-10-12 10:53:51 +02:00
|
|
|
{ STR(openssl_ciphers), 0 },
|
2012-02-26 12:07:05 +01:00
|
|
|
{ STR(pcsc_reader), 0 },
|
|
|
|
{ STR(pcsc_pin), 0 },
|
2013-10-19 16:32:05 +02:00
|
|
|
{ INT(external_sim), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
{ STR(driver_param), 0 },
|
|
|
|
{ INT(dot11RSNAConfigPMKLifetime), 0 },
|
|
|
|
{ INT(dot11RSNAConfigPMKReauthThreshold), 0 },
|
|
|
|
{ INT(dot11RSNAConfigSATimeout), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
#ifndef CONFIG_NO_CONFIG_WRITE
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT(update_config), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_NO_CONFIG_WRITE */
|
2010-07-18 23:30:24 +02:00
|
|
|
{ FUNC_NO_VAR(load_dynamic_eap), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
#ifdef CONFIG_WPS
|
2010-07-18 23:30:24 +02:00
|
|
|
{ FUNC(uuid), CFG_CHANGED_UUID },
|
2015-04-07 11:04:58 +02:00
|
|
|
{ STR_RANGE(device_name, 0, WPS_DEV_NAME_MAX_LEN),
|
|
|
|
CFG_CHANGED_DEVICE_NAME },
|
2010-07-30 02:13:11 +02:00
|
|
|
{ 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 },
|
|
|
|
{ STR_RANGE(serial_number, 0, 32), CFG_CHANGED_WPS_STRING },
|
2011-03-17 17:50:22 +01:00
|
|
|
{ FUNC(device_type), CFG_CHANGED_DEVICE_TYPE },
|
2010-07-18 23:30:24 +02:00
|
|
|
{ FUNC(os_version), CFG_CHANGED_OS_VERSION },
|
|
|
|
{ STR(config_methods), CFG_CHANGED_CONFIG_METHODS },
|
|
|
|
{ INT_RANGE(wps_cred_processing, 0, 2), 0 },
|
2012-04-03 23:08:57 +02:00
|
|
|
{ FUNC(wps_vendor_ext_m1), CFG_CHANGED_VENDOR_EXTENSION },
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_WPS */
|
2010-07-18 23:30:24 +02:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
{ FUNC(sec_device_type), CFG_CHANGED_SEC_DEVICE_TYPE },
|
2015-07-31 06:54:04 +02:00
|
|
|
{ INT(p2p_listen_reg_class), CFG_CHANGED_P2P_LISTEN_CHANNEL },
|
|
|
|
{ INT(p2p_listen_channel), CFG_CHANGED_P2P_LISTEN_CHANNEL },
|
2013-09-10 07:14:27 +02:00
|
|
|
{ INT(p2p_oper_reg_class), CFG_CHANGED_P2P_OPER_CHANNEL },
|
|
|
|
{ INT(p2p_oper_channel), CFG_CHANGED_P2P_OPER_CHANNEL },
|
2010-07-18 23:30:24 +02:00
|
|
|
{ INT_RANGE(p2p_go_intent, 0, 15), 0 },
|
|
|
|
{ STR(p2p_ssid_postfix), CFG_CHANGED_P2P_SSID_POSTFIX },
|
|
|
|
{ INT_RANGE(persistent_reconnect, 0, 1), 0 },
|
2010-09-08 20:18:10 +02:00
|
|
|
{ INT_RANGE(p2p_intra_bss, 0, 1), CFG_CHANGED_P2P_INTRA_BSS },
|
2010-10-25 17:24:15 +02:00
|
|
|
{ INT(p2p_group_idle), 0 },
|
2015-07-27 21:24:19 +02:00
|
|
|
{ INT_RANGE(p2p_go_freq_change_policy, 0, P2P_GO_FREQ_MOVE_MAX), 0 },
|
2014-06-21 23:15:53 +02:00
|
|
|
{ INT_RANGE(p2p_passphrase_len, 8, 63),
|
|
|
|
CFG_CHANGED_P2P_PASSPHRASE_LEN },
|
2012-03-29 20:28:34 +02:00
|
|
|
{ FUNC(p2p_pref_chan), CFG_CHANGED_P2P_PREF_CHAN },
|
2013-10-22 18:45:46 +02:00
|
|
|
{ FUNC(p2p_no_go_freq), CFG_CHANGED_P2P_PREF_CHAN },
|
2013-10-22 20:00:49 +02:00
|
|
|
{ INT_RANGE(p2p_add_cli_chan, 0, 1), 0 },
|
2014-05-19 09:05:39 +02:00
|
|
|
{ INT_RANGE(p2p_optimize_listen_chan, 0, 1), 0 },
|
2012-09-30 19:35:51 +02:00
|
|
|
{ INT(p2p_go_ht40), 0 },
|
2013-10-27 18:46:17 +01:00
|
|
|
{ INT(p2p_go_vht), 0 },
|
2012-10-10 12:08:23 +02:00
|
|
|
{ INT(p2p_disabled), 0 },
|
2015-02-18 03:35:12 +01:00
|
|
|
{ INT_RANGE(p2p_go_ctwindow, 0, 127), 0 },
|
2012-10-29 14:02:30 +01:00
|
|
|
{ INT(p2p_no_group_iface), 0 },
|
2013-03-14 15:32:35 +01:00
|
|
|
{ INT_RANGE(p2p_ignore_shared_freq, 0, 1), 0 },
|
2013-03-16 18:13:31 +01:00
|
|
|
{ IPV4(ip_addr_go), 0 },
|
|
|
|
{ IPV4(ip_addr_mask), 0 },
|
|
|
|
{ IPV4(ip_addr_start), 0 },
|
|
|
|
{ IPV4(ip_addr_end), 0 },
|
2015-06-10 10:43:32 +02:00
|
|
|
{ INT_RANGE(p2p_cli_probe, 0, 1), 0 },
|
2010-07-18 23:30:24 +02:00
|
|
|
#endif /* CONFIG_P2P */
|
2010-07-18 23:30:24 +02:00
|
|
|
{ FUNC(country), CFG_CHANGED_COUNTRY },
|
|
|
|
{ INT(bss_max_count), 0 },
|
2011-03-20 11:40:59 +01:00
|
|
|
{ INT(bss_expiration_age), 0 },
|
|
|
|
{ INT(bss_expiration_scan_count), 0 },
|
2010-10-19 16:08:20 +02:00
|
|
|
{ INT_RANGE(filter_ssids, 0, 1), 0 },
|
2012-07-25 15:56:43 +02:00
|
|
|
{ INT_RANGE(filter_rssi, -100, 0), 0 },
|
2010-12-28 16:15:01 +01:00
|
|
|
{ INT(max_num_sta), 0 },
|
2011-09-27 22:15:05 +02:00
|
|
|
{ INT_RANGE(disassoc_low_ack, 0, 1), 0 },
|
2011-09-08 19:52:23 +02:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
{ INT_RANGE(hs20, 0, 1), 0 },
|
|
|
|
#endif /* CONFIG_HS20 */
|
2011-09-27 22:15:05 +02:00
|
|
|
{ INT_RANGE(interworking, 0, 1), 0 },
|
2011-10-21 11:44:29 +02:00
|
|
|
{ FUNC(hessid), 0 },
|
2012-05-03 15:51:04 +02:00
|
|
|
{ INT_RANGE(access_network_type, 0, 15), 0 },
|
2012-06-26 17:09:57 +02:00
|
|
|
{ INT_RANGE(pbc_in_m1, 0, 1), 0 },
|
2012-06-27 17:56:41 +02:00
|
|
|
{ STR(autoscan), 0 },
|
2013-02-15 10:24:29 +01:00
|
|
|
{ INT_RANGE(wps_nfc_dev_pw_id, 0x10, 0xffff),
|
|
|
|
CFG_CHANGED_NFC_PASSWORD_TOKEN },
|
|
|
|
{ BIN(wps_nfc_dh_pubkey), CFG_CHANGED_NFC_PASSWORD_TOKEN },
|
|
|
|
{ BIN(wps_nfc_dh_privkey), CFG_CHANGED_NFC_PASSWORD_TOKEN },
|
|
|
|
{ BIN(wps_nfc_dev_pw), CFG_CHANGED_NFC_PASSWORD_TOKEN },
|
2012-08-10 15:28:38 +02:00
|
|
|
{ STR(ext_password_backend), CFG_CHANGED_EXT_PW_BACKEND },
|
|
|
|
{ INT(p2p_go_max_inactivity), 0 },
|
2012-08-28 15:14:13 +02:00
|
|
|
{ INT_RANGE(auto_interworking, 0, 1), 0 },
|
2012-11-12 19:07:53 +01:00
|
|
|
{ INT(okc), 0 },
|
2012-11-24 21:21:29 +01:00
|
|
|
{ INT(pmf), 0 },
|
2013-01-01 15:23:47 +01:00
|
|
|
{ FUNC(sae_groups), 0 },
|
2013-03-01 19:50:08 +01:00
|
|
|
{ INT(dtim_period), 0 },
|
|
|
|
{ INT(beacon_int), 0 },
|
2013-03-21 14:52:41 +01:00
|
|
|
{ FUNC(ap_vendor_elements), 0 },
|
2013-03-31 16:52:23 +02:00
|
|
|
{ INT_RANGE(ignore_old_scan_res, 0, 1), 0 },
|
2013-05-05 10:46:54 +02:00
|
|
|
{ FUNC(freq_list), 0 },
|
2013-05-09 11:43:40 +02:00
|
|
|
{ INT(scan_cur_freq), 0 },
|
2013-05-07 11:41:14 +02:00
|
|
|
{ INT(sched_scan_interval), 0 },
|
2013-11-13 12:35:44 +01:00
|
|
|
{ INT(tdls_external_control), 0},
|
2013-01-25 23:10:41 +01:00
|
|
|
{ STR(osu_dir), 0 },
|
2014-04-24 07:45:39 +02:00
|
|
|
{ STR(wowlan_triggers), 0 },
|
2014-06-09 18:43:26 +02:00
|
|
|
{ INT(p2p_search_delay), 0},
|
2014-09-27 18:12:41 +02:00
|
|
|
{ INT(mac_addr), 0 },
|
|
|
|
{ INT(rand_addr_lifetime), 0 },
|
|
|
|
{ INT(preassoc_mac_addr), 0 },
|
2014-10-23 17:21:49 +02:00
|
|
|
{ INT(key_mgmt_offload), 0},
|
2015-01-22 19:50:01 +01:00
|
|
|
{ INT(passive_scan), 0 },
|
2015-02-19 15:35:39 +01:00
|
|
|
{ INT(reassoc_same_bss_optim), 0 },
|
2015-05-25 15:12:24 +02:00
|
|
|
{ INT(wps_priority), 0},
|
2014-11-16 16:28:53 +01:00
|
|
|
#ifdef CONFIG_FST
|
|
|
|
{ STR_RANGE(fst_group_id, 1, FST_MAX_GROUP_ID_LEN), 0 },
|
|
|
|
{ INT_RANGE(fst_priority, 1, FST_MAX_PRIO_VALUE), 0 },
|
|
|
|
{ INT_RANGE(fst_llt, 1, FST_MAX_LLT_MS), 0 },
|
|
|
|
#endif /* CONFIG_FST */
|
2015-10-14 11:26:33 +02:00
|
|
|
{ INT_RANGE(wpa_rsc_relaxation, 0, 1), 0 },
|
2015-11-30 13:00:41 +01:00
|
|
|
{ STR(sched_scan_plans), CFG_CHANGED_SCHED_SCAN_PLANS },
|
2010-07-18 23:30:24 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
#undef FUNC
|
|
|
|
#undef _INT
|
|
|
|
#undef INT
|
|
|
|
#undef INT_RANGE
|
|
|
|
#undef _STR
|
|
|
|
#undef STR
|
|
|
|
#undef STR_RANGE
|
2012-06-27 17:56:41 +02:00
|
|
|
#undef BIN
|
2013-03-16 18:13:31 +01:00
|
|
|
#undef IPV4
|
2013-10-26 16:00:57 +02:00
|
|
|
#define NUM_GLOBAL_FIELDS ARRAY_SIZE(global_fields)
|
2010-07-18 23:30:24 +02:00
|
|
|
|
|
|
|
|
2015-01-28 00:22:06 +01:00
|
|
|
int wpa_config_dump_values(struct wpa_config *config, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_GLOBAL_FIELDS; i++) {
|
|
|
|
const struct global_parse_data *field = &global_fields[i];
|
|
|
|
int tmp;
|
|
|
|
|
|
|
|
if (!field->get)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
tmp = field->get(field->name, config, (long) field->param1,
|
|
|
|
buf, buflen, 1);
|
|
|
|
if (tmp < 0)
|
|
|
|
return -1;
|
|
|
|
buf += tmp;
|
|
|
|
buflen -= tmp;
|
|
|
|
result += tmp;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int wpa_config_get_value(const char *name, struct wpa_config *config,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_GLOBAL_FIELDS; i++) {
|
|
|
|
const struct global_parse_data *field = &global_fields[i];
|
|
|
|
|
|
|
|
if (os_strcmp(name, field->name) != 0)
|
|
|
|
continue;
|
|
|
|
if (!field->get)
|
|
|
|
break;
|
|
|
|
return field->get(name, config, (long) field->param1,
|
|
|
|
buf, buflen, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-10-13 18:47:46 +02:00
|
|
|
int wpa_config_get_num_global_field_names(void)
|
|
|
|
{
|
|
|
|
return NUM_GLOBAL_FIELDS;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const char * wpa_config_get_global_field_name(unsigned int i, int *no_var)
|
|
|
|
{
|
|
|
|
if (i >= NUM_GLOBAL_FIELDS)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (no_var)
|
|
|
|
*no_var = !global_fields[i].param1;
|
|
|
|
return global_fields[i].name;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 23:30:24 +02:00
|
|
|
int wpa_config_process_global(struct wpa_config *config, char *pos, int line)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_GLOBAL_FIELDS; i++) {
|
|
|
|
const struct global_parse_data *field = &global_fields[i];
|
|
|
|
size_t flen = os_strlen(field->name);
|
|
|
|
if (os_strncmp(pos, field->name, flen) != 0 ||
|
|
|
|
pos[flen] != '=')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (field->parser(field, config, line, pos + flen + 1)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: failed to "
|
|
|
|
"parse '%s'.", line, pos);
|
|
|
|
ret = -1;
|
|
|
|
}
|
2013-02-15 10:24:29 +01:00
|
|
|
if (field->changed_flag == CFG_CHANGED_NFC_PASSWORD_TOKEN)
|
|
|
|
config->wps_nfc_pw_from_config = 1;
|
2010-07-18 23:30:24 +02:00
|
|
|
config->changed_parameters |= field->changed_flag;
|
2010-07-18 23:30:24 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == NUM_GLOBAL_FIELDS) {
|
2012-08-12 10:34:07 +02:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
if (os_strncmp(pos, "wmm_ac_", 7) == 0) {
|
|
|
|
char *tmp = os_strchr(pos, '=');
|
|
|
|
if (tmp == NULL) {
|
|
|
|
if (line < 0)
|
|
|
|
return -1;
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid line "
|
|
|
|
"'%s'", line, pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*tmp++ = '\0';
|
|
|
|
if (hostapd_config_wmm_ac(config->wmm_ac_params, pos,
|
|
|
|
tmp)) {
|
|
|
|
wpa_printf(MSG_ERROR, "Line %d: invalid WMM "
|
|
|
|
"AC item", line);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_AP */
|
2010-07-18 23:30:24 +02:00
|
|
|
if (line < 0)
|
|
|
|
return -1;
|
2010-07-18 23:30:24 +02:00
|
|
|
wpa_printf(MSG_ERROR, "Line %d: unknown global field '%s'.",
|
|
|
|
line, pos);
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|