WPS: Remove Version attribute from NFC messages

This old Version attribute is not really needed anymore for these use
cases with the assumption that there are no existing WPS+NFC
deployments. It was removed from the WSC specification, so make the
implementation match that change.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/wps/wps_common.c b/src/wps/wps_common.c
index 4b431adcd1ed12e47c27641ab160ab438d4c895e..b1eb682eae7fe2c3378496d38d5cf2873654f124 100644 (file)
--- a/src/wps/wps_common.c
+++ b/src/wps/wps_common.c
@@ -365,8 +365,7 @@ struct wpabuf * wps_get_oob_cred(struct wps_context *wps)
        data.wps = wps;
        data.auth_type = wps->auth_types;
        data.encr_type = wps->encr_types;
-       if (wps_build_version(plain) ||
-           wps_build_cred(&data, plain) ||
+       if (wps_build_cred(&data, plain) ||
            wps_build_wfa_ext(plain, 0, NULL, 0)) {
                os_free(data.new_psk);
                wpabuf_free(plain);
@@ -412,8 +411,7 @@ struct wpabuf * wps_build_nfc_pw_token(u16 dev_pw_id,
        if (data == NULL)
                return NULL;
 
-       if (wps_build_version(data) ||
-           wps_build_oob_dev_pw(data, dev_pw_id, pubkey,
+       if (wps_build_oob_dev_pw(data, dev_pw_id, pubkey,
                                 wpabuf_head(dev_pw), wpabuf_len(dev_pw)) ||
            wps_build_wfa_ext(data, 0, NULL, 0)) {
                wpa_printf(MSG_ERROR, "WPS: Failed to build NFC password "

diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
index e729617ce63fa27dd5fae770a8c0a6c0c1f33218..7ce35630205409c27becb7ecb330b214eea37146 100644 (file)
--- a/src/wps/wps_er.c
+++ b/src/wps/wps_er.c
@@ -2040,8 +2040,7 @@ struct wpabuf * wps_er_config_token_from_cred(struct wps_context *wps,
        os_memset(&data, 0, sizeof(data));
        data.wps = wps;
        data.use_cred = cred;
-       if (wps_build_version(ret) ||
-           wps_build_cred(&data, ret) ||
+       if (wps_build_cred(&data, ret) ||
            wps_build_wfa_ext(ret, 0, NULL, 0)) {
                wpabuf_free(ret);
                return NULL;