DPP: Authentication exchange
Add wpa_supplicant control interface commands for managing DPP Authentication exchange. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen
Jouni Malinen
parent
be27e185b7
commit
30d27b048e
10 changed files with 2657 additions and 0 deletions
1894
src/common/dpp.c
1894
src/common/dpp.c
File diff suppressed because it is too large
Load diff
110
src/common/dpp.h
110
src/common/dpp.h
|
|
@ -14,7 +14,64 @@
|
|||
#include "utils/list.h"
|
||||
#include "crypto/sha256.h"
|
||||
|
||||
/* DPP Public Action frame identifiers - OUI_WFA */
|
||||
#define DPP_OUI_TYPE 0x1A
|
||||
|
||||
enum dpp_public_action_frame_type {
|
||||
DPP_PA_AUTHENTICATION_REQ = 0,
|
||||
DPP_PA_AUTHENTICATION_RESP = 1,
|
||||
DPP_PA_AUTHENTICATION_CONF = 2,
|
||||
DPP_PA_PEER_DISCOVERY_REQ = 5,
|
||||
DPP_PA_PEER_DISCOVERY_RESP = 6,
|
||||
DPP_PA_PKEX_EXCHANGE_REQ = 7,
|
||||
DPP_PA_PKEX_EXCHANGE_RESP = 8,
|
||||
DPP_PA_PKEX_COMMIT_REVEAL_REQ = 9,
|
||||
DPP_PA_PKEX_COMMIT_REVEAL_RESP = 10,
|
||||
};
|
||||
|
||||
enum dpp_attribute_id {
|
||||
DPP_ATTR_STATUS = 0x1000,
|
||||
DPP_ATTR_I_BOOTSTRAP_KEY_HASH = 0x1001,
|
||||
DPP_ATTR_R_BOOTSTRAP_KEY_HASH = 0x1002,
|
||||
DPP_ATTR_I_PROTOCOL_KEY = 0x1003,
|
||||
DPP_ATTR_WRAPPED_DATA = 0x1004,
|
||||
DPP_ATTR_I_NONCE = 0x1005,
|
||||
DPP_ATTR_I_CAPABILITIES = 0x1006,
|
||||
DPP_ATTR_R_NONCE = 0x1007,
|
||||
DPP_ATTR_R_CAPABILITIES = 0x1008,
|
||||
DPP_ATTR_R_PROTOCOL_KEY = 0x1009,
|
||||
DPP_ATTR_I_AUTH_TAG = 0x100A,
|
||||
DPP_ATTR_R_AUTH_TAG = 0x100B,
|
||||
DPP_ATTR_CONFIG_OBJ = 0x100C,
|
||||
DPP_ATTR_CONNECTOR = 0x100D,
|
||||
DPP_ATTR_CONFIG_ATTR_OBJ = 0x100E,
|
||||
DPP_ATTR_BOOTSTRAP_KEY = 0x100F,
|
||||
DPP_ATTR_PEER_NET_PK_HASH = 0x1010,
|
||||
DPP_ATTR_OWN_NET_NK_HASH = 0x1011,
|
||||
DPP_ATTR_FINITE_CYCLIC_GROUP = 0x1012,
|
||||
DPP_ATTR_ENCRYPTED_KEY = 0x1013,
|
||||
DPP_ATTR_ENROLLEE_NONCE = 0x1014,
|
||||
DPP_ATTR_CODE_IDENTIFIER = 0x1015,
|
||||
};
|
||||
|
||||
enum dpp_status_error {
|
||||
DPP_STATUS_OK = 0,
|
||||
DPP_STATUS_NOT_COMPATIBLE = 1,
|
||||
DPP_STATUS_AUTH_FAILURE = 2,
|
||||
DPP_STATUS_UNWRAP_FAILURE = 3,
|
||||
DPP_STATUS_BAD_GROUP = 4,
|
||||
DPP_STATUS_CONFIGURE_FAILURE = 5,
|
||||
DPP_STATUS_RESPONSE_PENDING = 6,
|
||||
};
|
||||
|
||||
#define DPP_CAPAB_ENROLLEE BIT(0)
|
||||
#define DPP_CAPAB_CONFIGURATOR BIT(1)
|
||||
#define DPP_CAPAB_ROLE_MASK (BIT(0) | BIT(1))
|
||||
|
||||
#define DPP_BOOTSTRAP_MAX_FREQ 30
|
||||
#define DPP_MAX_NONCE_LEN 32
|
||||
#define DPP_MAX_HASH_LEN 64
|
||||
#define DPP_MAX_SHARED_SECRET_LEN 66
|
||||
|
||||
struct dpp_curve_params {
|
||||
const char *name;
|
||||
|
|
@ -44,6 +101,37 @@ struct dpp_bootstrap_info {
|
|||
const struct dpp_curve_params *curve;
|
||||
};
|
||||
|
||||
struct dpp_authentication {
|
||||
void *msg_ctx;
|
||||
const struct dpp_curve_params *curve;
|
||||
struct dpp_bootstrap_info *peer_bi;
|
||||
struct dpp_bootstrap_info *own_bi;
|
||||
u8 waiting_pubkey_hash[SHA256_MAC_LEN];
|
||||
int response_pending;
|
||||
enum dpp_status_error auth_resp_status;
|
||||
u8 peer_mac_addr[ETH_ALEN];
|
||||
u8 i_nonce[DPP_MAX_NONCE_LEN];
|
||||
u8 r_nonce[DPP_MAX_NONCE_LEN];
|
||||
u8 i_capab;
|
||||
u8 r_capab;
|
||||
EVP_PKEY *own_protocol_key;
|
||||
EVP_PKEY *peer_protocol_key;
|
||||
struct wpabuf *req_attr;
|
||||
struct wpabuf *resp_attr;
|
||||
unsigned int curr_freq;
|
||||
size_t secret_len;
|
||||
u8 Mx[DPP_MAX_SHARED_SECRET_LEN];
|
||||
u8 Nx[DPP_MAX_SHARED_SECRET_LEN];
|
||||
u8 Lx[DPP_MAX_SHARED_SECRET_LEN];
|
||||
u8 k1[DPP_MAX_HASH_LEN];
|
||||
u8 k2[DPP_MAX_HASH_LEN];
|
||||
u8 ke[DPP_MAX_HASH_LEN];
|
||||
int initiator;
|
||||
int configurator;
|
||||
int remove_on_tx_status;
|
||||
int auth_success;
|
||||
};
|
||||
|
||||
void dpp_bootstrap_info_free(struct dpp_bootstrap_info *info);
|
||||
int dpp_parse_uri_chan_list(struct dpp_bootstrap_info *bi,
|
||||
const char *chan_list);
|
||||
|
|
@ -52,5 +140,27 @@ int dpp_parse_uri_info(struct dpp_bootstrap_info *bi, const char *info);
|
|||
struct dpp_bootstrap_info * dpp_parse_qr_code(const char *uri);
|
||||
char * dpp_keygen(struct dpp_bootstrap_info *bi, const char *curve,
|
||||
const u8 *privkey, size_t privkey_len);
|
||||
struct dpp_authentication * dpp_auth_init(void *msg_ctx,
|
||||
struct dpp_bootstrap_info *peer_bi,
|
||||
struct dpp_bootstrap_info *own_bi,
|
||||
int configurator);
|
||||
struct dpp_authentication *
|
||||
dpp_auth_req_rx(void *msg_ctx, u8 dpp_allowed_roles, int qr_mutual,
|
||||
struct dpp_bootstrap_info *peer_bi,
|
||||
struct dpp_bootstrap_info *own_bi,
|
||||
unsigned int freq, const u8 *attr_start,
|
||||
const u8 *wrapped_data, u16 wrapped_data_len);
|
||||
struct wpabuf *
|
||||
dpp_auth_resp_rx(struct dpp_authentication *auth, const u8 *attr_start,
|
||||
size_t attr_len);
|
||||
int dpp_auth_conf_rx(struct dpp_authentication *auth, const u8 *attr_start,
|
||||
size_t attr_len);
|
||||
int dpp_notify_new_qr_code(struct dpp_authentication *auth,
|
||||
struct dpp_bootstrap_info *peer_bi);
|
||||
void dpp_auth_deinit(struct dpp_authentication *auth);
|
||||
struct wpabuf * dpp_alloc_msg(enum dpp_public_action_frame_type type,
|
||||
size_t len);
|
||||
const u8 * dpp_get_attr(const u8 *buf, size_t len, u16 req_id, u16 *ret_len);
|
||||
int dpp_check_attrs(const u8 *buf, size_t len);
|
||||
|
||||
#endif /* DPP_H */
|
||||
|
|
|
|||
|
|
@ -143,6 +143,12 @@ extern "C" {
|
|||
#define WPS_EVENT_ER_AP_SETTINGS "WPS-ER-AP-SETTINGS "
|
||||
#define WPS_EVENT_ER_SET_SEL_REG "WPS-ER-AP-SET-SEL-REG "
|
||||
|
||||
/* DPP events */
|
||||
#define DPP_EVENT_AUTH_SUCCESS "DPP-AUTH-SUCCESS "
|
||||
#define DPP_EVENT_NOT_COMPATIBLE "DPP-NOT-COMPATIBLE "
|
||||
#define DPP_EVENT_RESPONSE_PENDING "DPP-RESPONSE-PENDING "
|
||||
#define DPP_EVENT_SCAN_PEER_QR_CODE "DPP-SCAN-PEER-QR-CODE "
|
||||
|
||||
/* MESH events */
|
||||
#define MESH_GROUP_STARTED "MESH-GROUP-STARTED "
|
||||
#define MESH_GROUP_REMOVED "MESH-GROUP-REMOVED "
|
||||
|
|
|
|||
|
|
@ -247,6 +247,13 @@ ifdef CONFIG_DPP
|
|||
L_CFLAGS += -DCONFIG_DPP
|
||||
OBJS += src/common/dpp.c
|
||||
OBJS += dpp_supplicant.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
|
||||
endif
|
||||
|
||||
ifdef CONFIG_OWE
|
||||
|
|
|
|||
|
|
@ -280,6 +280,13 @@ ifdef CONFIG_DPP
|
|||
CFLAGS += -DCONFIG_DPP
|
||||
OBJS += ../src/common/dpp.o
|
||||
OBJS += dpp_supplicant.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
|
||||
endif
|
||||
|
||||
ifdef CONFIG_OWE
|
||||
|
|
|
|||
|
|
@ -7558,6 +7558,10 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
|
|||
wpa_s->after_wps = 0;
|
||||
wpa_s->known_wps_freq = 0;
|
||||
|
||||
#ifdef CONFIG_DPP
|
||||
wpas_dpp_deinit(wpa_s);
|
||||
#endif /* CONFIG_DPP */
|
||||
|
||||
#ifdef CONFIG_TDLS
|
||||
#ifdef CONFIG_TDLS_TESTING
|
||||
tdls_testing = 0;
|
||||
|
|
@ -10187,6 +10191,14 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
|
|||
if (os_snprintf_error(reply_size, reply_len))
|
||||
reply_len = -1;
|
||||
}
|
||||
} else if (os_strncmp(buf, "DPP_AUTH_INIT ", 14) == 0) {
|
||||
if (wpas_dpp_auth_init(wpa_s, buf + 13) < 0)
|
||||
reply_len = -1;
|
||||
} else if (os_strncmp(buf, "DPP_LISTEN ", 11) == 0) {
|
||||
if (wpas_dpp_listen(wpa_s, buf + 11) < 0)
|
||||
reply_len = -1;
|
||||
} else if (os_strcmp(buf, "DPP_STOP_LISTEN") == 0) {
|
||||
wpas_dpp_listen_stop(wpa_s);
|
||||
#endif /* CONFIG_DPP */
|
||||
} else {
|
||||
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
|
||||
|
|
|
|||
|
|
@ -9,11 +9,25 @@
|
|||
#include "utils/includes.h"
|
||||
|
||||
#include "utils/common.h"
|
||||
#include "utils/eloop.h"
|
||||
#include "common/dpp.h"
|
||||
#include "wpa_supplicant_i.h"
|
||||
#include "driver_i.h"
|
||||
#include "offchannel.h"
|
||||
#include "dpp_supplicant.h"
|
||||
|
||||
|
||||
static int wpas_dpp_listen_start(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq);
|
||||
static void wpas_dpp_tx_status(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq, const u8 *dst,
|
||||
const u8 *src, const u8 *bssid,
|
||||
const u8 *data, size_t data_len,
|
||||
enum offchannel_send_action_result result);
|
||||
|
||||
static const u8 broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||
|
||||
|
||||
static unsigned int wpas_dpp_next_id(struct wpa_supplicant *wpa_s)
|
||||
{
|
||||
struct dpp_bootstrap_info *bi;
|
||||
|
|
@ -37,6 +51,7 @@ static unsigned int wpas_dpp_next_id(struct wpa_supplicant *wpa_s)
|
|||
int wpas_dpp_qr_code(struct wpa_supplicant *wpa_s, const char *cmd)
|
||||
{
|
||||
struct dpp_bootstrap_info *bi;
|
||||
struct dpp_authentication *auth = wpa_s->dpp_auth;
|
||||
|
||||
bi = dpp_parse_qr_code(cmd);
|
||||
if (!bi)
|
||||
|
|
@ -45,6 +60,27 @@ int wpas_dpp_qr_code(struct wpa_supplicant *wpa_s, const char *cmd)
|
|||
bi->id = wpas_dpp_next_id(wpa_s);
|
||||
dl_list_add(&wpa_s->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, wpa_s->dpp_auth->resp_attr);
|
||||
|
||||
offchannel_send_action(wpa_s, auth->curr_freq,
|
||||
auth->peer_mac_addr, wpa_s->own_addr,
|
||||
broadcast,
|
||||
wpabuf_head(msg), wpabuf_len(msg),
|
||||
500, wpas_dpp_tx_status, 0);
|
||||
wpabuf_free(msg);
|
||||
}
|
||||
|
||||
out:
|
||||
return bi->id;
|
||||
}
|
||||
|
||||
|
|
@ -215,6 +251,553 @@ const char * wpas_dpp_bootstrap_get_uri(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
|
||||
|
||||
static void wpas_dpp_tx_status(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq, const u8 *dst,
|
||||
const u8 *src, const u8 *bssid,
|
||||
const u8 *data, size_t data_len,
|
||||
enum offchannel_send_action_result result)
|
||||
{
|
||||
wpa_printf(MSG_DEBUG, "DPP: TX status: freq=%u dst=" MACSTR
|
||||
" result=%s",
|
||||
freq, MAC2STR(dst),
|
||||
result == OFFCHANNEL_SEND_ACTION_SUCCESS ? "SUCCESS" :
|
||||
(result == OFFCHANNEL_SEND_ACTION_NO_ACK ? "no-ACK" :
|
||||
"FAILED"));
|
||||
|
||||
if (!wpa_s->dpp_auth) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Ignore TX status since there is no ongoing authentication exchange");
|
||||
return;
|
||||
}
|
||||
|
||||
if (wpa_s->dpp_auth->remove_on_tx_status) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Terminate authentication exchange due to an earlier error");
|
||||
dpp_auth_deinit(wpa_s->dpp_auth);
|
||||
wpa_s->dpp_auth = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!is_broadcast_ether_addr(dst) &&
|
||||
result != OFFCHANNEL_SEND_ACTION_SUCCESS) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Unicast DPP Action frame was not ACKed");
|
||||
/* TODO: In case of DPP Authentication Request frame, move to
|
||||
* the next channel immediately */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void wpas_dpp_reply_wait_timeout(void *eloop_ctx, void *timeout_ctx)
|
||||
{
|
||||
struct wpa_supplicant *wpa_s = eloop_ctx;
|
||||
|
||||
if (!wpa_s->dpp_auth)
|
||||
return;
|
||||
wpa_printf(MSG_DEBUG, "DPP: Continue reply wait on channel %u MHz",
|
||||
wpa_s->dpp_auth->curr_freq);
|
||||
wpas_dpp_listen_start(wpa_s, wpa_s->dpp_auth->curr_freq);
|
||||
}
|
||||
|
||||
|
||||
int wpas_dpp_auth_init(struct wpa_supplicant *wpa_s, 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;
|
||||
unsigned int wait_time;
|
||||
|
||||
pos = os_strstr(cmd, " peer=");
|
||||
if (!pos)
|
||||
return -1;
|
||||
pos += 6;
|
||||
peer_bi = dpp_bootstrap_get_id(wpa_s, 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(wpa_s, 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
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (wpa_s->dpp_auth) {
|
||||
eloop_cancel_timeout(wpas_dpp_reply_wait_timeout, wpa_s, NULL);
|
||||
offchannel_send_action_done(wpa_s);
|
||||
dpp_auth_deinit(wpa_s->dpp_auth);
|
||||
}
|
||||
wpa_s->dpp_auth = dpp_auth_init(wpa_s, peer_bi, own_bi, configurator);
|
||||
if (!wpa_s->dpp_auth)
|
||||
return -1;
|
||||
|
||||
/* 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)
|
||||
wpa_s->dpp_auth->curr_freq = peer_bi->freq[0];
|
||||
else
|
||||
wpa_s->dpp_auth->curr_freq = 2412;
|
||||
|
||||
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_REQ,
|
||||
wpabuf_len(wpa_s->dpp_auth->req_attr));
|
||||
if (!msg)
|
||||
return -1;
|
||||
wpabuf_put_buf(msg, wpa_s->dpp_auth->req_attr);
|
||||
|
||||
if (is_zero_ether_addr(peer_bi->mac_addr)) {
|
||||
dst = broadcast;
|
||||
} else {
|
||||
dst = peer_bi->mac_addr;
|
||||
os_memcpy(wpa_s->dpp_auth->peer_mac_addr, peer_bi->mac_addr,
|
||||
ETH_ALEN);
|
||||
}
|
||||
eloop_cancel_timeout(wpas_dpp_reply_wait_timeout, wpa_s, NULL);
|
||||
wait_time = wpa_s->max_remain_on_chan;
|
||||
if (wait_time > 2000)
|
||||
wait_time = 2000;
|
||||
eloop_register_timeout(wait_time / 1000, (wait_time % 1000) * 1000,
|
||||
wpas_dpp_reply_wait_timeout,
|
||||
wpa_s, NULL);
|
||||
res = offchannel_send_action(wpa_s, wpa_s->dpp_auth->curr_freq,
|
||||
dst, wpa_s->own_addr, broadcast,
|
||||
wpabuf_head(msg), wpabuf_len(msg),
|
||||
wait_time, wpas_dpp_tx_status, 0);
|
||||
wpabuf_free(msg);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
struct wpas_dpp_listen_work {
|
||||
unsigned int freq;
|
||||
unsigned int duration;
|
||||
struct wpabuf *probe_resp_ie;
|
||||
};
|
||||
|
||||
|
||||
static void wpas_dpp_listen_work_free(struct wpas_dpp_listen_work *lwork)
|
||||
{
|
||||
if (!lwork)
|
||||
return;
|
||||
os_free(lwork);
|
||||
}
|
||||
|
||||
|
||||
static void wpas_dpp_listen_work_done(struct wpa_supplicant *wpa_s)
|
||||
{
|
||||
struct wpas_dpp_listen_work *lwork;
|
||||
|
||||
if (!wpa_s->dpp_listen_work)
|
||||
return;
|
||||
|
||||
lwork = wpa_s->dpp_listen_work->ctx;
|
||||
wpas_dpp_listen_work_free(lwork);
|
||||
radio_work_done(wpa_s->dpp_listen_work);
|
||||
wpa_s->dpp_listen_work = NULL;
|
||||
}
|
||||
|
||||
|
||||
static void dpp_start_listen_cb(struct wpa_radio_work *work, int deinit)
|
||||
{
|
||||
struct wpa_supplicant *wpa_s = work->wpa_s;
|
||||
struct wpas_dpp_listen_work *lwork = work->ctx;
|
||||
|
||||
if (deinit) {
|
||||
if (work->started) {
|
||||
wpa_s->dpp_listen_work = NULL;
|
||||
wpas_dpp_listen_stop(wpa_s);
|
||||
}
|
||||
wpas_dpp_listen_work_free(lwork);
|
||||
return;
|
||||
}
|
||||
|
||||
wpa_s->dpp_listen_work = work;
|
||||
|
||||
wpa_s->dpp_pending_listen_freq = lwork->freq;
|
||||
|
||||
if (wpa_drv_remain_on_channel(wpa_s, lwork->freq,
|
||||
wpa_s->max_remain_on_chan) < 0) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Failed to request the driver to remain on channel (%u MHz) for listen",
|
||||
lwork->freq);
|
||||
wpas_dpp_listen_work_done(wpa_s);
|
||||
wpa_s->dpp_pending_listen_freq = 0;
|
||||
return;
|
||||
}
|
||||
wpa_s->off_channel_freq = 0;
|
||||
wpa_s->roc_waiting_drv_freq = lwork->freq;
|
||||
}
|
||||
|
||||
|
||||
static int wpas_dpp_listen_start(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq)
|
||||
{
|
||||
struct wpas_dpp_listen_work *lwork;
|
||||
|
||||
if (wpa_s->dpp_listen_work) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Reject start_listen since dpp_listen_work already exists");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (wpa_s->dpp_listen_freq)
|
||||
wpas_dpp_listen_stop(wpa_s);
|
||||
wpa_s->dpp_listen_freq = freq;
|
||||
|
||||
lwork = os_zalloc(sizeof(*lwork));
|
||||
if (!lwork)
|
||||
return -1;
|
||||
lwork->freq = freq;
|
||||
|
||||
if (radio_add_work(wpa_s, freq, "dpp-listen", 0, dpp_start_listen_cb,
|
||||
lwork) < 0) {
|
||||
wpas_dpp_listen_work_free(lwork);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int wpas_dpp_listen(struct wpa_supplicant *wpa_s, const char *cmd)
|
||||
{
|
||||
int freq;
|
||||
|
||||
freq = atoi(cmd);
|
||||
if (freq <= 0)
|
||||
return -1;
|
||||
|
||||
if (os_strstr(cmd, " role=configurator"))
|
||||
wpa_s->dpp_allowed_roles = DPP_CAPAB_CONFIGURATOR;
|
||||
else if (os_strstr(cmd, " role=enrollee"))
|
||||
wpa_s->dpp_allowed_roles = DPP_CAPAB_ENROLLEE;
|
||||
else
|
||||
wpa_s->dpp_allowed_roles = DPP_CAPAB_CONFIGURATOR |
|
||||
DPP_CAPAB_ENROLLEE;
|
||||
wpa_s->dpp_qr_mutual = os_strstr(cmd, " qr=mutual") != NULL;
|
||||
if (wpa_s->dpp_listen_freq == (unsigned int) freq) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: Already listening on %u MHz",
|
||||
freq);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return wpas_dpp_listen_start(wpa_s, freq);
|
||||
}
|
||||
|
||||
|
||||
void wpas_dpp_listen_stop(struct wpa_supplicant *wpa_s)
|
||||
{
|
||||
if (!wpa_s->dpp_listen_freq)
|
||||
return;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "DPP: Stop listen on %u MHz",
|
||||
wpa_s->dpp_listen_freq);
|
||||
wpa_drv_cancel_remain_on_channel(wpa_s);
|
||||
wpa_s->dpp_listen_freq = 0;
|
||||
wpas_dpp_listen_work_done(wpa_s);
|
||||
}
|
||||
|
||||
|
||||
void wpas_dpp_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq)
|
||||
{
|
||||
if (!wpa_s->dpp_listen_freq && !wpa_s->dpp_pending_listen_freq)
|
||||
return;
|
||||
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: remain-on-channel callback (off_channel_freq=%u dpp_pending_listen_freq=%d roc_waiting_drv_freq=%d freq=%u)",
|
||||
wpa_s->off_channel_freq, wpa_s->dpp_pending_listen_freq,
|
||||
wpa_s->roc_waiting_drv_freq, freq);
|
||||
if (wpa_s->off_channel_freq &&
|
||||
wpa_s->off_channel_freq == wpa_s->dpp_pending_listen_freq) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: Listen on %u MHz started", freq);
|
||||
wpa_s->dpp_pending_listen_freq = 0;
|
||||
} else {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Ignore remain-on-channel callback (off_channel_freq=%u dpp_pending_listen_freq=%d freq=%u)",
|
||||
wpa_s->off_channel_freq,
|
||||
wpa_s->dpp_pending_listen_freq, freq);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void wpas_dpp_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq)
|
||||
{
|
||||
wpas_dpp_listen_work_done(wpa_s);
|
||||
|
||||
if (wpa_s->dpp_auth) {
|
||||
/* Continue listen with a new remain-on-channel */
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Continue wait on %u MHz for the ongoing DPP provisioning session",
|
||||
wpa_s->dpp_auth->curr_freq);
|
||||
wpas_dpp_listen_start(wpa_s, wpa_s->dpp_auth->curr_freq);
|
||||
return;
|
||||
}
|
||||
|
||||
if (wpa_s->dpp_listen_freq) {
|
||||
/* Continue listen with a new remain-on-channel */
|
||||
wpas_dpp_listen_start(wpa_s, wpa_s->dpp_listen_freq);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, 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, &wpa_s->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 (wpa_s->dpp_auth) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Already in DPP authentication exchange - ignore new one");
|
||||
return;
|
||||
}
|
||||
|
||||
wpa_s->dpp_auth = dpp_auth_req_rx(wpa_s, wpa_s->dpp_allowed_roles,
|
||||
wpa_s->dpp_qr_mutual,
|
||||
peer_bi, own_bi, freq, buf,
|
||||
wrapped_data, wrapped_data_len);
|
||||
if (!wpa_s->dpp_auth) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: No response generated");
|
||||
return;
|
||||
}
|
||||
os_memcpy(wpa_s->dpp_auth->peer_mac_addr, src, ETH_ALEN);
|
||||
|
||||
msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_RESP,
|
||||
wpabuf_len(wpa_s->dpp_auth->resp_attr));
|
||||
if (!msg)
|
||||
return;
|
||||
wpabuf_put_buf(msg, wpa_s->dpp_auth->resp_attr);
|
||||
|
||||
offchannel_send_action(wpa_s, wpa_s->dpp_auth->curr_freq,
|
||||
src, wpa_s->own_addr, broadcast,
|
||||
wpabuf_head(msg), wpabuf_len(msg),
|
||||
500, wpas_dpp_tx_status, 0);
|
||||
wpabuf_free(msg);
|
||||
}
|
||||
|
||||
|
||||
static void wpas_dpp_rx_auth_resp(struct wpa_supplicant *wpa_s, const u8 *src,
|
||||
const u8 *buf, size_t len)
|
||||
{
|
||||
struct dpp_authentication *auth = wpa_s->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;
|
||||
}
|
||||
|
||||
eloop_cancel_timeout(wpas_dpp_reply_wait_timeout, wpa_s, NULL);
|
||||
|
||||
attr = dpp_auth_resp_rx(auth, buf, len);
|
||||
if (!attr) {
|
||||
if (auth->auth_resp_status == DPP_STATUS_RESPONSE_PENDING) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Start wait for full response");
|
||||
offchannel_send_action_done(wpa_s);
|
||||
wpas_dpp_listen_start(wpa_s, auth->curr_freq);
|
||||
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);
|
||||
|
||||
offchannel_send_action(wpa_s, auth->curr_freq,
|
||||
src, wpa_s->own_addr, broadcast,
|
||||
wpabuf_head(msg), wpabuf_len(msg),
|
||||
500, wpas_dpp_tx_status, 0);
|
||||
wpabuf_free(msg);
|
||||
|
||||
wpa_printf(MSG_DEBUG, "DPP: Authentication succeeded");
|
||||
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_AUTH_SUCCESS "init=1");
|
||||
}
|
||||
|
||||
|
||||
static void wpas_dpp_rx_auth_conf(struct wpa_supplicant *wpa_s, const u8 *src,
|
||||
const u8 *buf, size_t len)
|
||||
{
|
||||
struct dpp_authentication *auth = wpa_s->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;
|
||||
}
|
||||
|
||||
wpa_printf(MSG_DEBUG, "DPP: Authentication succeeded");
|
||||
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_AUTH_SUCCESS "init=0");
|
||||
}
|
||||
|
||||
|
||||
void wpas_dpp_rx_action(struct wpa_supplicant *wpa_s, 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:
|
||||
wpas_dpp_rx_auth_req(wpa_s, src, buf, len, freq);
|
||||
break;
|
||||
case DPP_PA_AUTHENTICATION_RESP:
|
||||
wpas_dpp_rx_auth_resp(wpa_s, src, buf, len);
|
||||
break;
|
||||
case DPP_PA_AUTHENTICATION_CONF:
|
||||
wpas_dpp_rx_auth_conf(wpa_s, src, buf, len);
|
||||
break;
|
||||
default:
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Ignored unsupported frame subtype %d", type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int wpas_dpp_init(struct wpa_supplicant *wpa_s)
|
||||
{
|
||||
dl_list_init(&wpa_s->dpp_bootstrap);
|
||||
|
|
@ -227,5 +810,10 @@ void wpas_dpp_deinit(struct wpa_supplicant *wpa_s)
|
|||
{
|
||||
if (!wpa_s->dpp_init_done)
|
||||
return;
|
||||
eloop_cancel_timeout(wpas_dpp_reply_wait_timeout, wpa_s, NULL);
|
||||
offchannel_send_action_done(wpa_s);
|
||||
wpas_dpp_listen_stop(wpa_s);
|
||||
dpp_bootstrap_del(wpa_s, 0);
|
||||
dpp_auth_deinit(wpa_s->dpp_auth);
|
||||
wpa_s->dpp_auth = NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,15 @@ int wpas_dpp_bootstrap_gen(struct wpa_supplicant *wpa_s, const char *cmd);
|
|||
int wpas_dpp_bootstrap_remove(struct wpa_supplicant *wpa_s, const char *id);
|
||||
const char * wpas_dpp_bootstrap_get_uri(struct wpa_supplicant *wpa_s,
|
||||
unsigned int id);
|
||||
int wpas_dpp_auth_init(struct wpa_supplicant *wpa_s, const char *cmd);
|
||||
int wpas_dpp_listen(struct wpa_supplicant *wpa_s, const char *cmd);
|
||||
void wpas_dpp_listen_stop(struct wpa_supplicant *wpa_s);
|
||||
void wpas_dpp_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq);
|
||||
void wpas_dpp_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
|
||||
unsigned int freq);
|
||||
void wpas_dpp_rx_action(struct wpa_supplicant *wpa_s, const u8 *src,
|
||||
const u8 *buf, size_t len, unsigned int freq);
|
||||
int wpas_dpp_init(struct wpa_supplicant *wpa_s);
|
||||
void wpas_dpp_deinit(struct wpa_supplicant *wpa_s);
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "notify.h"
|
||||
#include "common/ieee802_11_defs.h"
|
||||
#include "common/ieee802_11_common.h"
|
||||
#include "common/dpp.h"
|
||||
#include "crypto/random.h"
|
||||
#include "blacklist.h"
|
||||
#include "wpas_glue.h"
|
||||
|
|
@ -46,6 +47,7 @@
|
|||
#include "mesh.h"
|
||||
#include "mesh_mpm.h"
|
||||
#include "wmm_ac.h"
|
||||
#include "dpp_supplicant.h"
|
||||
|
||||
|
||||
#ifndef CONFIG_NO_SCAN_PROCESSING
|
||||
|
|
@ -3582,6 +3584,18 @@ static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
#endif /* CONFIG_FST */
|
||||
|
||||
#ifdef CONFIG_DPP
|
||||
if (category == WLAN_ACTION_PUBLIC && plen >= 5 &&
|
||||
payload[0] == WLAN_PA_VENDOR_SPECIFIC &&
|
||||
WPA_GET_BE24(&payload[1]) == OUI_WFA &&
|
||||
payload[4] == DPP_OUI_TYPE) {
|
||||
payload += 5;
|
||||
plen -= 5;
|
||||
wpas_dpp_rx_action(wpa_s, mgmt->sa, payload, plen, freq);
|
||||
return;
|
||||
}
|
||||
#endif /* CONFIG_DPP */
|
||||
|
||||
wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid,
|
||||
category, payload, plen, freq);
|
||||
if (wpa_s->ifmsh)
|
||||
|
|
@ -4171,6 +4185,10 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
|
|||
#endif /* CONFIG_OFFCHANNEL */
|
||||
wpas_p2p_cancel_remain_on_channel_cb(
|
||||
wpa_s, data->remain_on_channel.freq);
|
||||
#ifdef CONFIG_DPP
|
||||
wpas_dpp_cancel_remain_on_channel_cb(
|
||||
wpa_s, data->remain_on_channel.freq);
|
||||
#endif /* CONFIG_DPP */
|
||||
break;
|
||||
case EVENT_EAPOL_RX:
|
||||
wpa_supplicant_rx_eapol(wpa_s, data->eapol_rx.src,
|
||||
|
|
|
|||
|
|
@ -1160,6 +1160,12 @@ struct wpa_supplicant {
|
|||
#ifdef CONFIG_DPP
|
||||
struct dl_list dpp_bootstrap; /* struct dpp_bootstrap_info */
|
||||
int dpp_init_done;
|
||||
struct dpp_authentication *dpp_auth;
|
||||
struct wpa_radio_work *dpp_listen_work;
|
||||
unsigned int dpp_pending_listen_freq;
|
||||
unsigned int dpp_listen_freq;
|
||||
u8 dpp_allowed_roles;
|
||||
int dpp_qr_mutual;
|
||||
#endif /* CONFIG_DPP */
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue