From e435417eefb245fe010a345bfb594a3a91aa7e6a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 4 Apr 2013 10:03:17 +0300 Subject: [PATCH] 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 --- src/wps/wps_common.c | 6 ++---- src/wps/wps_er.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/wps/wps_common.c b/src/wps/wps_common.c index 4b431adcd..b1eb682ea 100644 --- 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 e729617ce..7ce356302 100644 --- 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;