diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2010-07-29 10:23:20 -0700 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2010-09-09 06:07:49 -0700 |
| commit | fdc9eeb175a297fd7423b2814ce796fcaa21e181 (patch) | |
| tree | e4e07c5d56a3f6929e3201c46249a39781777b2f /src/wps/wps_enrollee.c | |
| parent | ac4dcaf7bf2ab86823314b1b161e13d802d0ea58 (diff) | |
| download | external_wpa_supplicant_8_ti-fdc9eeb175a297fd7423b2814ce796fcaa21e181.zip external_wpa_supplicant_8_ti-fdc9eeb175a297fd7423b2814ce796fcaa21e181.tar.gz external_wpa_supplicant_8_ti-fdc9eeb175a297fd7423b2814ce796fcaa21e181.tar.bz2 | |
WPS 2.0: Convert new attributes into WFA vendor extension
The WSC 2.0 specification moved to use another design for the new
attributes to avoid backwards compatibility issues with some
deployed implementations.
Diffstat (limited to 'src/wps/wps_enrollee.c')
| -rw-r--r-- | src/wps/wps_enrollee.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/wps/wps_enrollee.c b/src/wps/wps_enrollee.c index 6e2b511..b11cdb6 100644 --- a/src/wps/wps_enrollee.c +++ b/src/wps/wps_enrollee.c @@ -147,7 +147,7 @@ static struct wpabuf * wps_build_m1(struct wps_data *wps) wps_build_dev_password_id(msg, wps->dev_pw_id) || wps_build_config_error(msg, WPS_CFG_NO_ERROR) || wps_build_os_version(&wps->wps->dev, msg) || - wps_build_version2(msg)) { + wps_build_wfa_ext(msg, 0, NULL, 0)) { wpabuf_free(msg); return NULL; } @@ -177,7 +177,7 @@ static struct wpabuf * wps_build_m3(struct wps_data *wps) wps_build_msg_type(msg, WPS_M3) || wps_build_registrar_nonce(wps, msg) || wps_build_e_hash(wps, msg) || - wps_build_version2(msg) || + wps_build_wfa_ext(msg, 0, NULL, 0) || wps_build_authenticator(wps, msg)) { wpabuf_free(msg); return NULL; @@ -210,7 +210,7 @@ static struct wpabuf * wps_build_m5(struct wps_data *wps) wps_build_e_snonce1(wps, plain) || wps_build_key_wrap_auth(wps, plain) || wps_build_encr_settings(wps, msg, plain) || - wps_build_version2(msg) || + wps_build_wfa_ext(msg, 0, NULL, 0) || wps_build_authenticator(wps, msg)) { wpabuf_free(plain); wpabuf_free(msg); @@ -313,7 +313,7 @@ static struct wpabuf * wps_build_m7(struct wps_data *wps) (wps->wps->ap && wps_build_ap_settings(wps, plain)) || wps_build_key_wrap_auth(wps, plain) || wps_build_encr_settings(wps, msg, plain) || - wps_build_version2(msg) || + wps_build_wfa_ext(msg, 0, NULL, 0) || wps_build_authenticator(wps, msg)) { wpabuf_free(plain); wpabuf_free(msg); @@ -350,7 +350,7 @@ static struct wpabuf * wps_build_wsc_done(struct wps_data *wps) wps_build_msg_type(msg, WPS_WSC_DONE) || wps_build_enrollee_nonce(wps, msg) || wps_build_registrar_nonce(wps, msg) || - wps_build_version2(msg)) { + wps_build_wfa_ext(msg, 0, NULL, 0)) { wpabuf_free(msg); return NULL; } @@ -379,7 +379,7 @@ static struct wpabuf * wps_build_wsc_ack(struct wps_data *wps) wps_build_msg_type(msg, WPS_WSC_ACK) || wps_build_enrollee_nonce(wps, msg) || wps_build_registrar_nonce(wps, msg) || - wps_build_version2(msg)) { + wps_build_wfa_ext(msg, 0, NULL, 0)) { wpabuf_free(msg); return NULL; } @@ -403,7 +403,7 @@ static struct wpabuf * wps_build_wsc_nack(struct wps_data *wps) wps_build_enrollee_nonce(wps, msg) || wps_build_registrar_nonce(wps, msg) || wps_build_config_error(msg, wps->config_error) || - wps_build_version2(msg)) { + wps_build_wfa_ext(msg, 0, NULL, 0)) { wpabuf_free(msg); return NULL; } |