DPP2: Extend TCP encapsulation case to support Configurator as Initiator

This allows DPP_AUTH_INIT to be used with tcp_addr=<dst> argument and
Configurator parameters to perform Configurator initiated DPP
provisioning over TCP. Similarly, DPP_CONTROLLER_START can now be used
to specify Configurator/Enrollee roles and extend Controller to work in
Enrollee role.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/src/common/dpp.h b/src/common/dpp.h
index 07c5bef6231b0fbcbddad448468dd689f0565cf1..c0927d9b84712769fcd4c7a11b1c84b5afe7ead4 100644 (file)
--- a/src/common/dpp.h
+++ b/src/common/dpp.h
@@ -358,6 +358,7 @@ struct dpp_relay_config {
 struct dpp_controller_config {
        const char *configurator_params;
        int tcp_port;
+       u8 allowed_roles;
 };
 
 #ifdef CONFIG_TESTING_OPTIONS

diff --git a/src/common/dpp_tcp.c b/src/common/dpp_tcp.c
index f58093f0d93d533738ec924e2b6f6714b7bcc3e4..fc53b8a0b7ca3112e14696eccabe8d65777ea623 100644 (file)
--- a/src/common/dpp_tcp.c
+++ b/src/common/dpp_tcp.c
@@ -139,6 +139,7 @@ dpp_relay_controller_get(struct dpp_global *dpp, const u8 *pkhash)
 static void dpp_controller_gas_done(struct dpp_connection *conn)
 {
        struct dpp_authentication *auth = conn->auth;
+       void *msg_ctx;
 
        if (auth->peer_version >= 2 &&
            auth->conf_resp_status == DPP_STATUS_OK) {
@@ -147,7 +148,11 @@ static void dpp_controller_gas_done(struct dpp_connection *conn)
                return;
        }
 
-       wpa_msg(conn->ctrl->global->msg_ctx, MSG_INFO, DPP_EVENT_CONF_SENT);
+       if (conn->ctrl)
+               msg_ctx = conn->ctrl->global->msg_ctx;
+       else
+               msg_ctx = auth->msg_ctx;
+       wpa_msg(msg_ctx, MSG_INFO, DPP_EVENT_CONF_SENT);
        dpp_connection_remove(conn);
 }
 
@@ -196,8 +201,8 @@ static int dpp_tcp_send(struct dpp_connection *conn)
                conn->read_eloop = 1;
        if (conn->on_tcp_tx_complete_remove) {
                dpp_connection_remove(conn);
-       } else if (conn->ctrl && conn->on_tcp_tx_complete_gas_done &&
-                  conn->auth) {
+       } else if (conn->auth && (conn->ctrl || conn->auth->configurator) &&
+                  conn->on_tcp_tx_complete_gas_done) {
                dpp_controller_gas_done(conn);
        } else if (conn->on_tcp_tx_complete_auth_ok) {
                conn->on_tcp_tx_complete_auth_ok = 0;
@@ -699,8 +704,9 @@ static int dpp_controller_rx_conf_result(struct dpp_connection *conn,
 {
        struct dpp_authentication *auth = conn->auth;
        enum dpp_status_error status;
+       void *msg_ctx;
 
-       if (!conn->ctrl)
+       if (!conn->ctrl && (!auth || !auth->configurator))
                return 0;
 
        wpa_printf(MSG_DEBUG, "DPP: Configuration Result");
@@ -710,10 +716,14 @@ static int dpp_controller_rx_conf_result(struct dpp_connection *conn,
                           "DPP: No DPP Configuration waiting for result - drop");
                return -1;
        }
+       if (conn->ctrl)
+               msg_ctx = conn->ctrl->global->msg_ctx;
+       else
+               msg_ctx = auth->msg_ctx;
 
        status = dpp_conf_result_rx(auth, hdr, buf, len);
        if (status == DPP_STATUS_OK && auth->send_conn_status) {
-               wpa_msg(conn->ctrl->global->msg_ctx, MSG_INFO,
+               wpa_msg(msg_ctx, MSG_INFO,
                        DPP_EVENT_CONF_SENT "wait_conn_status=1");
                wpa_printf(MSG_DEBUG, "DPP: Wait for Connection Status Result");
                eloop_cancel_timeout(
@@ -725,11 +735,9 @@ static int dpp_controller_rx_conf_result(struct dpp_connection *conn,
                return 0;
        }
        if (status == DPP_STATUS_OK)
-               wpa_msg(conn->ctrl->global->msg_ctx, MSG_INFO,
-                       DPP_EVENT_CONF_SENT);
+               wpa_msg(msg_ctx, MSG_INFO, DPP_EVENT_CONF_SENT);
        else
-               wpa_msg(conn->ctrl->global->msg_ctx, MSG_INFO,
-                       DPP_EVENT_CONF_FAILED);
+               wpa_msg(msg_ctx, MSG_INFO, DPP_EVENT_CONF_FAILED);
        return -1; /* to remove the completed connection */
 }
 
@@ -973,7 +981,7 @@ static int dpp_controller_rx_gas_req(struct dpp_connection *conn, const u8 *msg,
        wpa_printf(MSG_DEBUG,
                   "DPP: Received DPP Configuration Request over TCP");
 
-       if (!conn->ctrl || !auth ||
+       if (!auth || (!conn->ctrl && !auth->configurator) ||
            (!auth->auth_success && !auth->reconfig_success)) {
                wpa_printf(MSG_DEBUG, "DPP: No matching exchange in progress");
                return -1;
@@ -1049,7 +1057,10 @@ static int dpp_tcp_rx_gas_resp(struct dpp_connection *conn, struct wpabuf *resp)
        wpa_printf(MSG_DEBUG,
                   "DPP: Configuration Response for local stack from TCP");
 
-       res = dpp_conf_resp_rx(auth, resp);
+       if (auth)
+               res = dpp_conf_resp_rx(auth, resp);
+       else
+               res = -1;
        wpabuf_free(resp);
        if (res < 0) {
                wpa_printf(MSG_DEBUG, "DPP: Configuration attempt failed");
@@ -1135,7 +1146,8 @@ static int dpp_rx_gas_resp(struct dpp_connection *conn, const u8 *msg,
                return -1;
        wpabuf_put_data(buf, pos, slen);
 
-       if (!conn->relay && !conn->ctrl)
+       if (!conn->relay &&
+           (!conn->ctrl || (conn->ctrl->allowed_roles & DPP_CAPAB_ENROLLEE)))
                return dpp_tcp_rx_gas_resp(conn, buf);
 
        if (!conn->relay) {
@@ -1405,8 +1417,7 @@ int dpp_controller_start(struct dpp_global *dpp,
                ctrl->configurator_params =
                        os_strdup(config->configurator_params);
        dl_list_init(&ctrl->conn);
-       /* TODO: configure these somehow */
-       ctrl->allowed_roles = DPP_CAPAB_ENROLLEE | DPP_CAPAB_CONFIGURATOR;
+       ctrl->allowed_roles = config->allowed_roles;
        ctrl->qr_mutual = 0;
 
        ctrl->sock = socket(AF_INET, SOCK_STREAM, 0);

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index d3de39558aa35a80e0249e66d47b708ad3d5b167..b9b882bf2d5334065c843a856acda946b94caf62 100644 (file)
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -3117,12 +3117,27 @@ int wpas_dpp_controller_start(struct wpa_supplicant *wpa_s, const char *cmd)
        const char *pos;
 
        os_memset(&config, 0, sizeof(config));
+       config.allowed_roles = DPP_CAPAB_ENROLLEE | DPP_CAPAB_CONFIGURATOR;
        if (cmd) {
                pos = os_strstr(cmd, " tcp_port=");
                if (pos) {
                        pos += 10;
                        config.tcp_port = atoi(pos);
                }
+
+               pos = os_strstr(cmd, " role=");
+               if (pos) {
+                       pos += 6;
+                       if (os_strncmp(pos, "configurator", 12) == 0)
+                               config.allowed_roles = DPP_CAPAB_CONFIGURATOR;
+                       else if (os_strncmp(pos, "enrollee", 8) == 0)
+                               config.allowed_roles = DPP_CAPAB_ENROLLEE;
+                       else if (os_strncmp(pos, "either", 6) == 0)
+                               config.allowed_roles = DPP_CAPAB_CONFIGURATOR |
+                                       DPP_CAPAB_ENROLLEE;
+                       else
+                               return -1;
+               }
        }
        config.configurator_params = wpa_s->dpp_configurator_params;
        return dpp_controller_start(wpa_s->dpp, &config);