DPP: Indicate authentication success on ConfReqRX if needed

It is possible to receive the Configuration Request frame before having
seen TX status for the Authentication Confirm. In that sequence, the
DPP-AUTH-SUCCESS event would not be indicated before processing the
configuration step and that could confuse upper layers that follow the
details of the DPP exchange. As a workaround, indicate DPP-AUTH-SUCCESS
when receiving the Configuration Request since the Enrollee/Responser
has clearly receive the Authentication Confirm even if the TX status for
it has not been received.

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

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 1532bbce84cc01c1555854bf42d820278921a7cf..1f65658eff76bf971b35fa8456b03fc59d61fdff 100644 (file)
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -1883,6 +1883,18 @@ wpas_dpp_gas_req_handler(void *ctx, const u8 *sa, const u8 *query,
                wpa_printf(MSG_DEBUG, "DPP: No matching exchange in progress");
                return NULL;
        }
+
+       if (wpa_s->dpp_auth_ok_on_ack && auth->configurator) {
+               wpa_printf(MSG_DEBUG,
+                          "DPP: Have not received ACK for Auth Confirm yet - assume it was received based on this GAS request");
+               /* wpas_dpp_auth_success() would normally have been called from
+                * TX status handler, but since there was no such handler call
+                * yet, simply send out the event message and proceed with
+                * exchange. */
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_AUTH_SUCCESS "init=1");
+               wpa_s->dpp_auth_ok_on_ack = 0;
+       }
+
        wpa_hexdump(MSG_DEBUG,
                    "DPP: Received Configuration Request (GAS Query Request)",
                    query, query_len);