DPP: Integration for hostapd
This adds DPP bootstrapping, authentication, and configuration into hostapd similarly to how the design was integrated in wpa_supplicant. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen
Jouni Malinen
parent
9beb2892de
commit
9c2b8204e6
14 changed files with 1863 additions and 2 deletions
|
|
@ -532,6 +532,22 @@ endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef CONFIG_DPP
|
||||||
|
L_CFLAGS += -DCONFIG_DPP
|
||||||
|
OBJS += src/common/dpp.c
|
||||||
|
OBJS += src/ap/dpp_hostapd.c
|
||||||
|
OBJS += src/ap/gas_query_ap.c
|
||||||
|
NEED_AES_SIV=y
|
||||||
|
NEED_HMAC_SHA256_KDF=y
|
||||||
|
NEED_HMAC_SHA384_KDF=y
|
||||||
|
NEED_HMAC_SHA512_KDF=y
|
||||||
|
NEED_SHA256=y
|
||||||
|
NEED_SHA384=y
|
||||||
|
NEED_SHA512=y
|
||||||
|
NEED_JSON=y
|
||||||
|
NEED_GAS=y
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_EAP_IKEV2
|
ifdef CONFIG_EAP_IKEV2
|
||||||
L_CFLAGS += -DEAP_SERVER_IKEV2
|
L_CFLAGS += -DEAP_SERVER_IKEV2
|
||||||
OBJS += src/eap_server/eap_server_ikev2.c src/eap_server/ikev2.c
|
OBJS += src/eap_server/eap_server_ikev2.c src/eap_server/ikev2.c
|
||||||
|
|
@ -979,6 +995,10 @@ endif
|
||||||
|
|
||||||
ifdef CONFIG_INTERWORKING
|
ifdef CONFIG_INTERWORKING
|
||||||
L_CFLAGS += -DCONFIG_INTERWORKING
|
L_CFLAGS += -DCONFIG_INTERWORKING
|
||||||
|
NEED_GAS=y
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef NEED_GAS
|
||||||
OBJS += src/common/gas.c
|
OBJS += src/common/gas.c
|
||||||
OBJS += src/ap/gas_serv.c
|
OBJS += src/ap/gas_serv.c
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -566,6 +566,22 @@ endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef CONFIG_DPP
|
||||||
|
CFLAGS += -DCONFIG_DPP
|
||||||
|
OBJS += ../src/common/dpp.o
|
||||||
|
OBJS += ../src/ap/dpp_hostapd.o
|
||||||
|
OBJS += ../src/ap/gas_query_ap.o
|
||||||
|
NEED_AES_SIV=y
|
||||||
|
NEED_HMAC_SHA256_KDF=y
|
||||||
|
NEED_HMAC_SHA384_KDF=y
|
||||||
|
NEED_HMAC_SHA512_KDF=y
|
||||||
|
NEED_SHA256=y
|
||||||
|
NEED_SHA384=y
|
||||||
|
NEED_SHA512=y
|
||||||
|
NEED_JSON=y
|
||||||
|
NEED_GAS=y
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_EAP_IKEV2
|
ifdef CONFIG_EAP_IKEV2
|
||||||
CFLAGS += -DEAP_SERVER_IKEV2
|
CFLAGS += -DEAP_SERVER_IKEV2
|
||||||
OBJS += ../src/eap_server/eap_server_ikev2.o ../src/eap_server/ikev2.o
|
OBJS += ../src/eap_server/eap_server_ikev2.o ../src/eap_server/ikev2.o
|
||||||
|
|
@ -1069,6 +1085,10 @@ endif
|
||||||
|
|
||||||
ifdef CONFIG_INTERWORKING
|
ifdef CONFIG_INTERWORKING
|
||||||
CFLAGS += -DCONFIG_INTERWORKING
|
CFLAGS += -DCONFIG_INTERWORKING
|
||||||
|
NEED_GAS=y
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef NEED_GAS
|
||||||
OBJS += ../src/common/gas.o
|
OBJS += ../src/common/gas.o
|
||||||
OBJS += ../src/ap/gas_serv.o
|
OBJS += ../src/ap/gas_serv.o
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@
|
||||||
#include "ap/beacon.h"
|
#include "ap/beacon.h"
|
||||||
#include "ap/neighbor_db.h"
|
#include "ap/neighbor_db.h"
|
||||||
#include "ap/rrm.h"
|
#include "ap/rrm.h"
|
||||||
|
#include "ap/dpp_hostapd.h"
|
||||||
#include "wps/wps_defs.h"
|
#include "wps/wps_defs.h"
|
||||||
#include "wps/wps.h"
|
#include "wps/wps.h"
|
||||||
#include "fst/fst_ctrl_iface.h"
|
#include "fst/fst_ctrl_iface.h"
|
||||||
|
|
@ -1278,6 +1279,23 @@ static int hostapd_ctrl_iface_set(struct hostapd_data *hapd, char *cmd)
|
||||||
hapd->ext_mgmt_frame_handling = atoi(value);
|
hapd->ext_mgmt_frame_handling = atoi(value);
|
||||||
} else if (os_strcasecmp(cmd, "ext_eapol_frame_io") == 0) {
|
} else if (os_strcasecmp(cmd, "ext_eapol_frame_io") == 0) {
|
||||||
hapd->ext_eapol_frame_io = atoi(value);
|
hapd->ext_eapol_frame_io = atoi(value);
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
} else if (os_strcasecmp(cmd, "dpp_config_obj_override") == 0) {
|
||||||
|
os_free(hapd->dpp_config_obj_override);
|
||||||
|
hapd->dpp_config_obj_override = os_strdup(value);
|
||||||
|
} else if (os_strcasecmp(cmd, "dpp_discovery_override") == 0) {
|
||||||
|
os_free(hapd->dpp_discovery_override);
|
||||||
|
hapd->dpp_discovery_override = os_strdup(value);
|
||||||
|
} else if (os_strcasecmp(cmd, "dpp_groups_override") == 0) {
|
||||||
|
os_free(hapd->dpp_groups_override);
|
||||||
|
hapd->dpp_groups_override = os_strdup(value);
|
||||||
|
} else if (os_strcasecmp(cmd, "dpp_devices_override") == 0) {
|
||||||
|
os_free(hapd->dpp_devices_override);
|
||||||
|
hapd->dpp_devices_override = os_strdup(value);
|
||||||
|
} else if (os_strcasecmp(cmd,
|
||||||
|
"dpp_ignore_netaccesskey_mismatch") == 0) {
|
||||||
|
hapd->dpp_ignore_netaccesskey_mismatch = atoi(value);
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
#endif /* CONFIG_TESTING_OPTIONS */
|
#endif /* CONFIG_TESTING_OPTIONS */
|
||||||
#ifdef CONFIG_MBO
|
#ifdef CONFIG_MBO
|
||||||
} else if (os_strcasecmp(cmd, "mbo_assoc_disallow") == 0) {
|
} else if (os_strcasecmp(cmd, "mbo_assoc_disallow") == 0) {
|
||||||
|
|
@ -2622,6 +2640,43 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
|
||||||
reply_size);
|
reply_size);
|
||||||
} else if (os_strcmp(buf, "TERMINATE") == 0) {
|
} else if (os_strcmp(buf, "TERMINATE") == 0) {
|
||||||
eloop_terminate();
|
eloop_terminate();
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
} else if (os_strncmp(buf, "DPP_QR_CODE ", 12) == 0) {
|
||||||
|
res = hostapd_dpp_qr_code(hapd, buf + 12);
|
||||||
|
if (res < 0) {
|
||||||
|
reply_len = -1;
|
||||||
|
} else {
|
||||||
|
reply_len = os_snprintf(reply, reply_size, "%d", res);
|
||||||
|
if (os_snprintf_error(reply_size, reply_len))
|
||||||
|
reply_len = -1;
|
||||||
|
}
|
||||||
|
} else if (os_strncmp(buf, "DPP_BOOTSTRAP_GEN ", 18) == 0) {
|
||||||
|
res = hostapd_dpp_bootstrap_gen(hapd, buf + 18);
|
||||||
|
if (res < 0) {
|
||||||
|
reply_len = -1;
|
||||||
|
} else {
|
||||||
|
reply_len = os_snprintf(reply, reply_size, "%d", res);
|
||||||
|
if (os_snprintf_error(reply_size, reply_len))
|
||||||
|
reply_len = -1;
|
||||||
|
}
|
||||||
|
} else if (os_strncmp(buf, "DPP_BOOTSTRAP_REMOVE ", 21) == 0) {
|
||||||
|
if (hostapd_dpp_bootstrap_remove(hapd, buf + 21) < 0)
|
||||||
|
reply_len = -1;
|
||||||
|
} else if (os_strncmp(buf, "DPP_BOOTSTRAP_GET_URI ", 22) == 0) {
|
||||||
|
const char *uri;
|
||||||
|
|
||||||
|
uri = hostapd_dpp_bootstrap_get_uri(hapd, atoi(buf + 22));
|
||||||
|
if (!uri) {
|
||||||
|
reply_len = -1;
|
||||||
|
} else {
|
||||||
|
reply_len = os_snprintf(reply, reply_size, "%s", uri);
|
||||||
|
if (os_snprintf_error(reply_size, reply_len))
|
||||||
|
reply_len = -1;
|
||||||
|
}
|
||||||
|
} else if (os_strncmp(buf, "DPP_AUTH_INIT ", 14) == 0) {
|
||||||
|
if (hostapd_dpp_auth_init(hapd, buf + 13) < 0)
|
||||||
|
reply_len = -1;
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
} else {
|
} else {
|
||||||
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
|
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
|
||||||
reply_len = 16;
|
reply_len = 16;
|
||||||
|
|
|
||||||
863
src/ap/dpp_hostapd.c
Normal file
863
src/ap/dpp_hostapd.c
Normal file
|
|
@ -0,0 +1,863 @@
|
||||||
|
/*
|
||||||
|
* hostapd / DPP integration
|
||||||
|
* Copyright (c) 2017, Qualcomm Atheros, Inc.
|
||||||
|
*
|
||||||
|
* This software may be distributed under the terms of the BSD license.
|
||||||
|
* See README for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "utils/includes.h"
|
||||||
|
|
||||||
|
#include "utils/common.h"
|
||||||
|
#include "utils/eloop.h"
|
||||||
|
#include "common/dpp.h"
|
||||||
|
#include "common/gas.h"
|
||||||
|
#include "common/wpa_ctrl.h"
|
||||||
|
#include "hostapd.h"
|
||||||
|
#include "ap_drv_ops.h"
|
||||||
|
#include "gas_query_ap.h"
|
||||||
|
#include "dpp_hostapd.h"
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_auth_success(struct hostapd_data *hapd, int initiator);
|
||||||
|
|
||||||
|
static const u8 broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||||
|
|
||||||
|
|
||||||
|
static unsigned int hapd_dpp_next_id(struct hostapd_data *hapd)
|
||||||
|
{
|
||||||
|
struct dpp_bootstrap_info *bi;
|
||||||
|
unsigned int max_id = 0;
|
||||||
|
|
||||||
|
dl_list_for_each(bi, &hapd->dpp_bootstrap, struct dpp_bootstrap_info,
|
||||||
|
list) {
|
||||||
|
if (bi->id > max_id)
|
||||||
|
max_id = bi->id;
|
||||||
|
}
|
||||||
|
return max_id + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hostapd_dpp_qr_code - Parse and add DPP bootstrapping info from a QR Code
|
||||||
|
* @hapd: Pointer to hostapd_data
|
||||||
|
* @cmd: DPP URI read from a QR Code
|
||||||
|
* Returns: Identifier of the stored info or -1 on failure
|
||||||
|
*/
|
||||||
|
int hostapd_dpp_qr_code(struct hostapd_data *hapd, const char *cmd)
|
||||||
|
{
|
||||||
|
struct dpp_bootstrap_info *bi;
|
||||||
|
struct dpp_authentication *auth = hapd->dpp_auth;
|
||||||
|
|
||||||
|
bi = dpp_parse_qr_code(cmd);
|
||||||
|
if (!bi)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
bi->id = hapd_dpp_next_id(hapd);
|
||||||
|
dl_list_add(&hapd->dpp_bootstrap, &bi->list);
|
||||||
|
|
||||||
|
if (auth && auth->response_pending &&
|
||||||
|
dpp_notify_new_qr_code(auth, bi) == 1) {
|
||||||
|
struct wpabuf *msg;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Sending out pending authentication response");
|
||||||
|
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_RESP,
|
||||||
|
wpabuf_len(auth->resp_attr));
|
||||||
|
if (!msg)
|
||||||
|
goto out;
|
||||||
|
wpabuf_put_buf(msg, hapd->dpp_auth->resp_attr);
|
||||||
|
|
||||||
|
hostapd_drv_send_action(hapd, auth->curr_freq, 0,
|
||||||
|
auth->peer_mac_addr,
|
||||||
|
wpabuf_head(msg), wpabuf_len(msg));
|
||||||
|
wpabuf_free(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
return bi->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static char * get_param(const char *cmd, const char *param)
|
||||||
|
{
|
||||||
|
const char *pos, *end;
|
||||||
|
char *val;
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
pos = os_strstr(cmd, param);
|
||||||
|
if (!pos)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
pos += os_strlen(param);
|
||||||
|
end = os_strchr(pos, ' ');
|
||||||
|
if (end)
|
||||||
|
len = end - pos;
|
||||||
|
else
|
||||||
|
len = os_strlen(pos);
|
||||||
|
val = os_malloc(len + 1);
|
||||||
|
if (!val)
|
||||||
|
return NULL;
|
||||||
|
os_memcpy(val, pos, len);
|
||||||
|
val[len] = '\0';
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int hostapd_dpp_bootstrap_gen(struct hostapd_data *hapd, const char *cmd)
|
||||||
|
{
|
||||||
|
char *chan = NULL, *mac = NULL, *info = NULL, *pk = NULL, *curve = NULL;
|
||||||
|
char *key = NULL;
|
||||||
|
u8 *privkey = NULL;
|
||||||
|
size_t privkey_len = 0;
|
||||||
|
size_t len;
|
||||||
|
int ret = -1;
|
||||||
|
struct dpp_bootstrap_info *bi;
|
||||||
|
|
||||||
|
bi = os_zalloc(sizeof(*bi));
|
||||||
|
if (!bi)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
if (os_strstr(cmd, "type=qrcode"))
|
||||||
|
bi->type = DPP_BOOTSTRAP_QR_CODE;
|
||||||
|
else
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
chan = get_param(cmd, " chan=");
|
||||||
|
mac = get_param(cmd, " mac=");
|
||||||
|
info = get_param(cmd, " info=");
|
||||||
|
curve = get_param(cmd, " curve=");
|
||||||
|
key = get_param(cmd, " key=");
|
||||||
|
|
||||||
|
if (key) {
|
||||||
|
privkey_len = os_strlen(key) / 2;
|
||||||
|
privkey = os_malloc(privkey_len);
|
||||||
|
if (!privkey ||
|
||||||
|
hexstr2bin(key, privkey, privkey_len) < 0)
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
pk = dpp_keygen(bi, curve, privkey, privkey_len);
|
||||||
|
if (!pk)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
len = 4; /* "DPP:" */
|
||||||
|
if (chan) {
|
||||||
|
if (dpp_parse_uri_chan_list(bi, chan) < 0)
|
||||||
|
goto fail;
|
||||||
|
len += 3 + os_strlen(chan); /* C:...; */
|
||||||
|
}
|
||||||
|
if (mac) {
|
||||||
|
if (dpp_parse_uri_mac(bi, mac) < 0)
|
||||||
|
goto fail;
|
||||||
|
len += 3 + os_strlen(mac); /* M:...; */
|
||||||
|
}
|
||||||
|
if (info) {
|
||||||
|
if (dpp_parse_uri_info(bi, info) < 0)
|
||||||
|
goto fail;
|
||||||
|
len += 3 + os_strlen(info); /* I:...; */
|
||||||
|
}
|
||||||
|
len += 4 + os_strlen(pk);
|
||||||
|
bi->uri = os_malloc(len + 1);
|
||||||
|
if (!bi->uri)
|
||||||
|
goto fail;
|
||||||
|
os_snprintf(bi->uri, len + 1, "DPP:%s%s%s%s%s%s%s%s%sK:%s;;",
|
||||||
|
chan ? "C:" : "", chan ? chan : "", chan ? ";" : "",
|
||||||
|
mac ? "M:" : "", mac ? mac : "", mac ? ";" : "",
|
||||||
|
info ? "I:" : "", info ? info : "", info ? ";" : "",
|
||||||
|
pk);
|
||||||
|
bi->id = hapd_dpp_next_id(hapd);
|
||||||
|
dl_list_add(&hapd->dpp_bootstrap, &bi->list);
|
||||||
|
ret = bi->id;
|
||||||
|
bi = NULL;
|
||||||
|
fail:
|
||||||
|
os_free(curve);
|
||||||
|
os_free(pk);
|
||||||
|
os_free(chan);
|
||||||
|
os_free(mac);
|
||||||
|
os_free(info);
|
||||||
|
str_clear_free(key);
|
||||||
|
bin_clear_free(privkey, privkey_len);
|
||||||
|
dpp_bootstrap_info_free(bi);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct dpp_bootstrap_info *
|
||||||
|
dpp_bootstrap_get_id(struct hostapd_data *hapd, unsigned int id)
|
||||||
|
{
|
||||||
|
struct dpp_bootstrap_info *bi;
|
||||||
|
|
||||||
|
dl_list_for_each(bi, &hapd->dpp_bootstrap, struct dpp_bootstrap_info,
|
||||||
|
list) {
|
||||||
|
if (bi->id == id)
|
||||||
|
return bi;
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int dpp_bootstrap_del(struct hostapd_data *hapd, unsigned int id)
|
||||||
|
{
|
||||||
|
struct dpp_bootstrap_info *bi, *tmp;
|
||||||
|
int found = 0;
|
||||||
|
|
||||||
|
dl_list_for_each_safe(bi, tmp, &hapd->dpp_bootstrap,
|
||||||
|
struct dpp_bootstrap_info, list) {
|
||||||
|
if (id && bi->id != id)
|
||||||
|
continue;
|
||||||
|
found = 1;
|
||||||
|
dl_list_del(&bi->list);
|
||||||
|
dpp_bootstrap_info_free(bi);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id == 0)
|
||||||
|
return 0; /* flush succeeds regardless of entries found */
|
||||||
|
return found ? 0 : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int hostapd_dpp_bootstrap_remove(struct hostapd_data *hapd, const char *id)
|
||||||
|
{
|
||||||
|
unsigned int id_val;
|
||||||
|
|
||||||
|
if (os_strcmp(id, "*") == 0) {
|
||||||
|
id_val = 0;
|
||||||
|
} else {
|
||||||
|
id_val = atoi(id);
|
||||||
|
if (id_val == 0)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dpp_bootstrap_del(hapd, id_val);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const char * hostapd_dpp_bootstrap_get_uri(struct hostapd_data *hapd,
|
||||||
|
unsigned int id)
|
||||||
|
{
|
||||||
|
struct dpp_bootstrap_info *bi;
|
||||||
|
|
||||||
|
bi = dpp_bootstrap_get_id(hapd, id);
|
||||||
|
if (!bi)
|
||||||
|
return NULL;
|
||||||
|
return bi->uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void hostapd_dpp_tx_status(struct hostapd_data *hapd, const u8 *dst,
|
||||||
|
const u8 *data, size_t data_len, int ok)
|
||||||
|
{
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: TX status: dst=" MACSTR " ok=%d",
|
||||||
|
MAC2STR(dst), ok);
|
||||||
|
|
||||||
|
if (!hapd->dpp_auth) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Ignore TX status since there is no ongoing authentication exchange");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hapd->dpp_auth->remove_on_tx_status) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Terminate authentication exchange due to an earlier error");
|
||||||
|
dpp_auth_deinit(hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth = NULL;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hapd->dpp_auth_ok_on_ack)
|
||||||
|
hostapd_dpp_auth_success(hapd, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_set_testing_options(struct hostapd_data *hapd,
|
||||||
|
struct dpp_authentication *auth)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_TESTING_OPTIONS
|
||||||
|
if (hapd->dpp_config_obj_override)
|
||||||
|
auth->config_obj_override =
|
||||||
|
os_strdup(hapd->dpp_config_obj_override);
|
||||||
|
if (hapd->dpp_discovery_override)
|
||||||
|
auth->discovery_override =
|
||||||
|
os_strdup(hapd->dpp_discovery_override);
|
||||||
|
if (hapd->dpp_groups_override)
|
||||||
|
auth->groups_override = os_strdup(hapd->dpp_groups_override);
|
||||||
|
if (hapd->dpp_devices_override)
|
||||||
|
auth->devices_override = os_strdup(hapd->dpp_devices_override);
|
||||||
|
auth->ignore_netaccesskey_mismatch =
|
||||||
|
hapd->dpp_ignore_netaccesskey_mismatch;
|
||||||
|
#endif /* CONFIG_TESTING_OPTIONS */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int hostapd_dpp_auth_init(struct hostapd_data *hapd, const char *cmd)
|
||||||
|
{
|
||||||
|
const char *pos;
|
||||||
|
struct dpp_bootstrap_info *peer_bi, *own_bi = NULL;
|
||||||
|
struct wpabuf *msg;
|
||||||
|
const u8 *dst;
|
||||||
|
int res;
|
||||||
|
int configurator = 1;
|
||||||
|
struct dpp_configuration *conf_sta = NULL, *conf_ap = NULL;
|
||||||
|
|
||||||
|
pos = os_strstr(cmd, " peer=");
|
||||||
|
if (!pos)
|
||||||
|
return -1;
|
||||||
|
pos += 6;
|
||||||
|
peer_bi = dpp_bootstrap_get_id(hapd, atoi(pos));
|
||||||
|
if (!peer_bi) {
|
||||||
|
wpa_printf(MSG_INFO,
|
||||||
|
"DPP: Could not find bootstrapping info for the identified peer");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
pos = os_strstr(cmd, " own=");
|
||||||
|
if (pos) {
|
||||||
|
pos += 5;
|
||||||
|
own_bi = dpp_bootstrap_get_id(hapd, atoi(pos));
|
||||||
|
if (!own_bi) {
|
||||||
|
wpa_printf(MSG_INFO,
|
||||||
|
"DPP: Could not find bootstrapping info for the identified local entry");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (peer_bi->curve != own_bi->curve) {
|
||||||
|
wpa_printf(MSG_INFO,
|
||||||
|
"DPP: Mismatching curves in bootstrapping info (peer=%s own=%s)",
|
||||||
|
peer_bi->curve->name, own_bi->curve->name);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pos = os_strstr(cmd, " role=");
|
||||||
|
if (pos) {
|
||||||
|
pos += 6;
|
||||||
|
if (os_strncmp(pos, "configurator", 12) == 0)
|
||||||
|
configurator = 1;
|
||||||
|
else if (os_strncmp(pos, "enrollee", 8) == 0)
|
||||||
|
configurator = 0;
|
||||||
|
else
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (os_strstr(cmd, " conf=sta-")) {
|
||||||
|
conf_sta = os_zalloc(sizeof(struct dpp_configuration));
|
||||||
|
if (!conf_sta)
|
||||||
|
goto fail;
|
||||||
|
/* TODO: Configuration of network parameters from upper layers
|
||||||
|
*/
|
||||||
|
os_memcpy(conf_sta->ssid, "test", 4);
|
||||||
|
conf_sta->ssid_len = 4;
|
||||||
|
if (os_strstr(cmd, " conf=sta-psk")) {
|
||||||
|
conf_sta->dpp = 0;
|
||||||
|
conf_sta->passphrase = os_strdup("secret passphrase");
|
||||||
|
if (!conf_sta->passphrase)
|
||||||
|
goto fail;
|
||||||
|
} else if (os_strstr(cmd, " conf=sta-dpp")) {
|
||||||
|
conf_sta->dpp = 1;
|
||||||
|
} else {
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (os_strstr(cmd, " conf=ap-")) {
|
||||||
|
conf_ap = os_zalloc(sizeof(struct dpp_configuration));
|
||||||
|
if (!conf_ap)
|
||||||
|
goto fail;
|
||||||
|
/* TODO: Configuration of network parameters from upper layers
|
||||||
|
*/
|
||||||
|
os_memcpy(conf_ap->ssid, "test", 4);
|
||||||
|
conf_ap->ssid_len = 4;
|
||||||
|
if (os_strstr(cmd, " conf=ap-psk")) {
|
||||||
|
conf_ap->dpp = 0;
|
||||||
|
conf_ap->passphrase = os_strdup("secret passphrase");
|
||||||
|
if (!conf_ap->passphrase)
|
||||||
|
goto fail;
|
||||||
|
} else if (os_strstr(cmd, " conf=ap-dpp")) {
|
||||||
|
conf_ap->dpp = 1;
|
||||||
|
} else {
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pos = os_strstr(cmd, " expiry=");
|
||||||
|
if (pos) {
|
||||||
|
long int val;
|
||||||
|
|
||||||
|
pos += 8;
|
||||||
|
val = strtol(pos, NULL, 0);
|
||||||
|
if (val <= 0)
|
||||||
|
goto fail;
|
||||||
|
if (conf_sta)
|
||||||
|
conf_sta->netaccesskey_expiry = val;
|
||||||
|
if (conf_ap)
|
||||||
|
conf_ap->netaccesskey_expiry = val;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hapd->dpp_auth)
|
||||||
|
dpp_auth_deinit(hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth = dpp_auth_init(hapd, peer_bi, own_bi, configurator);
|
||||||
|
if (!hapd->dpp_auth)
|
||||||
|
goto fail;
|
||||||
|
hostapd_dpp_set_testing_options(hapd, hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth->conf_sta = conf_sta;
|
||||||
|
hapd->dpp_auth->conf_ap = conf_ap;
|
||||||
|
|
||||||
|
/* TODO: Support iteration over all frequencies and filtering of
|
||||||
|
* frequencies based on locally enabled channels that allow initiation
|
||||||
|
* of transmission. */
|
||||||
|
if (peer_bi->num_freq > 0)
|
||||||
|
hapd->dpp_auth->curr_freq = peer_bi->freq[0];
|
||||||
|
else
|
||||||
|
hapd->dpp_auth->curr_freq = 2412;
|
||||||
|
|
||||||
|
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_REQ,
|
||||||
|
wpabuf_len(hapd->dpp_auth->req_attr));
|
||||||
|
if (!msg)
|
||||||
|
return -1;
|
||||||
|
wpabuf_put_buf(msg, hapd->dpp_auth->req_attr);
|
||||||
|
|
||||||
|
if (is_zero_ether_addr(peer_bi->mac_addr)) {
|
||||||
|
dst = broadcast;
|
||||||
|
} else {
|
||||||
|
dst = peer_bi->mac_addr;
|
||||||
|
os_memcpy(hapd->dpp_auth->peer_mac_addr, peer_bi->mac_addr,
|
||||||
|
ETH_ALEN);
|
||||||
|
}
|
||||||
|
hapd->dpp_auth_ok_on_ack = 0;
|
||||||
|
|
||||||
|
res = hostapd_drv_send_action(hapd, hapd->dpp_auth->curr_freq, 0,
|
||||||
|
dst, wpabuf_head(msg), wpabuf_len(msg));
|
||||||
|
wpabuf_free(msg);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
fail:
|
||||||
|
dpp_configuration_free(conf_sta);
|
||||||
|
dpp_configuration_free(conf_ap);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_rx_auth_req(struct hostapd_data *hapd, const u8 *src,
|
||||||
|
const u8 *buf, size_t len, unsigned int freq)
|
||||||
|
{
|
||||||
|
const u8 *r_bootstrap, *i_bootstrap, *wrapped_data;
|
||||||
|
u16 r_bootstrap_len, i_bootstrap_len, wrapped_data_len;
|
||||||
|
struct dpp_bootstrap_info *bi, *own_bi = NULL, *peer_bi = NULL;
|
||||||
|
struct wpabuf *msg;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Authentication Request from " MACSTR,
|
||||||
|
MAC2STR(src));
|
||||||
|
|
||||||
|
wrapped_data = dpp_get_attr(buf, len, DPP_ATTR_WRAPPED_DATA,
|
||||||
|
&wrapped_data_len);
|
||||||
|
if (!wrapped_data) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Missing required Wrapped data attribute");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wpa_hexdump(MSG_MSGDUMP, "DPP: Wrapped data",
|
||||||
|
wrapped_data, wrapped_data_len);
|
||||||
|
|
||||||
|
r_bootstrap = dpp_get_attr(buf, len, DPP_ATTR_R_BOOTSTRAP_KEY_HASH,
|
||||||
|
&r_bootstrap_len);
|
||||||
|
if (!r_bootstrap || r_bootstrap > wrapped_data ||
|
||||||
|
r_bootstrap_len != SHA256_MAC_LEN) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Missing or invalid required Responder Bootstrapping Key Hash attribute");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wpa_hexdump(MSG_MSGDUMP, "DPP: Responder Bootstrapping Key Hash",
|
||||||
|
r_bootstrap, r_bootstrap_len);
|
||||||
|
|
||||||
|
i_bootstrap = dpp_get_attr(buf, len, DPP_ATTR_I_BOOTSTRAP_KEY_HASH,
|
||||||
|
&i_bootstrap_len);
|
||||||
|
if (!i_bootstrap || i_bootstrap > wrapped_data ||
|
||||||
|
i_bootstrap_len != SHA256_MAC_LEN) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Missing or invalid required Initiator Bootstrapping Key Hash attribute");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wpa_hexdump(MSG_MSGDUMP, "DPP: Initiator Bootstrapping Key Hash",
|
||||||
|
i_bootstrap, i_bootstrap_len);
|
||||||
|
|
||||||
|
/* Try to find own and peer bootstrapping key matches based on the
|
||||||
|
* received hash values */
|
||||||
|
dl_list_for_each(bi, &hapd->dpp_bootstrap, struct dpp_bootstrap_info,
|
||||||
|
list) {
|
||||||
|
if (!own_bi && bi->own &&
|
||||||
|
os_memcmp(bi->pubkey_hash, r_bootstrap,
|
||||||
|
SHA256_MAC_LEN) == 0) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Found matching own bootstrapping information");
|
||||||
|
own_bi = bi;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!peer_bi && !bi->own &&
|
||||||
|
os_memcmp(bi->pubkey_hash, i_bootstrap,
|
||||||
|
SHA256_MAC_LEN) == 0) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Found matching peer bootstrapping information");
|
||||||
|
peer_bi = bi;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (own_bi && peer_bi)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!own_bi) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: No matching own bootstrapping key found - ignore message");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hapd->dpp_auth) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Already in DPP authentication exchange - ignore new one");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hapd->dpp_auth_ok_on_ack = 0;
|
||||||
|
hapd->dpp_auth = dpp_auth_req_rx(hapd->msg_ctx, hapd->dpp_allowed_roles,
|
||||||
|
hapd->dpp_qr_mutual,
|
||||||
|
peer_bi, own_bi, freq, buf,
|
||||||
|
wrapped_data, wrapped_data_len);
|
||||||
|
if (!hapd->dpp_auth) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: No response generated");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
hostapd_dpp_set_testing_options(hapd, hapd->dpp_auth);
|
||||||
|
os_memcpy(hapd->dpp_auth->peer_mac_addr, src, ETH_ALEN);
|
||||||
|
|
||||||
|
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_RESP,
|
||||||
|
wpabuf_len(hapd->dpp_auth->resp_attr));
|
||||||
|
if (!msg)
|
||||||
|
return;
|
||||||
|
wpabuf_put_buf(msg, hapd->dpp_auth->resp_attr);
|
||||||
|
|
||||||
|
hostapd_drv_send_action(hapd, hapd->dpp_auth->curr_freq, 0,
|
||||||
|
src, wpabuf_head(msg), wpabuf_len(msg));
|
||||||
|
wpabuf_free(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_gas_resp_cb(void *ctx, const u8 *addr, u8 dialog_token,
|
||||||
|
enum gas_query_ap_result result,
|
||||||
|
const struct wpabuf *adv_proto,
|
||||||
|
const struct wpabuf *resp, u16 status_code)
|
||||||
|
{
|
||||||
|
struct hostapd_data *hapd = ctx;
|
||||||
|
const u8 *pos;
|
||||||
|
struct dpp_authentication *auth = hapd->dpp_auth;
|
||||||
|
|
||||||
|
if (!auth || !auth->auth_success) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: No matching exchange in progress");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!resp || status_code != WLAN_STATUS_SUCCESS) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: GAS query did not succeed");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
wpa_hexdump_buf(MSG_DEBUG, "DPP: Configuration Response adv_proto",
|
||||||
|
adv_proto);
|
||||||
|
wpa_hexdump_buf(MSG_DEBUG, "DPP: Configuration Response (GAS response)",
|
||||||
|
resp);
|
||||||
|
|
||||||
|
if (wpabuf_len(adv_proto) != 10 ||
|
||||||
|
!(pos = wpabuf_head(adv_proto)) ||
|
||||||
|
pos[0] != WLAN_EID_ADV_PROTO ||
|
||||||
|
pos[1] != 8 ||
|
||||||
|
pos[3] != WLAN_EID_VENDOR_SPECIFIC ||
|
||||||
|
pos[4] != 5 ||
|
||||||
|
WPA_GET_BE24(&pos[5]) != OUI_WFA ||
|
||||||
|
pos[8] != 0x1a ||
|
||||||
|
pos[9] != 1) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Not a DPP Advertisement Protocol ID");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dpp_conf_resp_rx(auth, resp) < 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Configuration attempt failed");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_CONF_RECEIVED);
|
||||||
|
if (auth->ssid_len)
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_CONFOBJ_SSID "%s",
|
||||||
|
wpa_ssid_txt(auth->ssid, auth->ssid_len));
|
||||||
|
if (auth->connector) {
|
||||||
|
/* TODO: Save the Connector and consider using a command
|
||||||
|
* to fetch the value instead of sending an event with
|
||||||
|
* it. The Connector could end up being larger than what
|
||||||
|
* most clients are ready to receive as an event
|
||||||
|
* message. */
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_CONNECTOR "%s",
|
||||||
|
auth->connector);
|
||||||
|
}
|
||||||
|
if (auth->c_sign_key) {
|
||||||
|
char *hex;
|
||||||
|
size_t hexlen;
|
||||||
|
|
||||||
|
hexlen = 2 * wpabuf_len(auth->c_sign_key) + 1;
|
||||||
|
hex = os_malloc(hexlen);
|
||||||
|
if (hex) {
|
||||||
|
wpa_snprintf_hex(hex, hexlen,
|
||||||
|
wpabuf_head(auth->c_sign_key),
|
||||||
|
wpabuf_len(auth->c_sign_key));
|
||||||
|
if (auth->c_sign_key_expiry)
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO,
|
||||||
|
DPP_EVENT_C_SIGN_KEY "%s %lu", hex,
|
||||||
|
(unsigned long)
|
||||||
|
auth->c_sign_key_expiry);
|
||||||
|
else
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO,
|
||||||
|
DPP_EVENT_C_SIGN_KEY "%s", hex);
|
||||||
|
os_free(hex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (auth->net_access_key) {
|
||||||
|
char *hex;
|
||||||
|
size_t hexlen;
|
||||||
|
|
||||||
|
hexlen = 2 * wpabuf_len(auth->net_access_key) + 1;
|
||||||
|
hex = os_malloc(hexlen);
|
||||||
|
if (hex) {
|
||||||
|
wpa_snprintf_hex(hex, hexlen,
|
||||||
|
wpabuf_head(auth->net_access_key),
|
||||||
|
wpabuf_len(auth->net_access_key));
|
||||||
|
if (auth->net_access_key_expiry)
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO,
|
||||||
|
DPP_EVENT_NET_ACCESS_KEY "%s %lu", hex,
|
||||||
|
(unsigned long)
|
||||||
|
auth->net_access_key_expiry);
|
||||||
|
else
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO,
|
||||||
|
DPP_EVENT_NET_ACCESS_KEY "%s", hex);
|
||||||
|
os_free(hex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dpp_auth_deinit(hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth = NULL;
|
||||||
|
return;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_CONF_FAILED);
|
||||||
|
dpp_auth_deinit(hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_start_gas_client(struct hostapd_data *hapd)
|
||||||
|
{
|
||||||
|
struct dpp_authentication *auth = hapd->dpp_auth;
|
||||||
|
struct wpabuf *buf, *conf_req;
|
||||||
|
char json[100];
|
||||||
|
int res;
|
||||||
|
int netrole_ap = 1;
|
||||||
|
|
||||||
|
os_snprintf(json, sizeof(json),
|
||||||
|
"{\"name\":\"Test\","
|
||||||
|
"\"wi-fi_tech\":\"infra\","
|
||||||
|
"\"netRole\":\"%s\"}",
|
||||||
|
netrole_ap ? "ap" : "sta");
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: GAS Config Attributes: %s", json);
|
||||||
|
|
||||||
|
conf_req = dpp_build_conf_req(auth, json);
|
||||||
|
if (!conf_req) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: No configuration request data available");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
buf = gas_build_initial_req(0, 10 + 2 + wpabuf_len(conf_req));
|
||||||
|
if (!buf) {
|
||||||
|
wpabuf_free(conf_req);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Advertisement Protocol IE */
|
||||||
|
wpabuf_put_u8(buf, WLAN_EID_ADV_PROTO);
|
||||||
|
wpabuf_put_u8(buf, 8); /* Length */
|
||||||
|
wpabuf_put_u8(buf, 0x7f);
|
||||||
|
wpabuf_put_u8(buf, WLAN_EID_VENDOR_SPECIFIC);
|
||||||
|
wpabuf_put_u8(buf, 5);
|
||||||
|
wpabuf_put_be24(buf, OUI_WFA);
|
||||||
|
wpabuf_put_u8(buf, DPP_OUI_TYPE);
|
||||||
|
wpabuf_put_u8(buf, 0x01);
|
||||||
|
|
||||||
|
/* GAS Query */
|
||||||
|
wpabuf_put_le16(buf, wpabuf_len(conf_req));
|
||||||
|
wpabuf_put_buf(buf, conf_req);
|
||||||
|
wpabuf_free(conf_req);
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: GAS request to " MACSTR " (freq %u MHz)",
|
||||||
|
MAC2STR(auth->peer_mac_addr), auth->curr_freq);
|
||||||
|
|
||||||
|
res = gas_query_ap_req(hapd->gas, auth->peer_mac_addr, auth->curr_freq,
|
||||||
|
buf, hostapd_dpp_gas_resp_cb, hapd);
|
||||||
|
if (res < 0) {
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_DEBUG,
|
||||||
|
"GAS: Failed to send Query Request");
|
||||||
|
wpabuf_free(buf);
|
||||||
|
} else {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: GAS query started with dialog token %u", res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_auth_success(struct hostapd_data *hapd, int initiator)
|
||||||
|
{
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Authentication succeeded");
|
||||||
|
wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_AUTH_SUCCESS "init=%d",
|
||||||
|
initiator);
|
||||||
|
|
||||||
|
if (!hapd->dpp_auth->configurator)
|
||||||
|
hostapd_dpp_start_gas_client(hapd);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_rx_auth_resp(struct hostapd_data *hapd, const u8 *src,
|
||||||
|
const u8 *buf, size_t len)
|
||||||
|
{
|
||||||
|
struct dpp_authentication *auth = hapd->dpp_auth;
|
||||||
|
struct wpabuf *msg, *attr;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Authentication Response from " MACSTR,
|
||||||
|
MAC2STR(src));
|
||||||
|
|
||||||
|
if (!auth) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: No DPP Authentication in progress - drop");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_zero_ether_addr(auth->peer_mac_addr) &&
|
||||||
|
os_memcmp(src, auth->peer_mac_addr, ETH_ALEN) != 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: MAC address mismatch (expected "
|
||||||
|
MACSTR ") - drop", MAC2STR(auth->peer_mac_addr));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
attr = dpp_auth_resp_rx(auth, buf, len);
|
||||||
|
if (!attr) {
|
||||||
|
if (auth->auth_resp_status == DPP_STATUS_RESPONSE_PENDING) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Wait for full response");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: No confirm generated");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
os_memcpy(auth->peer_mac_addr, src, ETH_ALEN);
|
||||||
|
|
||||||
|
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_CONF, wpabuf_len(attr));
|
||||||
|
if (!msg) {
|
||||||
|
wpabuf_free(attr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wpabuf_put_buf(msg, attr);
|
||||||
|
wpabuf_free(attr);
|
||||||
|
|
||||||
|
hostapd_drv_send_action(hapd, auth->curr_freq, 0, src,
|
||||||
|
wpabuf_head(msg), wpabuf_len(msg));
|
||||||
|
wpabuf_free(msg);
|
||||||
|
hapd->dpp_auth_ok_on_ack = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void hostapd_dpp_rx_auth_conf(struct hostapd_data *hapd, const u8 *src,
|
||||||
|
const u8 *buf, size_t len)
|
||||||
|
{
|
||||||
|
struct dpp_authentication *auth = hapd->dpp_auth;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Authentication Confirmation from " MACSTR,
|
||||||
|
MAC2STR(src));
|
||||||
|
|
||||||
|
if (!auth) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: No DPP Authentication in progress - drop");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (os_memcmp(src, auth->peer_mac_addr, ETH_ALEN) != 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: MAC address mismatch (expected "
|
||||||
|
MACSTR ") - drop", MAC2STR(auth->peer_mac_addr));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dpp_auth_conf_rx(auth, buf, len) < 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "DPP: Authentication failed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hostapd_dpp_auth_success(hapd, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void hostapd_dpp_rx_action(struct hostapd_data *hapd, const u8 *src,
|
||||||
|
const u8 *buf, size_t len, unsigned int freq)
|
||||||
|
{
|
||||||
|
enum dpp_public_action_frame_type type;
|
||||||
|
|
||||||
|
if (len < 1)
|
||||||
|
return;
|
||||||
|
type = buf[0];
|
||||||
|
buf++;
|
||||||
|
len--;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Received DPP Public Action frame type %d from "
|
||||||
|
MACSTR " freq=%u",
|
||||||
|
type, MAC2STR(src), freq);
|
||||||
|
wpa_hexdump(MSG_MSGDUMP, "DPP: Received message attributes", buf, len);
|
||||||
|
if (dpp_check_attrs(buf, len) < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (type) {
|
||||||
|
case DPP_PA_AUTHENTICATION_REQ:
|
||||||
|
hostapd_dpp_rx_auth_req(hapd, src, buf, len, freq);
|
||||||
|
break;
|
||||||
|
case DPP_PA_AUTHENTICATION_RESP:
|
||||||
|
hostapd_dpp_rx_auth_resp(hapd, src, buf, len);
|
||||||
|
break;
|
||||||
|
case DPP_PA_AUTHENTICATION_CONF:
|
||||||
|
hostapd_dpp_rx_auth_conf(hapd, src, buf, len);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"DPP: Ignored unsupported frame subtype %d", type);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int hostapd_dpp_init(struct hostapd_data *hapd)
|
||||||
|
{
|
||||||
|
dl_list_init(&hapd->dpp_bootstrap);
|
||||||
|
hapd->dpp_allowed_roles = DPP_CAPAB_CONFIGURATOR | DPP_CAPAB_ENROLLEE;
|
||||||
|
hapd->dpp_init_done = 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void hostapd_dpp_deinit(struct hostapd_data *hapd)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_TESTING_OPTIONS
|
||||||
|
os_free(hapd->dpp_config_obj_override);
|
||||||
|
hapd->dpp_config_obj_override = NULL;
|
||||||
|
os_free(hapd->dpp_discovery_override);
|
||||||
|
hapd->dpp_discovery_override = NULL;
|
||||||
|
os_free(hapd->dpp_groups_override);
|
||||||
|
hapd->dpp_groups_override = NULL;
|
||||||
|
os_free(hapd->dpp_devices_override);
|
||||||
|
hapd->dpp_devices_override = NULL;
|
||||||
|
hapd->dpp_ignore_netaccesskey_mismatch = 0;
|
||||||
|
#endif /* CONFIG_TESTING_OPTIONS */
|
||||||
|
if (!hapd->dpp_init_done)
|
||||||
|
return;
|
||||||
|
dpp_bootstrap_del(hapd, 0);
|
||||||
|
dpp_auth_deinit(hapd->dpp_auth);
|
||||||
|
hapd->dpp_auth = NULL;
|
||||||
|
}
|
||||||
25
src/ap/dpp_hostapd.h
Normal file
25
src/ap/dpp_hostapd.h
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* hostapd / DPP integration
|
||||||
|
* Copyright (c) 2017, Qualcomm Atheros, Inc.
|
||||||
|
*
|
||||||
|
* This software may be distributed under the terms of the BSD license.
|
||||||
|
* See README for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef DPP_HOSTAPD_H
|
||||||
|
#define DPP_HOSTAPD_H
|
||||||
|
|
||||||
|
int hostapd_dpp_qr_code(struct hostapd_data *hapd, const char *cmd);
|
||||||
|
int hostapd_dpp_bootstrap_gen(struct hostapd_data *hapd, const char *cmd);
|
||||||
|
int hostapd_dpp_bootstrap_remove(struct hostapd_data *hapd, const char *id);
|
||||||
|
const char * hostapd_dpp_bootstrap_get_uri(struct hostapd_data *hapd,
|
||||||
|
unsigned int id);
|
||||||
|
int hostapd_dpp_auth_init(struct hostapd_data *hapd, const char *cmd);
|
||||||
|
void hostapd_dpp_rx_action(struct hostapd_data *hapd, const u8 *src,
|
||||||
|
const u8 *buf, size_t len, unsigned int freq);
|
||||||
|
void hostapd_dpp_tx_status(struct hostapd_data *hapd, const u8 *dst,
|
||||||
|
const u8 *data, size_t data_len, int ok);
|
||||||
|
int hostapd_dpp_init(struct hostapd_data *hapd);
|
||||||
|
void hostapd_dpp_deinit(struct hostapd_data *hapd);
|
||||||
|
|
||||||
|
#endif /* DPP_HOSTAPD_H */
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
#include "drivers/driver.h"
|
#include "drivers/driver.h"
|
||||||
#include "common/ieee802_11_defs.h"
|
#include "common/ieee802_11_defs.h"
|
||||||
#include "common/ieee802_11_common.h"
|
#include "common/ieee802_11_common.h"
|
||||||
|
#include "common/dpp.h"
|
||||||
#include "common/wpa_ctrl.h"
|
#include "common/wpa_ctrl.h"
|
||||||
#include "crypto/random.h"
|
#include "crypto/random.h"
|
||||||
#include "p2p/p2p.h"
|
#include "p2p/p2p.h"
|
||||||
|
|
@ -36,6 +37,7 @@
|
||||||
#include "dfs.h"
|
#include "dfs.h"
|
||||||
#include "beacon.h"
|
#include "beacon.h"
|
||||||
#include "mbo_ap.h"
|
#include "mbo_ap.h"
|
||||||
|
#include "dpp_hostapd.h"
|
||||||
|
|
||||||
|
|
||||||
int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
|
int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
|
||||||
|
|
@ -890,7 +892,23 @@ static void hostapd_action_rx(struct hostapd_data *hapd,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_FST */
|
#endif /* CONFIG_FST */
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
if (plen >= 1 + 4 &&
|
||||||
|
mgmt->u.action.u.vs_public_action.action ==
|
||||||
|
WLAN_PA_VENDOR_SPECIFIC &&
|
||||||
|
WPA_GET_BE24(mgmt->u.action.u.vs_public_action.oui) ==
|
||||||
|
OUI_WFA &&
|
||||||
|
mgmt->u.action.u.vs_public_action.variable[0] ==
|
||||||
|
DPP_OUI_TYPE) {
|
||||||
|
const u8 *pos, *end;
|
||||||
|
|
||||||
|
pos = &mgmt->u.action.u.vs_public_action.variable[1];
|
||||||
|
end = drv_mgmt->frame + drv_mgmt->frame_len;
|
||||||
|
hostapd_dpp_rx_action(hapd, mgmt->sa, pos, end - pos,
|
||||||
|
drv_mgmt->freq);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
714
src/ap/gas_query_ap.c
Normal file
714
src/ap/gas_query_ap.c
Normal file
|
|
@ -0,0 +1,714 @@
|
||||||
|
/*
|
||||||
|
* Generic advertisement service (GAS) query (hostapd)
|
||||||
|
* Copyright (c) 2009, Atheros Communications
|
||||||
|
* Copyright (c) 2011-2017, Qualcomm Atheros, Inc.
|
||||||
|
* Copyright (c) 2011-2014, Jouni Malinen <j@w1.fi>
|
||||||
|
*
|
||||||
|
* This software may be distributed under the terms of the BSD license.
|
||||||
|
* See README for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "includes.h"
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
#include "utils/eloop.h"
|
||||||
|
#include "utils/list.h"
|
||||||
|
#include "common/ieee802_11_defs.h"
|
||||||
|
#include "common/gas.h"
|
||||||
|
#include "common/wpa_ctrl.h"
|
||||||
|
#include "hostapd.h"
|
||||||
|
#include "sta_info.h"
|
||||||
|
#include "ap_drv_ops.h"
|
||||||
|
#include "gas_query_ap.h"
|
||||||
|
|
||||||
|
|
||||||
|
/** GAS query timeout in seconds */
|
||||||
|
#define GAS_QUERY_TIMEOUT_PERIOD 2
|
||||||
|
|
||||||
|
/* GAS query wait-time / duration in ms */
|
||||||
|
#define GAS_QUERY_WAIT_TIME_INITIAL 1000
|
||||||
|
#define GAS_QUERY_WAIT_TIME_COMEBACK 150
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct gas_query_pending - Pending GAS query
|
||||||
|
*/
|
||||||
|
struct gas_query_pending {
|
||||||
|
struct dl_list list;
|
||||||
|
struct gas_query_ap *gas;
|
||||||
|
u8 addr[ETH_ALEN];
|
||||||
|
u8 dialog_token;
|
||||||
|
u8 next_frag_id;
|
||||||
|
unsigned int wait_comeback:1;
|
||||||
|
unsigned int offchannel_tx_started:1;
|
||||||
|
unsigned int retry:1;
|
||||||
|
int freq;
|
||||||
|
u16 status_code;
|
||||||
|
struct wpabuf *req;
|
||||||
|
struct wpabuf *adv_proto;
|
||||||
|
struct wpabuf *resp;
|
||||||
|
struct os_reltime last_oper;
|
||||||
|
void (*cb)(void *ctx, const u8 *dst, u8 dialog_token,
|
||||||
|
enum gas_query_ap_result result,
|
||||||
|
const struct wpabuf *adv_proto,
|
||||||
|
const struct wpabuf *resp, u16 status_code);
|
||||||
|
void *ctx;
|
||||||
|
u8 sa[ETH_ALEN];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct gas_query_ap - Internal GAS query data
|
||||||
|
*/
|
||||||
|
struct gas_query_ap {
|
||||||
|
struct hostapd_data *hapd;
|
||||||
|
void *msg_ctx;
|
||||||
|
struct dl_list pending; /* struct gas_query_pending */
|
||||||
|
struct gas_query_pending *current;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_tx_comeback_timeout(void *eloop_data, void *user_ctx);
|
||||||
|
static void gas_query_timeout(void *eloop_data, void *user_ctx);
|
||||||
|
static void gas_query_rx_comeback_timeout(void *eloop_data, void *user_ctx);
|
||||||
|
static void gas_query_tx_initial_req(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query);
|
||||||
|
static int gas_query_new_dialog_token(struct gas_query_ap *gas, const u8 *dst);
|
||||||
|
|
||||||
|
|
||||||
|
static int ms_from_time(struct os_reltime *last)
|
||||||
|
{
|
||||||
|
struct os_reltime now, res;
|
||||||
|
|
||||||
|
os_get_reltime(&now);
|
||||||
|
os_reltime_sub(&now, last, &res);
|
||||||
|
return res.sec * 1000 + res.usec / 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gas_query_ap_init - Initialize GAS query component
|
||||||
|
* @hapd: Pointer to hostapd data
|
||||||
|
* Returns: Pointer to GAS query data or %NULL on failure
|
||||||
|
*/
|
||||||
|
struct gas_query_ap * gas_query_ap_init(struct hostapd_data *hapd,
|
||||||
|
void *msg_ctx)
|
||||||
|
{
|
||||||
|
struct gas_query_ap *gas;
|
||||||
|
|
||||||
|
gas = os_zalloc(sizeof(*gas));
|
||||||
|
if (!gas)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
gas->hapd = hapd;
|
||||||
|
gas->msg_ctx = msg_ctx;
|
||||||
|
dl_list_init(&gas->pending);
|
||||||
|
|
||||||
|
return gas;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static const char * gas_result_txt(enum gas_query_ap_result result)
|
||||||
|
{
|
||||||
|
switch (result) {
|
||||||
|
case GAS_QUERY_AP_SUCCESS:
|
||||||
|
return "SUCCESS";
|
||||||
|
case GAS_QUERY_AP_FAILURE:
|
||||||
|
return "FAILURE";
|
||||||
|
case GAS_QUERY_AP_TIMEOUT:
|
||||||
|
return "TIMEOUT";
|
||||||
|
case GAS_QUERY_AP_PEER_ERROR:
|
||||||
|
return "PEER_ERROR";
|
||||||
|
case GAS_QUERY_AP_INTERNAL_ERROR:
|
||||||
|
return "INTERNAL_ERROR";
|
||||||
|
case GAS_QUERY_AP_DELETED_AT_DEINIT:
|
||||||
|
return "DELETED_AT_DEINIT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_free(struct gas_query_pending *query, int del_list)
|
||||||
|
{
|
||||||
|
if (del_list)
|
||||||
|
dl_list_del(&query->list);
|
||||||
|
|
||||||
|
wpabuf_free(query->req);
|
||||||
|
wpabuf_free(query->adv_proto);
|
||||||
|
wpabuf_free(query->resp);
|
||||||
|
os_free(query);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_done(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query,
|
||||||
|
enum gas_query_ap_result result)
|
||||||
|
{
|
||||||
|
wpa_msg(gas->msg_ctx, MSG_INFO, GAS_QUERY_DONE "addr=" MACSTR
|
||||||
|
" dialog_token=%u freq=%d status_code=%u result=%s",
|
||||||
|
MAC2STR(query->addr), query->dialog_token, query->freq,
|
||||||
|
query->status_code, gas_result_txt(result));
|
||||||
|
if (gas->current == query)
|
||||||
|
gas->current = NULL;
|
||||||
|
eloop_cancel_timeout(gas_query_tx_comeback_timeout, gas, query);
|
||||||
|
eloop_cancel_timeout(gas_query_timeout, gas, query);
|
||||||
|
eloop_cancel_timeout(gas_query_rx_comeback_timeout, gas, query);
|
||||||
|
dl_list_del(&query->list);
|
||||||
|
query->cb(query->ctx, query->addr, query->dialog_token, result,
|
||||||
|
query->adv_proto, query->resp, query->status_code);
|
||||||
|
gas_query_free(query, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gas_query_ap_deinit - Deinitialize GAS query component
|
||||||
|
* @gas: GAS query data from gas_query_init()
|
||||||
|
*/
|
||||||
|
void gas_query_ap_deinit(struct gas_query_ap *gas)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *query, *next;
|
||||||
|
|
||||||
|
if (gas == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
dl_list_for_each_safe(query, next, &gas->pending,
|
||||||
|
struct gas_query_pending, list)
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_DELETED_AT_DEINIT);
|
||||||
|
|
||||||
|
os_free(gas);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct gas_query_pending *
|
||||||
|
gas_query_get_pending(struct gas_query_ap *gas, const u8 *addr, u8 dialog_token)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *q;
|
||||||
|
dl_list_for_each(q, &gas->pending, struct gas_query_pending, list) {
|
||||||
|
if (os_memcmp(q->addr, addr, ETH_ALEN) == 0 &&
|
||||||
|
q->dialog_token == dialog_token)
|
||||||
|
return q;
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int gas_query_append(struct gas_query_pending *query, const u8 *data,
|
||||||
|
size_t len)
|
||||||
|
{
|
||||||
|
if (wpabuf_resize(&query->resp, len) < 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No memory to store the response");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
wpabuf_put_data(query->resp, data, len);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void gas_query_ap_tx_status(struct gas_query_ap *gas, const u8 *dst,
|
||||||
|
const u8 *data, size_t data_len, int ok)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *query;
|
||||||
|
int dur;
|
||||||
|
|
||||||
|
if (!gas || !gas->current) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Unexpected TX status: dst=" MACSTR
|
||||||
|
" ok=%d - no query in progress", MAC2STR(dst), ok);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
query = gas->current;
|
||||||
|
|
||||||
|
dur = ms_from_time(&query->last_oper);
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: TX status: dst=" MACSTR
|
||||||
|
" ok=%d query=%p dialog_token=%u dur=%d ms",
|
||||||
|
MAC2STR(dst), ok, query, query->dialog_token, dur);
|
||||||
|
if (os_memcmp(dst, query->addr, ETH_ALEN) != 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: TX status for unexpected destination");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
os_get_reltime(&query->last_oper);
|
||||||
|
|
||||||
|
eloop_cancel_timeout(gas_query_timeout, gas, query);
|
||||||
|
if (!ok) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No ACK to GAS request");
|
||||||
|
eloop_register_timeout(0, 250000, gas_query_timeout,
|
||||||
|
gas, query);
|
||||||
|
} else {
|
||||||
|
eloop_register_timeout(GAS_QUERY_TIMEOUT_PERIOD, 0,
|
||||||
|
gas_query_timeout, gas, query);
|
||||||
|
}
|
||||||
|
if (query->wait_comeback && !query->retry) {
|
||||||
|
eloop_cancel_timeout(gas_query_rx_comeback_timeout,
|
||||||
|
gas, query);
|
||||||
|
eloop_register_timeout(
|
||||||
|
0, (GAS_QUERY_WAIT_TIME_COMEBACK + 10) * 1000,
|
||||||
|
gas_query_rx_comeback_timeout, gas, query);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int pmf_in_use(struct hostapd_data *hapd, const u8 *addr)
|
||||||
|
{
|
||||||
|
struct sta_info *sta;
|
||||||
|
|
||||||
|
sta = ap_get_sta(hapd, addr);
|
||||||
|
return sta && (sta->flags & WLAN_STA_MFP);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int gas_query_tx(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query,
|
||||||
|
struct wpabuf *req, unsigned int wait_time)
|
||||||
|
{
|
||||||
|
int res, prot = pmf_in_use(gas->hapd, query->addr);
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Send action frame to " MACSTR " len=%u "
|
||||||
|
"freq=%d prot=%d using src addr " MACSTR,
|
||||||
|
MAC2STR(query->addr), (unsigned int) wpabuf_len(req),
|
||||||
|
query->freq, prot, MAC2STR(query->sa));
|
||||||
|
if (prot) {
|
||||||
|
u8 *categ = wpabuf_mhead_u8(req);
|
||||||
|
*categ = WLAN_ACTION_PROTECTED_DUAL;
|
||||||
|
}
|
||||||
|
os_get_reltime(&query->last_oper);
|
||||||
|
res = hostapd_drv_send_action(gas->hapd, query->freq, wait_time,
|
||||||
|
query->addr, wpabuf_head(req),
|
||||||
|
wpabuf_len(req));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_tx_comeback_req(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query)
|
||||||
|
{
|
||||||
|
struct wpabuf *req;
|
||||||
|
unsigned int wait_time;
|
||||||
|
|
||||||
|
req = gas_build_comeback_req(query->dialog_token);
|
||||||
|
if (req == NULL) {
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_time = (query->retry || !query->offchannel_tx_started) ?
|
||||||
|
GAS_QUERY_WAIT_TIME_INITIAL : GAS_QUERY_WAIT_TIME_COMEBACK;
|
||||||
|
|
||||||
|
if (gas_query_tx(gas, query, req, wait_time) < 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Failed to send Action frame to "
|
||||||
|
MACSTR, MAC2STR(query->addr));
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
wpabuf_free(req);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_rx_comeback_timeout(void *eloop_data, void *user_ctx)
|
||||||
|
{
|
||||||
|
struct gas_query_ap *gas = eloop_data;
|
||||||
|
struct gas_query_pending *query = user_ctx;
|
||||||
|
int dialog_token;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"GAS: No response to comeback request received (retry=%u)",
|
||||||
|
query->retry);
|
||||||
|
if (gas->current != query || query->retry)
|
||||||
|
return;
|
||||||
|
dialog_token = gas_query_new_dialog_token(gas, query->addr);
|
||||||
|
if (dialog_token < 0)
|
||||||
|
return;
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"GAS: Retry GAS query due to comeback response timeout");
|
||||||
|
query->retry = 1;
|
||||||
|
query->dialog_token = dialog_token;
|
||||||
|
*(wpabuf_mhead_u8(query->req) + 2) = dialog_token;
|
||||||
|
query->wait_comeback = 0;
|
||||||
|
query->next_frag_id = 0;
|
||||||
|
wpabuf_free(query->adv_proto);
|
||||||
|
query->adv_proto = NULL;
|
||||||
|
eloop_cancel_timeout(gas_query_tx_comeback_timeout, gas, query);
|
||||||
|
eloop_cancel_timeout(gas_query_timeout, gas, query);
|
||||||
|
gas_query_tx_initial_req(gas, query);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_tx_comeback_timeout(void *eloop_data, void *user_ctx)
|
||||||
|
{
|
||||||
|
struct gas_query_ap *gas = eloop_data;
|
||||||
|
struct gas_query_pending *query = user_ctx;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Comeback timeout for request to " MACSTR,
|
||||||
|
MAC2STR(query->addr));
|
||||||
|
gas_query_tx_comeback_req(gas, query);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_tx_comeback_req_delay(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query,
|
||||||
|
u16 comeback_delay)
|
||||||
|
{
|
||||||
|
unsigned int secs, usecs;
|
||||||
|
|
||||||
|
secs = (comeback_delay * 1024) / 1000000;
|
||||||
|
usecs = comeback_delay * 1024 - secs * 1000000;
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Send comeback request to " MACSTR
|
||||||
|
" in %u secs %u usecs", MAC2STR(query->addr), secs, usecs);
|
||||||
|
eloop_cancel_timeout(gas_query_tx_comeback_timeout, gas, query);
|
||||||
|
eloop_register_timeout(secs, usecs, gas_query_tx_comeback_timeout,
|
||||||
|
gas, query);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_rx_initial(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query,
|
||||||
|
const u8 *adv_proto, const u8 *resp,
|
||||||
|
size_t len, u16 comeback_delay)
|
||||||
|
{
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Received initial response from "
|
||||||
|
MACSTR " (dialog_token=%u comeback_delay=%u)",
|
||||||
|
MAC2STR(query->addr), query->dialog_token, comeback_delay);
|
||||||
|
|
||||||
|
query->adv_proto = wpabuf_alloc_copy(adv_proto, 2 + adv_proto[1]);
|
||||||
|
if (query->adv_proto == NULL) {
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (comeback_delay) {
|
||||||
|
eloop_cancel_timeout(gas_query_timeout, gas, query);
|
||||||
|
query->wait_comeback = 1;
|
||||||
|
gas_query_tx_comeback_req_delay(gas, query, comeback_delay);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Query was completed without comeback mechanism */
|
||||||
|
if (gas_query_append(query, resp, len) < 0) {
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_rx_comeback(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query,
|
||||||
|
const u8 *adv_proto, const u8 *resp,
|
||||||
|
size_t len, u8 frag_id, u8 more_frags,
|
||||||
|
u16 comeback_delay)
|
||||||
|
{
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Received comeback response from "
|
||||||
|
MACSTR " (dialog_token=%u frag_id=%u more_frags=%u "
|
||||||
|
"comeback_delay=%u)",
|
||||||
|
MAC2STR(query->addr), query->dialog_token, frag_id,
|
||||||
|
more_frags, comeback_delay);
|
||||||
|
eloop_cancel_timeout(gas_query_rx_comeback_timeout, gas, query);
|
||||||
|
|
||||||
|
if ((size_t) 2 + adv_proto[1] != wpabuf_len(query->adv_proto) ||
|
||||||
|
os_memcmp(adv_proto, wpabuf_head(query->adv_proto),
|
||||||
|
wpabuf_len(query->adv_proto)) != 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Advertisement Protocol changed "
|
||||||
|
"between initial and comeback response from "
|
||||||
|
MACSTR, MAC2STR(query->addr));
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_PEER_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (comeback_delay) {
|
||||||
|
if (frag_id) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Invalid comeback response "
|
||||||
|
"with non-zero frag_id and comeback_delay "
|
||||||
|
"from " MACSTR, MAC2STR(query->addr));
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_PEER_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gas_query_tx_comeback_req_delay(gas, query, comeback_delay);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (frag_id != query->next_frag_id) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Unexpected frag_id in response "
|
||||||
|
"from " MACSTR, MAC2STR(query->addr));
|
||||||
|
if (frag_id + 1 == query->next_frag_id) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Drop frame as possible "
|
||||||
|
"retry of previous fragment");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_PEER_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
query->next_frag_id++;
|
||||||
|
|
||||||
|
if (gas_query_append(query, resp, len) < 0) {
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (more_frags) {
|
||||||
|
gas_query_tx_comeback_req(gas, query);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gas_query_ap_rx - Indicate reception of a Public Action or Protected Dual
|
||||||
|
* frame
|
||||||
|
* @gas: GAS query data from gas_query_init()
|
||||||
|
* @sa: Source MAC address of the Action frame
|
||||||
|
* @categ: Category of the Action frame
|
||||||
|
* @data: Payload of the Action frame
|
||||||
|
* @len: Length of @data
|
||||||
|
* @freq: Frequency (in MHz) on which the frame was received
|
||||||
|
* Returns: 0 if the Public Action frame was a GAS frame or -1 if not
|
||||||
|
*/
|
||||||
|
int gas_query_ap_rx(struct gas_query_ap *gas, const u8 *sa, u8 categ,
|
||||||
|
const u8 *data, size_t len, int freq)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *query;
|
||||||
|
u8 action, dialog_token, frag_id = 0, more_frags = 0;
|
||||||
|
u16 comeback_delay, resp_len;
|
||||||
|
const u8 *pos, *adv_proto;
|
||||||
|
int prot, pmf;
|
||||||
|
unsigned int left;
|
||||||
|
|
||||||
|
if (!gas || len < 4)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
pos = data;
|
||||||
|
action = *pos++;
|
||||||
|
dialog_token = *pos++;
|
||||||
|
|
||||||
|
if (action != WLAN_PA_GAS_INITIAL_RESP &&
|
||||||
|
action != WLAN_PA_GAS_COMEBACK_RESP)
|
||||||
|
return -1; /* Not a GAS response */
|
||||||
|
|
||||||
|
prot = categ == WLAN_ACTION_PROTECTED_DUAL;
|
||||||
|
pmf = pmf_in_use(gas->hapd, sa);
|
||||||
|
if (prot && !pmf) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Drop unexpected protected GAS frame when PMF is disabled");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (!prot && pmf) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Drop unexpected unprotected GAS frame when PMF is enabled");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
query = gas_query_get_pending(gas, sa, dialog_token);
|
||||||
|
if (query == NULL) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No pending query found for " MACSTR
|
||||||
|
" dialog token %u", MAC2STR(sa), dialog_token);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Response in %d ms from " MACSTR,
|
||||||
|
ms_from_time(&query->last_oper), MAC2STR(sa));
|
||||||
|
|
||||||
|
if (query->wait_comeback && action == WLAN_PA_GAS_INITIAL_RESP) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Unexpected initial response from "
|
||||||
|
MACSTR " dialog token %u when waiting for comeback "
|
||||||
|
"response", MAC2STR(sa), dialog_token);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!query->wait_comeback && action == WLAN_PA_GAS_COMEBACK_RESP) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Unexpected comeback response from "
|
||||||
|
MACSTR " dialog token %u when waiting for initial "
|
||||||
|
"response", MAC2STR(sa), dialog_token);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
query->status_code = WPA_GET_LE16(pos);
|
||||||
|
pos += 2;
|
||||||
|
|
||||||
|
if (query->status_code == WLAN_STATUS_QUERY_RESP_OUTSTANDING &&
|
||||||
|
action == WLAN_PA_GAS_COMEBACK_RESP) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Allow non-zero status for outstanding comeback response");
|
||||||
|
} else if (query->status_code != WLAN_STATUS_SUCCESS) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Query to " MACSTR " dialog token "
|
||||||
|
"%u failed - status code %u",
|
||||||
|
MAC2STR(sa), dialog_token, query->status_code);
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_FAILURE);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action == WLAN_PA_GAS_COMEBACK_RESP) {
|
||||||
|
if (pos + 1 > data + len)
|
||||||
|
return 0;
|
||||||
|
frag_id = *pos & 0x7f;
|
||||||
|
more_frags = (*pos & 0x80) >> 7;
|
||||||
|
pos++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Comeback Delay */
|
||||||
|
if (pos + 2 > data + len)
|
||||||
|
return 0;
|
||||||
|
comeback_delay = WPA_GET_LE16(pos);
|
||||||
|
pos += 2;
|
||||||
|
|
||||||
|
/* Advertisement Protocol element */
|
||||||
|
if (pos + 2 > data + len || pos + 2 + pos[1] > data + len) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No room for Advertisement "
|
||||||
|
"Protocol element in the response from " MACSTR,
|
||||||
|
MAC2STR(sa));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*pos != WLAN_EID_ADV_PROTO) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Unexpected Advertisement "
|
||||||
|
"Protocol element ID %u in response from " MACSTR,
|
||||||
|
*pos, MAC2STR(sa));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
adv_proto = pos;
|
||||||
|
pos += 2 + pos[1];
|
||||||
|
|
||||||
|
/* Query Response Length */
|
||||||
|
if (pos + 2 > data + len) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No room for GAS Response Length");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
resp_len = WPA_GET_LE16(pos);
|
||||||
|
pos += 2;
|
||||||
|
|
||||||
|
left = data + len - pos;
|
||||||
|
if (resp_len > left) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Truncated Query Response in "
|
||||||
|
"response from " MACSTR, MAC2STR(sa));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resp_len < left) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Ignore %u octets of extra data "
|
||||||
|
"after Query Response from " MACSTR,
|
||||||
|
left - resp_len, MAC2STR(sa));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action == WLAN_PA_GAS_COMEBACK_RESP)
|
||||||
|
gas_query_rx_comeback(gas, query, adv_proto, pos, resp_len,
|
||||||
|
frag_id, more_frags, comeback_delay);
|
||||||
|
else
|
||||||
|
gas_query_rx_initial(gas, query, adv_proto, pos, resp_len,
|
||||||
|
comeback_delay);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_timeout(void *eloop_data, void *user_ctx)
|
||||||
|
{
|
||||||
|
struct gas_query_ap *gas = eloop_data;
|
||||||
|
struct gas_query_pending *query = user_ctx;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: No response received for query to " MACSTR
|
||||||
|
" dialog token %u",
|
||||||
|
MAC2STR(query->addr), query->dialog_token);
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_TIMEOUT);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int gas_query_dialog_token_available(struct gas_query_ap *gas,
|
||||||
|
const u8 *dst, u8 dialog_token)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *q;
|
||||||
|
dl_list_for_each(q, &gas->pending, struct gas_query_pending, list) {
|
||||||
|
if (os_memcmp(dst, q->addr, ETH_ALEN) == 0 &&
|
||||||
|
dialog_token == q->dialog_token)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void gas_query_tx_initial_req(struct gas_query_ap *gas,
|
||||||
|
struct gas_query_pending *query)
|
||||||
|
{
|
||||||
|
if (gas_query_tx(gas, query, query->req,
|
||||||
|
GAS_QUERY_WAIT_TIME_INITIAL) < 0) {
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Failed to send Action frame to "
|
||||||
|
MACSTR, MAC2STR(query->addr));
|
||||||
|
gas_query_done(gas, query, GAS_QUERY_AP_INTERNAL_ERROR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gas->current = query;
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "GAS: Starting query timeout for dialog token %u",
|
||||||
|
query->dialog_token);
|
||||||
|
eloop_register_timeout(GAS_QUERY_TIMEOUT_PERIOD, 0,
|
||||||
|
gas_query_timeout, gas, query);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int gas_query_new_dialog_token(struct gas_query_ap *gas, const u8 *dst)
|
||||||
|
{
|
||||||
|
static int next_start = 0;
|
||||||
|
int dialog_token;
|
||||||
|
|
||||||
|
for (dialog_token = 0; dialog_token < 256; dialog_token++) {
|
||||||
|
if (gas_query_dialog_token_available(
|
||||||
|
gas, dst, (next_start + dialog_token) % 256))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (dialog_token == 256)
|
||||||
|
return -1; /* Too many pending queries */
|
||||||
|
dialog_token = (next_start + dialog_token) % 256;
|
||||||
|
next_start = (dialog_token + 1) % 256;
|
||||||
|
return dialog_token;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gas_query_ap_req - Request a GAS query
|
||||||
|
* @gas: GAS query data from gas_query_init()
|
||||||
|
* @dst: Destination MAC address for the query
|
||||||
|
* @freq: Frequency (in MHz) for the channel on which to send the query
|
||||||
|
* @req: GAS query payload (to be freed by gas_query module in case of success
|
||||||
|
* return)
|
||||||
|
* @cb: Callback function for reporting GAS query result and response
|
||||||
|
* @ctx: Context pointer to use with the @cb call
|
||||||
|
* Returns: dialog token (>= 0) on success or -1 on failure
|
||||||
|
*/
|
||||||
|
int gas_query_ap_req(struct gas_query_ap *gas, const u8 *dst, int freq,
|
||||||
|
struct wpabuf *req,
|
||||||
|
void (*cb)(void *ctx, const u8 *dst, u8 dialog_token,
|
||||||
|
enum gas_query_ap_result result,
|
||||||
|
const struct wpabuf *adv_proto,
|
||||||
|
const struct wpabuf *resp, u16 status_code),
|
||||||
|
void *ctx)
|
||||||
|
{
|
||||||
|
struct gas_query_pending *query;
|
||||||
|
int dialog_token;
|
||||||
|
|
||||||
|
if (!gas || wpabuf_len(req) < 3)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
dialog_token = gas_query_new_dialog_token(gas, dst);
|
||||||
|
if (dialog_token < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
query = os_zalloc(sizeof(*query));
|
||||||
|
if (query == NULL)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
query->gas = gas;
|
||||||
|
os_memcpy(query->addr, dst, ETH_ALEN);
|
||||||
|
query->dialog_token = dialog_token;
|
||||||
|
query->freq = freq;
|
||||||
|
query->cb = cb;
|
||||||
|
query->ctx = ctx;
|
||||||
|
query->req = req;
|
||||||
|
dl_list_add(&gas->pending, &query->list);
|
||||||
|
|
||||||
|
*(wpabuf_mhead_u8(req) + 2) = dialog_token;
|
||||||
|
|
||||||
|
wpa_msg(gas->msg_ctx, MSG_INFO, GAS_QUERY_START "addr=" MACSTR
|
||||||
|
" dialog_token=%u freq=%d",
|
||||||
|
MAC2STR(query->addr), query->dialog_token, query->freq);
|
||||||
|
|
||||||
|
gas_query_tx_initial_req(gas, query);
|
||||||
|
|
||||||
|
return dialog_token;
|
||||||
|
}
|
||||||
43
src/ap/gas_query_ap.h
Normal file
43
src/ap/gas_query_ap.h
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
* Generic advertisement service (GAS) query
|
||||||
|
* Copyright (c) 2009, Atheros Communications
|
||||||
|
* Copyright (c) 2011-2017, Qualcomm Atheros
|
||||||
|
*
|
||||||
|
* This software may be distributed under the terms of the BSD license.
|
||||||
|
* See README for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef GAS_QUERY_AP_H
|
||||||
|
#define GAS_QUERY_AP_H
|
||||||
|
|
||||||
|
struct gas_query_ap;
|
||||||
|
|
||||||
|
struct gas_query_ap * gas_query_ap_init(struct hostapd_data *hapd,
|
||||||
|
void *msg_ctx);
|
||||||
|
void gas_query_ap_deinit(struct gas_query_ap *gas);
|
||||||
|
int gas_query_ap_rx(struct gas_query_ap *gas, const u8 *sa, u8 categ,
|
||||||
|
const u8 *data, size_t len, int freq);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* enum gas_query_ap_result - GAS query result
|
||||||
|
*/
|
||||||
|
enum gas_query_ap_result {
|
||||||
|
GAS_QUERY_AP_SUCCESS,
|
||||||
|
GAS_QUERY_AP_FAILURE,
|
||||||
|
GAS_QUERY_AP_TIMEOUT,
|
||||||
|
GAS_QUERY_AP_PEER_ERROR,
|
||||||
|
GAS_QUERY_AP_INTERNAL_ERROR,
|
||||||
|
GAS_QUERY_AP_DELETED_AT_DEINIT
|
||||||
|
};
|
||||||
|
|
||||||
|
int gas_query_ap_req(struct gas_query_ap *gas, const u8 *dst, int freq,
|
||||||
|
struct wpabuf *req,
|
||||||
|
void (*cb)(void *ctx, const u8 *dst, u8 dialog_token,
|
||||||
|
enum gas_query_ap_result result,
|
||||||
|
const struct wpabuf *adv_proto,
|
||||||
|
const struct wpabuf *resp, u16 status_code),
|
||||||
|
void *ctx);
|
||||||
|
void gas_query_ap_tx_status(struct gas_query_ap *gas, const u8 *dst,
|
||||||
|
const u8 *data, size_t data_len, int ok);
|
||||||
|
|
||||||
|
#endif /* GAS_QUERY_AP_H */
|
||||||
|
|
@ -31,6 +31,8 @@
|
||||||
#include "vlan_init.h"
|
#include "vlan_init.h"
|
||||||
#include "wpa_auth.h"
|
#include "wpa_auth.h"
|
||||||
#include "wps_hostapd.h"
|
#include "wps_hostapd.h"
|
||||||
|
#include "dpp_hostapd.h"
|
||||||
|
#include "gas_query_ap.h"
|
||||||
#include "hw_features.h"
|
#include "hw_features.h"
|
||||||
#include "wpa_auth_glue.h"
|
#include "wpa_auth_glue.h"
|
||||||
#include "ap_drv_ops.h"
|
#include "ap_drv_ops.h"
|
||||||
|
|
@ -302,6 +304,10 @@ static void hostapd_free_hapd_data(struct hostapd_data *hapd)
|
||||||
#endif /* CONFIG_NO_RADIUS */
|
#endif /* CONFIG_NO_RADIUS */
|
||||||
|
|
||||||
hostapd_deinit_wps(hapd);
|
hostapd_deinit_wps(hapd);
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
hostapd_dpp_deinit(hapd);
|
||||||
|
gas_query_ap_deinit(hapd->gas);
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
|
|
||||||
authsrv_deinit(hapd);
|
authsrv_deinit(hapd);
|
||||||
|
|
||||||
|
|
@ -1077,6 +1083,14 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
|
||||||
if (hostapd_init_wps(hapd, conf))
|
if (hostapd_init_wps(hapd, conf))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
hapd->gas = gas_query_ap_init(hapd, hapd->msg_ctx);
|
||||||
|
if (!hapd->gas)
|
||||||
|
return -1;
|
||||||
|
if (hostapd_dpp_init(hapd))
|
||||||
|
return -1;
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
|
|
||||||
if (authsrv_init(hapd) < 0)
|
if (authsrv_init(hapd) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -319,6 +319,23 @@ struct hostapd_data {
|
||||||
unsigned int range_req_active:1;
|
unsigned int range_req_active:1;
|
||||||
|
|
||||||
int dhcp_sock; /* UDP socket used with the DHCP server */
|
int dhcp_sock; /* UDP socket used with the DHCP server */
|
||||||
|
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
struct dl_list dpp_bootstrap; /* struct dpp_bootstrap_info */
|
||||||
|
int dpp_init_done;
|
||||||
|
struct dpp_authentication *dpp_auth;
|
||||||
|
u8 dpp_allowed_roles;
|
||||||
|
int dpp_qr_mutual;
|
||||||
|
int dpp_auth_ok_on_ack;
|
||||||
|
struct gas_query_ap *gas;
|
||||||
|
#ifdef CONFIG_TESTING_OPTIONS
|
||||||
|
char *dpp_config_obj_override;
|
||||||
|
char *dpp_discovery_override;
|
||||||
|
char *dpp_groups_override;
|
||||||
|
char *dpp_devices_override;
|
||||||
|
unsigned int dpp_ignore_netaccesskey_mismatch:1;
|
||||||
|
#endif /* CONFIG_TESTING_OPTIONS */
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
#include "common/ieee802_11_common.h"
|
#include "common/ieee802_11_common.h"
|
||||||
#include "common/wpa_ctrl.h"
|
#include "common/wpa_ctrl.h"
|
||||||
#include "common/sae.h"
|
#include "common/sae.h"
|
||||||
|
#include "common/dpp.h"
|
||||||
#include "radius/radius.h"
|
#include "radius/radius.h"
|
||||||
#include "radius/radius_client.h"
|
#include "radius/radius_client.h"
|
||||||
#include "p2p/p2p.h"
|
#include "p2p/p2p.h"
|
||||||
|
|
@ -46,6 +47,8 @@
|
||||||
#include "rrm.h"
|
#include "rrm.h"
|
||||||
#include "taxonomy.h"
|
#include "taxonomy.h"
|
||||||
#include "fils_hlp.h"
|
#include "fils_hlp.h"
|
||||||
|
#include "dpp_hostapd.h"
|
||||||
|
#include "gas_query_ap.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_FILS
|
#ifdef CONFIG_FILS
|
||||||
|
|
@ -3451,6 +3454,37 @@ static int handle_action(struct hostapd_data *hapd,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_IEEE80211N */
|
#endif /* CONFIG_IEEE80211N */
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
if (len >= IEEE80211_HDRLEN + 6 &&
|
||||||
|
mgmt->u.action.u.vs_public_action.action ==
|
||||||
|
WLAN_PA_VENDOR_SPECIFIC &&
|
||||||
|
WPA_GET_BE24(mgmt->u.action.u.vs_public_action.oui) ==
|
||||||
|
OUI_WFA &&
|
||||||
|
mgmt->u.action.u.vs_public_action.variable[0] ==
|
||||||
|
DPP_OUI_TYPE) {
|
||||||
|
const u8 *pos, *end;
|
||||||
|
|
||||||
|
pos = &mgmt->u.action.u.vs_public_action.variable[1];
|
||||||
|
end = ((const u8 *) mgmt) + len;
|
||||||
|
hostapd_dpp_rx_action(hapd, mgmt->sa, pos, end - pos,
|
||||||
|
hapd->iface->freq);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (len >= IEEE80211_HDRLEN + 2 &&
|
||||||
|
(mgmt->u.action.u.public_action.action ==
|
||||||
|
WLAN_PA_GAS_INITIAL_RESP ||
|
||||||
|
mgmt->u.action.u.public_action.action ==
|
||||||
|
WLAN_PA_GAS_COMEBACK_RESP)) {
|
||||||
|
const u8 *pos, *end;
|
||||||
|
|
||||||
|
pos = &mgmt->u.action.u.public_action.action;
|
||||||
|
end = ((const u8 *) mgmt) + len;
|
||||||
|
gas_query_ap_rx(hapd->gas, mgmt->sa,
|
||||||
|
mgmt->u.action.category,
|
||||||
|
pos, end - pos, hapd->iface->freq);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
if (hapd->public_action_cb) {
|
if (hapd->public_action_cb) {
|
||||||
hapd->public_action_cb(hapd->public_action_cb_ctx,
|
hapd->public_action_cb(hapd->public_action_cb_ctx,
|
||||||
(u8 *) mgmt, len,
|
(u8 *) mgmt, len,
|
||||||
|
|
@ -3905,6 +3939,36 @@ static void handle_action_cb(struct hostapd_data *hapd,
|
||||||
|
|
||||||
if (is_multicast_ether_addr(mgmt->da))
|
if (is_multicast_ether_addr(mgmt->da))
|
||||||
return;
|
return;
|
||||||
|
#ifdef CONFIG_DPP
|
||||||
|
if (len >= IEEE80211_HDRLEN + 6 &&
|
||||||
|
mgmt->u.action.category == WLAN_ACTION_PUBLIC &&
|
||||||
|
mgmt->u.action.u.vs_public_action.action ==
|
||||||
|
WLAN_PA_VENDOR_SPECIFIC &&
|
||||||
|
WPA_GET_BE24(mgmt->u.action.u.vs_public_action.oui) ==
|
||||||
|
OUI_WFA &&
|
||||||
|
mgmt->u.action.u.vs_public_action.variable[0] ==
|
||||||
|
DPP_OUI_TYPE) {
|
||||||
|
const u8 *pos, *end;
|
||||||
|
|
||||||
|
pos = &mgmt->u.action.u.vs_public_action.variable[1];
|
||||||
|
end = ((const u8 *) mgmt) + len;
|
||||||
|
hostapd_dpp_tx_status(hapd, mgmt->da, pos, end - pos, ok);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (len >= IEEE80211_HDRLEN + 2 &&
|
||||||
|
mgmt->u.action.category == WLAN_ACTION_PUBLIC &&
|
||||||
|
(mgmt->u.action.u.public_action.action ==
|
||||||
|
WLAN_PA_GAS_INITIAL_REQ ||
|
||||||
|
mgmt->u.action.u.public_action.action ==
|
||||||
|
WLAN_PA_GAS_COMEBACK_REQ)) {
|
||||||
|
const u8 *pos, *end;
|
||||||
|
|
||||||
|
pos = mgmt->u.action.u.public_action.variable;
|
||||||
|
end = ((const u8 *) mgmt) + len;
|
||||||
|
gas_query_ap_tx_status(hapd->gas, mgmt->da, pos, end - pos, ok);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_DPP */
|
||||||
sta = ap_get_sta(hapd, mgmt->da);
|
sta = ap_get_sta(hapd, mgmt->da);
|
||||||
if (!sta) {
|
if (!sta) {
|
||||||
wpa_printf(MSG_DEBUG, "handle_action_cb: STA " MACSTR
|
wpa_printf(MSG_DEBUG, "handle_action_cb: STA " MACSTR
|
||||||
|
|
|
||||||
|
|
@ -174,11 +174,11 @@ struct sta_info {
|
||||||
struct os_reltime sa_query_start;
|
struct os_reltime sa_query_start;
|
||||||
#endif /* CONFIG_IEEE80211W */
|
#endif /* CONFIG_IEEE80211W */
|
||||||
|
|
||||||
#ifdef CONFIG_INTERWORKING
|
#if defined(CONFIG_INTERWORKING) || defined(CONFIG_DPP)
|
||||||
#define GAS_DIALOG_MAX 8 /* Max concurrent dialog number */
|
#define GAS_DIALOG_MAX 8 /* Max concurrent dialog number */
|
||||||
struct gas_dialog_info *gas_dialog;
|
struct gas_dialog_info *gas_dialog;
|
||||||
u8 gas_dialog_next;
|
u8 gas_dialog_next;
|
||||||
#endif /* CONFIG_INTERWORKING */
|
#endif /* CONFIG_INTERWORKING || CONFIG_DPP */
|
||||||
|
|
||||||
struct wpabuf *wps_ie; /* WPS IE from (Re)Association Request */
|
struct wpabuf *wps_ie; /* WPS IE from (Re)Association Request */
|
||||||
struct wpabuf *p2p_ie; /* P2P IE from (Re)Association Request */
|
struct wpabuf *p2p_ie; /* P2P IE from (Re)Association Request */
|
||||||
|
|
|
||||||
|
|
@ -899,6 +899,10 @@ L_CFLAGS += -DEAP_SERVER_WSC
|
||||||
OBJS += src/ap/wps_hostapd.c
|
OBJS += src/ap/wps_hostapd.c
|
||||||
OBJS += src/eap_server/eap_server_wsc.c
|
OBJS += src/eap_server/eap_server_wsc.c
|
||||||
endif
|
endif
|
||||||
|
ifdef CONFIG_DPP
|
||||||
|
OBJS += src/ap/dpp_hostapd.c
|
||||||
|
OBJS += src/ap/gas_query_ap.c
|
||||||
|
endif
|
||||||
ifdef CONFIG_INTERWORKING
|
ifdef CONFIG_INTERWORKING
|
||||||
OBJS += src/ap/gas_serv.c
|
OBJS += src/ap/gas_serv.c
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -941,6 +941,10 @@ CFLAGS += -DEAP_SERVER_WSC
|
||||||
OBJS += ../src/ap/wps_hostapd.o
|
OBJS += ../src/ap/wps_hostapd.o
|
||||||
OBJS += ../src/eap_server/eap_server_wsc.o
|
OBJS += ../src/eap_server/eap_server_wsc.o
|
||||||
endif
|
endif
|
||||||
|
ifdef CONFIG_DPP
|
||||||
|
OBJS += ../src/ap/dpp_hostapd.o
|
||||||
|
OBJS += ../src/ap/gas_query_ap.o
|
||||||
|
endif
|
||||||
ifdef CONFIG_INTERWORKING
|
ifdef CONFIG_INTERWORKING
|
||||||
OBJS += ../src/ap/gas_serv.o
|
OBJS += ../src/ap/gas_serv.o
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue