]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - wpa_supplicant/dpp_supplicant.c
DPP2: Add Connector and C-sign-key in psk/sae credentials for reconfig
[thirdparty/hostap.git] / wpa_supplicant / dpp_supplicant.c
index 29a50f3b06113b998f449c80f8afd8fb64a4b1ea..c1ebf10d33c03be88dc4bae307fe728d01227ed9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * wpa_supplicant - DPP
  * Copyright (c) 2017, Qualcomm Atheros, Inc.
- * Copyright (c) 2018-2019, The Linux Foundation
+ * Copyright (c) 2018-2020, The Linux Foundation
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -88,6 +88,89 @@ int wpas_dpp_qr_code(struct wpa_supplicant *wpa_s, const char *cmd)
 }
 
 
+/**
+ * wpas_dpp_nfc_uri - Parse and add DPP bootstrapping info from NFC Tag (URI)
+ * @wpa_s: Pointer to wpa_supplicant data
+ * @cmd: DPP URI read from a NFC Tag (URI NDEF message)
+ * Returns: Identifier of the stored info or -1 on failure
+ */
+int wpas_dpp_nfc_uri(struct wpa_supplicant *wpa_s, const char *cmd)
+{
+       struct dpp_bootstrap_info *bi;
+
+       bi = dpp_add_nfc_uri(wpa_s->dpp, cmd);
+       if (!bi)
+               return -1;
+
+       return bi->id;
+}
+
+
+int wpas_dpp_nfc_handover_req(struct wpa_supplicant *wpa_s, const char *cmd)
+{
+       const char *pos;
+       struct dpp_bootstrap_info *peer_bi, *own_bi;
+
+       pos = os_strstr(cmd, " own=");
+       if (!pos)
+               return -1;
+       pos += 5;
+       own_bi = dpp_bootstrap_get_id(wpa_s->dpp, atoi(pos));
+       if (!own_bi)
+               return -1;
+
+       pos = os_strstr(cmd, " uri=");
+       if (!pos)
+               return -1;
+       pos += 5;
+       peer_bi = dpp_add_nfc_uri(wpa_s->dpp, pos);
+       if (!peer_bi) {
+               wpa_printf(MSG_INFO,
+                          "DPP: Failed to parse URI from NFC Handover Request");
+               return -1;
+       }
+
+       if (dpp_nfc_update_bi(own_bi, peer_bi) < 0)
+               return -1;
+
+       return peer_bi->id;
+}
+
+
+int wpas_dpp_nfc_handover_sel(struct wpa_supplicant *wpa_s, const char *cmd)
+{
+       const char *pos;
+       struct dpp_bootstrap_info *peer_bi, *own_bi;
+
+       pos = os_strstr(cmd, " own=");
+       if (!pos)
+               return -1;
+       pos += 5;
+       own_bi = dpp_bootstrap_get_id(wpa_s->dpp, atoi(pos));
+       if (!own_bi)
+               return -1;
+
+       pos = os_strstr(cmd, " uri=");
+       if (!pos)
+               return -1;
+       pos += 5;
+       peer_bi = dpp_add_nfc_uri(wpa_s->dpp, pos);
+       if (!peer_bi) {
+               wpa_printf(MSG_INFO,
+                          "DPP: Failed to parse URI from NFC Handover Select");
+               return -1;
+       }
+
+       if (peer_bi->curve != own_bi->curve) {
+               wpa_printf(MSG_INFO,
+                          "DPP: Peer (NFC Handover Selector) used different curve");
+               return -1;
+       }
+
+       return peer_bi->id;
+}
+
+
 static void wpas_dpp_auth_resp_retry_timeout(void *eloop_ctx, void *timeout_ctx)
 {
        struct wpa_supplicant *wpa_s = eloop_ctx;
@@ -179,6 +262,8 @@ static void wpas_dpp_conn_status_result_timeout(void *eloop_ctx,
                result = DPP_STATUS_NO_AP;
        else
                result = 255; /* What to report here for unexpected state? */
+       if (wpa_s->wpa_state == WPA_SCANNING)
+               wpas_abort_ongoing_scan(wpa_s);
        wpas_dpp_send_conn_status_result(wpa_s, result);
 }
 
@@ -660,7 +745,14 @@ int wpas_dpp_auth_init(struct wpa_supplicant *wpa_s, const char *cmd)
        pos = os_strstr(cmd, " netrole=");
        if (pos) {
                pos += 9;
-               wpa_s->dpp_netrole_ap = os_strncmp(pos, "ap", 2) == 0;
+               if (os_strncmp(pos, "ap", 2) == 0)
+                       wpa_s->dpp_netrole = DPP_NETROLE_AP;
+               else if (os_strncmp(pos, "configurator", 12) == 0)
+                       wpa_s->dpp_netrole = DPP_NETROLE_CONFIGURATOR;
+               else
+                       wpa_s->dpp_netrole = DPP_NETROLE_STA;
+       } else {
+               wpa_s->dpp_netrole = DPP_NETROLE_STA;
        }
 
        pos = os_strstr(cmd, " neg_freq=");
@@ -677,12 +769,12 @@ int wpas_dpp_auth_init(struct wpa_supplicant *wpa_s, const char *cmd)
                wpa_s->dpp_auth = NULL;
        }
 
-       auth = dpp_auth_init(wpa_s, peer_bi, own_bi, allowed_roles, neg_freq,
-                            wpa_s->hw.modes, wpa_s->hw.num_modes);
+       auth = dpp_auth_init(wpa_s->dpp, wpa_s, peer_bi, own_bi, allowed_roles,
+                            neg_freq, wpa_s->hw.modes, wpa_s->hw.num_modes);
        if (!auth)
                goto fail;
        wpas_dpp_set_testing_options(wpa_s, auth);
-       if (dpp_set_configurator(wpa_s->dpp, wpa_s, auth, cmd) < 0) {
+       if (dpp_set_configurator(auth, cmd) < 0) {
                dpp_auth_deinit(auth);
                goto fail;
        }
@@ -812,7 +904,12 @@ int wpas_dpp_listen(struct wpa_supplicant *wpa_s, const char *cmd)
                wpa_s->dpp_allowed_roles = DPP_CAPAB_CONFIGURATOR |
                        DPP_CAPAB_ENROLLEE;
        wpa_s->dpp_qr_mutual = os_strstr(cmd, " qr=mutual") != NULL;
-       wpa_s->dpp_netrole_ap = os_strstr(cmd, " netrole=ap") != NULL;
+       if (os_strstr(cmd, " netrole=ap"))
+               wpa_s->dpp_netrole = DPP_NETROLE_AP;
+       else if (os_strstr(cmd, " netrole=configurator"))
+               wpa_s->dpp_netrole = DPP_NETROLE_CONFIGURATOR;
+       else
+               wpa_s->dpp_netrole = DPP_NETROLE_STA;
        if (wpa_s->dpp_listen_freq == (unsigned int) freq) {
                wpa_printf(MSG_DEBUG, "DPP: Already listening on %u MHz",
                           freq);
@@ -878,6 +975,10 @@ static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, const u8 *src,
        wpa_printf(MSG_DEBUG, "DPP: Authentication Request from " MACSTR,
                   MAC2STR(src));
 
+#ifdef CONFIG_DPP2
+       wpas_dpp_chirp_stop(wpa_s);
+#endif /* CONFIG_DPP2 */
+
        r_bootstrap = dpp_get_attr(buf, len, DPP_ATTR_R_BOOTSTRAP_KEY_HASH,
                                   &r_bootstrap_len);
        if (!r_bootstrap || r_bootstrap_len != SHA256_MAC_LEN) {
@@ -916,7 +1017,8 @@ static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, const u8 *src,
 
        wpa_s->dpp_gas_client = 0;
        wpa_s->dpp_auth_ok_on_ack = 0;
-       wpa_s->dpp_auth = dpp_auth_req_rx(wpa_s, wpa_s->dpp_allowed_roles,
+       wpa_s->dpp_auth = dpp_auth_req_rx(wpa_s->dpp, wpa_s,
+                                         wpa_s->dpp_allowed_roles,
                                          wpa_s->dpp_qr_mutual,
                                          peer_bi, own_bi, freq, hdr, buf, len);
        if (!wpa_s->dpp_auth) {
@@ -924,7 +1026,7 @@ static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, const u8 *src,
                return;
        }
        wpas_dpp_set_testing_options(wpa_s, wpa_s->dpp_auth);
-       if (dpp_set_configurator(wpa_s->dpp, wpa_s, wpa_s->dpp_auth,
+       if (dpp_set_configurator(wpa_s->dpp_auth,
                                 wpa_s->dpp_configurator_params) < 0) {
                dpp_auth_deinit(wpa_s->dpp_auth);
                wpa_s->dpp_auth = NULL;
@@ -958,12 +1060,13 @@ static void wpas_dpp_start_gas_server(struct wpa_supplicant *wpa_s)
 
 
 static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
-                                             struct dpp_authentication *auth)
+                                             struct dpp_authentication *auth,
+                                             struct dpp_config_obj *conf)
 {
        struct wpa_ssid *ssid;
 
 #ifdef CONFIG_DPP2
-       if (auth->akm == DPP_AKM_SAE) {
+       if (conf->akm == DPP_AKM_SAE) {
 #ifdef CONFIG_SAE
                struct wpa_driver_capa capa;
                int res;
@@ -990,27 +1093,29 @@ static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
        wpa_config_set_network_defaults(ssid);
        ssid->disabled = 1;
 
-       ssid->ssid = os_malloc(auth->ssid_len);
+       ssid->ssid = os_malloc(conf->ssid_len);
        if (!ssid->ssid)
                goto fail;
-       os_memcpy(ssid->ssid, auth->ssid, auth->ssid_len);
-       ssid->ssid_len = auth->ssid_len;
+       os_memcpy(ssid->ssid, conf->ssid, conf->ssid_len);
+       ssid->ssid_len = conf->ssid_len;
 
-       if (auth->connector) {
-               ssid->key_mgmt = WPA_KEY_MGMT_DPP;
-               ssid->ieee80211w = MGMT_FRAME_PROTECTION_REQUIRED;
-               ssid->dpp_connector = os_strdup(auth->connector);
+       if (conf->connector) {
+               if (dpp_akm_dpp(conf->akm)) {
+                       ssid->key_mgmt = WPA_KEY_MGMT_DPP;
+                       ssid->ieee80211w = MGMT_FRAME_PROTECTION_REQUIRED;
+               }
+               ssid->dpp_connector = os_strdup(conf->connector);
                if (!ssid->dpp_connector)
                        goto fail;
        }
 
-       if (auth->c_sign_key) {
-               ssid->dpp_csign = os_malloc(wpabuf_len(auth->c_sign_key));
+       if (conf->c_sign_key) {
+               ssid->dpp_csign = os_malloc(wpabuf_len(conf->c_sign_key));
                if (!ssid->dpp_csign)
                        goto fail;
-               os_memcpy(ssid->dpp_csign, wpabuf_head(auth->c_sign_key),
-                         wpabuf_len(auth->c_sign_key));
-               ssid->dpp_csign_len = wpabuf_len(auth->c_sign_key);
+               os_memcpy(ssid->dpp_csign, wpabuf_head(conf->c_sign_key),
+                         wpabuf_len(conf->c_sign_key));
+               ssid->dpp_csign_len = wpabuf_len(conf->c_sign_key);
        }
 
        if (auth->net_access_key) {
@@ -1025,31 +1130,31 @@ static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
                ssid->dpp_netaccesskey_expiry = auth->net_access_key_expiry;
        }
 
-       if (!auth->connector || dpp_akm_psk(auth->akm) ||
-           dpp_akm_sae(auth->akm)) {
-               if (!auth->connector)
+       if (!conf->connector || dpp_akm_psk(conf->akm) ||
+           dpp_akm_sae(conf->akm)) {
+               if (!conf->connector || !dpp_akm_dpp(conf->akm))
                        ssid->key_mgmt = 0;
-               if (dpp_akm_psk(auth->akm))
+               if (dpp_akm_psk(conf->akm))
                        ssid->key_mgmt |= WPA_KEY_MGMT_PSK |
                                WPA_KEY_MGMT_PSK_SHA256 | WPA_KEY_MGMT_FT_PSK;
-               if (dpp_akm_sae(auth->akm))
+               if (dpp_akm_sae(conf->akm))
                        ssid->key_mgmt |= WPA_KEY_MGMT_SAE |
                                WPA_KEY_MGMT_FT_SAE;
                ssid->ieee80211w = MGMT_FRAME_PROTECTION_OPTIONAL;
-               if (auth->passphrase[0]) {
+               if (conf->passphrase[0]) {
                        if (wpa_config_set_quoted(ssid, "psk",
-                                                 auth->passphrase) < 0)
+                                                 conf->passphrase) < 0)
                                goto fail;
                        wpa_config_update_psk(ssid);
                        ssid->export_keys = 1;
                } else {
-                       ssid->psk_set = auth->psk_set;
-                       os_memcpy(ssid->psk, auth->psk, PMK_LEN);
+                       ssid->psk_set = conf->psk_set;
+                       os_memcpy(ssid->psk, conf->psk, PMK_LEN);
                }
        }
 
-       os_memcpy(wpa_s->dpp_last_ssid, auth->ssid, auth->ssid_len);
-       wpa_s->dpp_last_ssid_len = auth->ssid_len;
+       os_memcpy(wpa_s->dpp_last_ssid, conf->ssid, conf->ssid_len);
+       wpa_s->dpp_last_ssid_len = conf->ssid_len;
 
        return ssid;
 fail:
@@ -1060,14 +1165,15 @@ fail:
 
 
 static int wpas_dpp_process_config(struct wpa_supplicant *wpa_s,
-                                  struct dpp_authentication *auth)
+                                  struct dpp_authentication *auth,
+                                  struct dpp_config_obj *conf)
 {
        struct wpa_ssid *ssid;
 
        if (wpa_s->conf->dpp_config_processing < 1)
                return 0;
 
-       ssid = wpas_dpp_add_network(wpa_s, auth);
+       ssid = wpas_dpp_add_network(wpa_s, auth, conf);
        if (!ssid)
                return -1;
 
@@ -1081,49 +1187,59 @@ static int wpas_dpp_process_config(struct wpa_supplicant *wpa_s,
                wpa_printf(MSG_DEBUG, "DPP: Failed to update configuration");
 #endif /* CONFIG_NO_CONFIG_WRITE */
 
+       return 0;
+}
+
+
+static void wpas_dpp_post_process_config(struct wpa_supplicant *wpa_s,
+                                        struct dpp_authentication *auth)
+{
        if (wpa_s->conf->dpp_config_processing < 2)
-               return 0;
+               return;
 
 #ifdef CONFIG_DPP2
        if (auth->peer_version >= 2) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Postpone connection attempt to wait for completion of DPP Configuration Result");
                auth->connect_on_tx_status = 1;
-               return 0;
+               return;
        }
 #endif /* CONFIG_DPP2 */
 
        wpas_dpp_try_to_connect(wpa_s);
-       return 0;
 }
 
 
 static int wpas_dpp_handle_config_obj(struct wpa_supplicant *wpa_s,
-                                     struct dpp_authentication *auth)
+                                     struct dpp_authentication *auth,
+                                     struct dpp_config_obj *conf)
 {
        wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONF_RECEIVED);
-       if (auth->ssid_len)
+       if (conf->ssid_len)
                wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_SSID "%s",
-                       wpa_ssid_txt(auth->ssid, auth->ssid_len));
-       if (auth->connector) {
+                       wpa_ssid_txt(conf->ssid, conf->ssid_len));
+       if (conf->ssid_charset)
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_SSID_CHARSET "%d",
+                       conf->ssid_charset);
+       if (conf->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(wpa_s, MSG_INFO, DPP_EVENT_CONNECTOR "%s",
-                       auth->connector);
+                       conf->connector);
        }
-       if (auth->c_sign_key) {
+       if (conf->c_sign_key) {
                char *hex;
                size_t hexlen;
 
-               hexlen = 2 * wpabuf_len(auth->c_sign_key) + 1;
+               hexlen = 2 * wpabuf_len(conf->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));
+                                        wpabuf_head(conf->c_sign_key),
+                                        wpabuf_len(conf->c_sign_key));
                        wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_C_SIGN_KEY "%s",
                                hex);
                        os_free(hex);
@@ -1151,7 +1267,33 @@ static int wpas_dpp_handle_config_obj(struct wpa_supplicant *wpa_s,
                }
        }
 
-       return wpas_dpp_process_config(wpa_s, auth);
+       return wpas_dpp_process_config(wpa_s, auth, conf);
+}
+
+
+static int wpas_dpp_handle_key_pkg(struct wpa_supplicant *wpa_s,
+                                  struct dpp_asymmetric_key *key)
+{
+#ifdef CONFIG_DPP2
+       int res;
+
+       if (!key)
+               return 0;
+
+       wpa_printf(MSG_DEBUG, "DPP: Received Configurator backup");
+       wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONF_RECEIVED);
+
+       while (key) {
+               res = dpp_configurator_from_backup(wpa_s->dpp, key);
+               if (res < 0)
+                       return -1;
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFIGURATOR_ID "%d",
+                       res);
+               key = key->next;
+       }
+#endif /* CONFIG_DPP2 */
+
+       return 0;
 }
 
 
@@ -1165,6 +1307,7 @@ static void wpas_dpp_gas_resp_cb(void *ctx, const u8 *addr, u8 dialog_token,
        struct dpp_authentication *auth = wpa_s->dpp_auth;
        int res;
        enum dpp_status_error status = DPP_STATUS_CONFIG_REJECTED;
+       unsigned int i;
 
        wpa_s->dpp_gas_dialog_token = -1;
 
@@ -1202,8 +1345,15 @@ static void wpas_dpp_gas_resp_cb(void *ctx, const u8 *addr, u8 dialog_token,
                goto fail;
        }
 
-       res = wpas_dpp_handle_config_obj(wpa_s, auth);
-       if (res < 0)
+       for (i = 0; i < auth->num_conf_obj; i++) {
+               res = wpas_dpp_handle_config_obj(wpa_s, auth,
+                                                &auth->conf_obj[i]);
+               if (res < 0)
+                       goto fail;
+       }
+       if (auth->num_conf_obj)
+               wpas_dpp_post_process_config(wpa_s, auth);
+       if (wpas_dpp_handle_key_pkg(wpa_s, auth->conf_key_pkg) < 0)
                goto fail;
 
        status = DPP_STATUS_OK;
@@ -1252,14 +1402,18 @@ static void wpas_dpp_start_gas_client(struct wpa_supplicant *wpa_s)
        struct dpp_authentication *auth = wpa_s->dpp_auth;
        struct wpabuf *buf;
        int res;
+       int *supp_op_classes;
 
        wpa_s->dpp_gas_client = 1;
        offchannel_send_action_done(wpa_s);
        wpas_dpp_listen_stop(wpa_s);
 
+       supp_op_classes = wpas_supp_op_classes(wpa_s);
        buf = dpp_build_conf_req_helper(auth, wpa_s->conf->dpp_name,
-                                       wpa_s->dpp_netrole_ap,
-                                       wpa_s->conf->dpp_mud_url);
+                                       wpa_s->dpp_netrole,
+                                       wpa_s->conf->dpp_mud_url,
+                                       supp_op_classes);
+       os_free(supp_op_classes);
        if (!buf) {
                wpa_printf(MSG_DEBUG,
                           "DPP: No configuration request data available");
@@ -1518,8 +1672,89 @@ static int wpas_dpp_process_conf_obj(void *ctx,
                                     struct dpp_authentication *auth)
 {
        struct wpa_supplicant *wpa_s = ctx;
+       unsigned int i;
+       int res = -1;
+
+       for (i = 0; i < auth->num_conf_obj; i++) {
+               res = wpas_dpp_handle_config_obj(wpa_s, auth,
+                                                &auth->conf_obj[i]);
+               if (res)
+                       break;
+       }
+       if (!res)
+               wpas_dpp_post_process_config(wpa_s, auth);
+
+       return res;
+}
+
+
+static void wpas_dpp_remove_bi(void *ctx, struct dpp_bootstrap_info *bi)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       if (bi == wpa_s->dpp_chirp_bi)
+               wpas_dpp_chirp_stop(wpa_s);
+}
+
+
+static void
+wpas_dpp_rx_presence_announcement(struct wpa_supplicant *wpa_s, const u8 *src,
+                                 const u8 *hdr, const u8 *buf, size_t len,
+                                 unsigned int freq)
+{
+       const u8 *r_bootstrap;
+       u16 r_bootstrap_len;
+       struct dpp_bootstrap_info *peer_bi;
+       struct dpp_authentication *auth;
+
+       if (!wpa_s->dpp)
+               return;
+
+       if (wpa_s->dpp_auth) {
+               wpa_printf(MSG_DEBUG,
+                          "DPP: Ignore Presence Announcement during ongoing Authentication");
+               return;
+       }
+
+       wpa_printf(MSG_DEBUG, "DPP: Presence Announcement from " MACSTR,
+                  MAC2STR(src));
+
+       r_bootstrap = dpp_get_attr(buf, len, DPP_ATTR_R_BOOTSTRAP_KEY_HASH,
+                                  &r_bootstrap_len);
+       if (!r_bootstrap || r_bootstrap_len != SHA256_MAC_LEN) {
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_FAIL
+                       "Missing or invalid required Responder Bootstrapping Key Hash attribute");
+               return;
+       }
+       wpa_hexdump(MSG_MSGDUMP, "DPP: Responder Bootstrapping Key Hash",
+                   r_bootstrap, r_bootstrap_len);
+       peer_bi = dpp_bootstrap_find_chirp(wpa_s->dpp, r_bootstrap);
+       if (!peer_bi) {
+               wpa_printf(MSG_DEBUG,
+                          "DPP: No matching bootstrapping information found");
+               return;
+       }
+
+       auth = dpp_auth_init(wpa_s->dpp, wpa_s, peer_bi, NULL,
+                            DPP_CAPAB_CONFIGURATOR, freq, NULL, 0);
+       if (!auth)
+               return;
+       wpas_dpp_set_testing_options(wpa_s, auth);
+       if (dpp_set_configurator(auth, wpa_s->dpp_configurator_params) < 0) {
+               dpp_auth_deinit(auth);
+               return;
+       }
 
-       return wpas_dpp_handle_config_obj(wpa_s, auth);
+       auth->neg_freq = freq;
+
+       if (!is_zero_ether_addr(peer_bi->mac_addr))
+               os_memcpy(auth->peer_mac_addr, peer_bi->mac_addr, ETH_ALEN);
+
+       wpa_s->dpp_auth = auth;
+       if (wpas_dpp_auth_init_next(wpa_s) < 0) {
+               dpp_auth_deinit(wpa_s->dpp_auth);
+               wpa_s->dpp_auth = NULL;
+       }
 }
 
 #endif /* CONFIG_DPP2 */
@@ -1986,6 +2221,7 @@ wpas_dpp_rx_pkex_commit_reveal_resp(struct wpa_supplicant *wpa_s, const u8 *src,
        if (wpas_dpp_auth_init(wpa_s, cmd) < 0) {
                wpa_printf(MSG_DEBUG,
                           "DPP: Authentication initialization failed");
+               offchannel_send_action_done(wpa_s);
                return;
        }
 }
@@ -2066,6 +2302,10 @@ void wpas_dpp_rx_action(struct wpa_supplicant *wpa_s, const u8 *src,
        case DPP_PA_CONNECTION_STATUS_RESULT:
                wpas_dpp_rx_conn_status_result(wpa_s, src, hdr, buf, len);
                break;
+       case DPP_PA_PRESENCE_ANNOUNCEMENT:
+               wpas_dpp_rx_presence_announcement(wpa_s, src, hdr, buf, len,
+                                                 freq);
+               break;
 #endif /* CONFIG_DPP2 */
        default:
                wpa_printf(MSG_DEBUG,
@@ -2181,15 +2421,18 @@ int wpas_dpp_configurator_sign(struct wpa_supplicant *wpa_s, const char *cmd)
        int ret = -1;
        char *curve = NULL;
 
-       auth = os_zalloc(sizeof(*auth));
+       auth = dpp_alloc_auth(wpa_s->dpp, wpa_s);
        if (!auth)
                return -1;
 
        curve = get_param(cmd, " curve=");
        wpas_dpp_set_testing_options(wpa_s, auth);
-       if (dpp_set_configurator(wpa_s->dpp, wpa_s, auth, cmd) == 0 &&
+       if (dpp_set_configurator(auth, cmd) == 0 &&
            dpp_configurator_own_config(auth, curve, 0) == 0)
-               ret = wpas_dpp_handle_config_obj(wpa_s, auth);
+               ret = wpas_dpp_handle_config_obj(wpa_s, auth,
+                                                &auth->conf_obj[0]);
+       if (!ret)
+               wpas_dpp_post_process_config(wpa_s, auth);
 
        dpp_auth_deinit(auth);
        os_free(curve);
@@ -2456,6 +2699,8 @@ int wpas_dpp_pkex_remove(struct wpa_supplicant *wpa_s, const char *id)
 
 void wpas_dpp_stop(struct wpa_supplicant *wpa_s)
 {
+       if (wpa_s->dpp_auth || wpa_s->dpp_pkex)
+               offchannel_send_action_done(wpa_s);
        dpp_auth_deinit(wpa_s->dpp_auth);
        wpa_s->dpp_auth = NULL;
        dpp_pkex_free(wpa_s->dpp_pkex);
@@ -2486,6 +2731,7 @@ int wpas_dpp_init(struct wpa_supplicant *wpa_s)
        config.cb_ctx = wpa_s;
 #ifdef CONFIG_DPP2
        config.process_conf_obj = wpas_dpp_process_conf_obj;
+       config.remove_bi = wpas_dpp_remove_bi;
 #endif /* CONFIG_DPP2 */
        wpa_s->dpp = dpp_global_init(&config);
        return wpa_s->dpp ? 0 : -1;
@@ -2517,6 +2763,7 @@ void wpas_dpp_deinit(struct wpa_supplicant *wpa_s)
        eloop_cancel_timeout(wpas_dpp_conn_status_result_timeout, wpa_s, NULL);
        dpp_pfs_free(wpa_s->dpp_pfs);
        wpa_s->dpp_pfs = NULL;
+       wpas_dpp_chirp_stop(wpa_s);
 #endif /* CONFIG_DPP2 */
        offchannel_send_action_done(wpa_s);
        wpas_dpp_listen_stop(wpa_s);
@@ -2529,6 +2776,7 @@ void wpas_dpp_deinit(struct wpa_supplicant *wpa_s)
 
 
 #ifdef CONFIG_DPP2
+
 int wpas_dpp_controller_start(struct wpa_supplicant *wpa_s, const char *cmd)
 {
        struct dpp_controller_config config;
@@ -2545,4 +2793,270 @@ int wpas_dpp_controller_start(struct wpa_supplicant *wpa_s, const char *cmd)
        config.configurator_params = wpa_s->dpp_configurator_params;
        return dpp_controller_start(wpa_s->dpp, &config);
 }
+
+
+static void wpas_dpp_chirp_next(void *eloop_ctx, void *timeout_ctx);
+
+static void wpas_dpp_chirp_timeout(void *eloop_ctx, void *timeout_ctx)
+{
+       struct wpa_supplicant *wpa_s = eloop_ctx;
+
+       wpa_printf(MSG_DEBUG, "DPP: No chirp response received");
+       offchannel_send_action_done(wpa_s);
+       wpas_dpp_chirp_next(wpa_s, NULL);
+}
+
+
+static void wpas_dpp_chirp_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)
+{
+       if (result == OFFCHANNEL_SEND_ACTION_FAILED) {
+               wpa_printf(MSG_DEBUG, "DPP: Failed to send chirp on %d MHz",
+                          wpa_s->dpp_chirp_freq);
+               if (eloop_register_timeout(0, 0, wpas_dpp_chirp_next,
+                                          wpa_s, NULL) < 0)
+                       wpas_dpp_chirp_stop(wpa_s);
+               return;
+       }
+
+       wpa_printf(MSG_DEBUG, "DPP: Chirp send completed - wait for response");
+       if (eloop_register_timeout(2, 0, wpas_dpp_chirp_timeout,
+                                  wpa_s, NULL) < 0)
+               wpas_dpp_chirp_stop(wpa_s);
+}
+
+
+static void wpas_dpp_chirp_start(struct wpa_supplicant *wpa_s)
+{
+       wpa_printf(MSG_DEBUG, "DPP: Chirp on %d MHz", wpa_s->dpp_chirp_freq);
+       wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_TX "dst=" MACSTR " freq=%u type=%d",
+               MAC2STR(broadcast), wpa_s->dpp_chirp_freq,
+               DPP_PA_PRESENCE_ANNOUNCEMENT);
+       if (offchannel_send_action(
+                   wpa_s, wpa_s->dpp_chirp_freq, broadcast,
+                   wpa_s->own_addr, broadcast,
+                   wpabuf_head(wpa_s->dpp_presence_announcement),
+                   wpabuf_len(wpa_s->dpp_presence_announcement),
+                   2000, wpas_dpp_chirp_tx_status, 0) < 0)
+               wpas_dpp_chirp_stop(wpa_s);
+}
+
+
+static void wpas_dpp_chirp_scan_res_handler(struct wpa_supplicant *wpa_s,
+                                           struct wpa_scan_results *scan_res)
+{
+       struct dpp_bootstrap_info *bi = wpa_s->dpp_chirp_bi;
+       unsigned int i;
+       struct hostapd_hw_modes *mode;
+       int c;
+       struct wpa_bss *bss;
+
+       if (!bi)
+               return;
+
+       wpa_s->dpp_chirp_scan_done = 1;
+
+       os_free(wpa_s->dpp_chirp_freqs);
+       wpa_s->dpp_chirp_freqs = NULL;
+
+       /* Channels from own bootstrapping info */
+       for (i = 0; i < bi->num_freq; i++)
+               int_array_add_unique(&wpa_s->dpp_chirp_freqs, bi->freq[i]);
+
+       /* Preferred chirping channels */
+       int_array_add_unique(&wpa_s->dpp_chirp_freqs, 2437);
+
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
+                       HOSTAPD_MODE_IEEE80211A, 0);
+       if (mode) {
+               int chan44 = 0, chan149 = 0;
+
+               for (c = 0; c < mode->num_channels; c++) {
+                       struct hostapd_channel_data *chan = &mode->channels[c];
+
+                       if (chan->flag & (HOSTAPD_CHAN_DISABLED |
+                                         HOSTAPD_CHAN_RADAR))
+                               continue;
+                       if (chan->freq == 5220)
+                               chan44 = 1;
+                       if (chan->freq == 5745)
+                               chan149 = 1;
+               }
+               if (chan149)
+                       int_array_add_unique(&wpa_s->dpp_chirp_freqs, 5745);
+               else if (chan44)
+                       int_array_add_unique(&wpa_s->dpp_chirp_freqs, 5220);
+       }
+
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
+                       HOSTAPD_MODE_IEEE80211AD, 0);
+       if (mode) {
+               for (c = 0; c < mode->num_channels; c++) {
+                       struct hostapd_channel_data *chan = &mode->channels[c];
+
+                       if ((chan->flag & (HOSTAPD_CHAN_DISABLED |
+                                          HOSTAPD_CHAN_RADAR)) ||
+                           chan->freq != 60480)
+                               continue;
+                       int_array_add_unique(&wpa_s->dpp_chirp_freqs, 60480);
+                       break;
+               }
+       }
+
+       /* Add channels from scan results for APs that advertise Configurator
+        * Connectivity element */
+       dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
+               if (wpa_bss_get_vendor_ie(bss, DPP_CC_IE_VENDOR_TYPE))
+                       int_array_add_unique(&wpa_s->dpp_chirp_freqs,
+                                            bss->freq);
+       }
+
+       if (!wpa_s->dpp_chirp_freqs ||
+           eloop_register_timeout(0, 0, wpas_dpp_chirp_next, wpa_s, NULL) < 0)
+               wpas_dpp_chirp_stop(wpa_s);
+}
+
+
+static void wpas_dpp_chirp_next(void *eloop_ctx, void *timeout_ctx)
+{
+       struct wpa_supplicant *wpa_s = eloop_ctx;
+       int i;
+
+       if (wpa_s->dpp_chirp_listen)
+               wpas_dpp_listen_stop(wpa_s);
+
+       if (wpa_s->dpp_chirp_freq == 0) {
+               if (wpa_s->dpp_chirp_round % 4 == 0 &&
+                   !wpa_s->dpp_chirp_scan_done) {
+                       wpa_printf(MSG_DEBUG,
+                                  "DPP: Update channel list for chirping");
+                       wpa_s->scan_req = MANUAL_SCAN_REQ;
+                       wpa_s->scan_res_handler =
+                               wpas_dpp_chirp_scan_res_handler;
+                       wpa_supplicant_req_scan(wpa_s, 0, 0);
+                       return;
+               }
+               wpa_s->dpp_chirp_freq = wpa_s->dpp_chirp_freqs[0];
+               wpa_s->dpp_chirp_round++;
+               wpa_printf(MSG_DEBUG, "DPP: Start chirping round %d",
+                          wpa_s->dpp_chirp_round);
+       } else {
+               for (i = 0; wpa_s->dpp_chirp_freqs[i]; i++)
+                       if (wpa_s->dpp_chirp_freqs[i] == wpa_s->dpp_chirp_freq)
+                               break;
+               if (!wpa_s->dpp_chirp_freqs[i]) {
+                       wpa_printf(MSG_DEBUG,
+                                  "DPP: Previous chirp freq %d not found",
+                                  wpa_s->dpp_chirp_freq);
+                       return;
+               }
+               i++;
+               if (wpa_s->dpp_chirp_freqs[i]) {
+                       wpa_s->dpp_chirp_freq = wpa_s->dpp_chirp_freqs[i];
+               } else {
+                       wpa_s->dpp_chirp_iter--;
+                       if (wpa_s->dpp_chirp_iter <= 0) {
+                               wpa_printf(MSG_DEBUG,
+                                          "DPP: Chirping iterations completed");
+                               wpas_dpp_chirp_stop(wpa_s);
+                               return;
+                       }
+                       wpa_s->dpp_chirp_freq = 0;
+                       wpa_s->dpp_chirp_scan_done = 0;
+                       if (eloop_register_timeout(30, 0, wpas_dpp_chirp_next,
+                                                  wpa_s, NULL) < 0) {
+                               wpas_dpp_chirp_stop(wpa_s);
+                               return;
+                       }
+                       if (wpa_s->dpp_chirp_listen) {
+                               wpa_printf(MSG_DEBUG,
+                                          "DPP: Listen on %d MHz during chirp 30 second wait",
+                                       wpa_s->dpp_chirp_listen);
+                               wpas_dpp_listen_start(wpa_s,
+                                                     wpa_s->dpp_chirp_listen);
+                       } else {
+                               wpa_printf(MSG_DEBUG,
+                                          "DPP: Wait 30 seconds before starting the next chirping round");
+                       }
+                       return;
+               }
+       }
+
+       wpas_dpp_chirp_start(wpa_s);
+}
+
+
+int wpas_dpp_chirp(struct wpa_supplicant *wpa_s, const char *cmd)
+{
+       const char *pos;
+       int iter = 1, listen_freq = 0;
+       struct dpp_bootstrap_info *bi;
+
+       pos = os_strstr(cmd, " own=");
+       if (!pos)
+               return -1;
+       pos += 5;
+       bi = dpp_bootstrap_get_id(wpa_s->dpp, atoi(pos));
+       if (!bi) {
+               wpa_printf(MSG_DEBUG,
+                          "DPP: Identified bootstrap info not found");
+               return -1;
+       }
+
+       pos = os_strstr(cmd, " iter=");
+       if (pos) {
+               iter = atoi(pos + 6);
+               if (iter <= 0)
+                       return -1;
+       }
+
+       pos = os_strstr(cmd, " listen=");
+       if (pos) {
+               listen_freq = atoi(pos + 8);
+               if (iter <= 0)
+                       return -1;
+       }
+
+       wpas_dpp_chirp_stop(wpa_s);
+       wpa_s->dpp_allowed_roles = DPP_CAPAB_ENROLLEE;
+       wpa_s->dpp_qr_mutual = 0;
+       wpa_s->dpp_chirp_bi = bi;
+       wpa_s->dpp_presence_announcement = dpp_build_presence_announcement(bi);
+       if (!wpa_s->dpp_presence_announcement)
+               return -1;
+       wpa_s->dpp_chirp_iter = iter;
+       wpa_s->dpp_chirp_round = 0;
+       wpa_s->dpp_chirp_scan_done = 0;
+       wpa_s->dpp_chirp_listen = listen_freq;
+
+       return eloop_register_timeout(0, 0, wpas_dpp_chirp_next, wpa_s, NULL);
+}
+
+
+void wpas_dpp_chirp_stop(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->dpp_presence_announcement) {
+               offchannel_send_action_done(wpa_s);
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CHIRP_STOPPED);
+       }
+       wpa_s->dpp_chirp_bi = NULL;
+       wpabuf_free(wpa_s->dpp_presence_announcement);
+       wpa_s->dpp_presence_announcement = NULL;
+       if (wpa_s->dpp_chirp_listen)
+               wpas_dpp_listen_stop(wpa_s);
+       wpa_s->dpp_chirp_listen = 0;
+       wpa_s->dpp_chirp_freq = 0;
+       os_free(wpa_s->dpp_chirp_freqs);
+       wpa_s->dpp_chirp_freqs = NULL;
+       eloop_cancel_timeout(wpas_dpp_chirp_next, wpa_s, NULL);
+       eloop_cancel_timeout(wpas_dpp_chirp_timeout, wpa_s, NULL);
+       if (wpa_s->scan_res_handler == wpas_dpp_chirp_scan_res_handler) {
+               wpas_abort_ongoing_scan(wpa_s);
+               wpa_s->scan_res_handler = NULL;
+       }
+}
+
 #endif /* CONFIG_DPP2 */