DPP3: Default value for dpp_connector_privacy

The new global configuration parameter
dpp_connector_privacy_default=<0/1> can now be used to set the default
value for the dpp_connector_privacy parameter for all new networks
provisioned using DPP.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index dcc4e497143b9f14e7762dca22c7452d0e7ee84b..082ddd84efe701918d4bbbc9772d8fc3b7f4d464 100644 (file)
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -5306,6 +5306,7 @@ static const struct global_parse_data global_fields[] = {
        { STR(dpp_mud_url), 0 },
        { STR(dpp_extra_conf_req_name), 0 },
        { STR(dpp_extra_conf_req_value), 0 },
+       { INT_RANGE(dpp_connector_privacy_default, 0, 1), 0 },
 #endif /* CONFIG_DPP */
        { INT_RANGE(coloc_intf_reporting, 0, 1), 0 },
 #ifdef CONFIG_WNM

diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
index d16913692cb312c90aa56538e8b3faaecb24966b..8b8be2a450d48f91da320542093859cfc3589733 100644 (file)
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -1629,6 +1629,13 @@ struct wpa_config {
         */
        char *dpp_extra_conf_req_value;
 
+       /* dpp_connector_privacy_default - Default valur for Connector privacy
+        *
+        * This value is used as the default for the dpp_connector_privacy
+        * network parameter for all new networks provisioned using DPP.
+        */
+       int dpp_connector_privacy_default;
+
        /**
         * coloc_intf_reporting - Colocated interference reporting
         *

diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index fcb4c31e7c70786811c6715300148ee4f890aa34..b637dbfbcd86d5edaee4844e91ea63092d5300f5 100644 (file)
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -1554,6 +1554,9 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
        if (config->dpp_extra_conf_req_value)
                fprintf(f, "dpp_extra_conf_req_value=%s\n",
                        config->dpp_extra_conf_req_value);
+       if (config->dpp_connector_privacy_default)
+               fprintf(f, "dpp_connector_privacy_default=%d\n",
+                       config->dpp_connector_privacy_default);
        if (config->coloc_intf_reporting)
                fprintf(f, "coloc_intf_reporting=%d\n",
                        config->coloc_intf_reporting);

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 70d3136d88a6f3a79a029afd2e9aabb59a44dbf2..c57c3531eb18b2b34a518b3e5e13445afb9602af 100644 (file)
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -1277,6 +1277,9 @@ static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
                ssid->dpp_connector = os_strdup(conf->connector);
                if (!ssid->dpp_connector)
                        goto fail;
+
+               ssid->dpp_connector_privacy =
+                       wpa_s->conf->dpp_connector_privacy_default;
        }
 
        if (conf->c_sign_key) {