]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
DPP: Fix @CONF-OBJ-SEP@ parsing for multiple configs
authorJouni Malinen <quic_jouni@quicinc.com>
Wed, 22 Feb 2023 15:01:58 +0000 (17:01 +0200)
committerJouni Malinen <j@w1.fi>
Wed, 22 Feb 2023 15:01:58 +0000 (17:01 +0200)
The first call to dpp_configuration_parse_helper() was supposed to use
the separately prepared tmp string with only the first configuration
entry, but it ended up using the full string that included both
configuration entries. This could result in the first configObject
getting a mix of parameters from both entries.

Fix the parsing to use only the text before the @CONF-OBJ-SEP@ separator
for the first entry.

Fixes: 7eb06a33697f ("DPP2: Allow multiple Config Objects to be build on Configurator")
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
src/common/dpp.c

index 6b72a23ff89d8202e5aa53ecc88c86062a3ea91f..9d3d306da55c20600ea7422aab5b2852a387c94b 100644 (file)
@@ -1342,7 +1342,7 @@ static int dpp_configuration_parse(struct dpp_authentication *auth,
                goto fail;
        os_memcpy(tmp, cmd, len);
        tmp[len] = '\0';
-       res = dpp_configuration_parse_helper(auth, cmd, 0);
+       res = dpp_configuration_parse_helper(auth, tmp, 0);
        str_clear_free(tmp);
        if (res)
                goto fail;