DPP: Allow both STA and AP configObject to be set

Extend @CONF-OBJ-SEP@ behavior to allow the second entry to be used for
different netRole. In other words, allow both the AP and STA netRole
(though, only a single one per netRole) configuration to be set.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-02-22 17:07:07 +02:00 committed by Jouni Malinen
parent 7292e30b7f
commit 6f63aca7b1

View file

@ -1310,8 +1310,14 @@ static int dpp_configuration_parse_helper(struct dpp_authentication *auth,
auth->conf_sta = conf_sta;
auth->conf_ap = conf_ap;
} else if (idx == 1) {
auth->conf2_sta = conf_sta;
auth->conf2_ap = conf_ap;
if (!auth->conf_sta)
auth->conf_sta = conf_sta;
else
auth->conf2_sta = conf_sta;
if (!auth->conf_ap)
auth->conf_ap = conf_ap;
else
auth->conf2_ap = conf_ap;
} else {
goto fail;
}