From bc5b84c2f18452675d570d15972177910cfbf898 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 22 Feb 2017 11:46:40 -0600 Subject: [PATCH] eap-wsc: Obtain DevicePasswordId from settings --- src/eap-wsc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/eap-wsc.c b/src/eap-wsc.c index e3ab8528..a51b0ba4 100644 --- a/src/eap-wsc.c +++ b/src/eap-wsc.c @@ -1265,7 +1265,6 @@ static bool eap_wsc_load_settings(struct eap_state *eap, } wsc->m1->association_state = WSC_ASSOCIATION_STATE_NOT_ASSOCIATED; - wsc->m1->device_password_id = WSC_DEVICE_PASSWORD_ID_PUSH_BUTTON; wsc->m1->configuration_error = WSC_CONFIGURATION_ERROR_NO_ERROR; if (!l_settings_get_uint(settings, "WSC", @@ -1274,6 +1273,11 @@ static bool eap_wsc_load_settings(struct eap_state *eap, wsc->m1->os_version = u32 & 0x7fffffff; + if (!l_settings_get_uint(settings, "WSC", "DevicePasswordId", &u32)) + u32 = WSC_DEVICE_PASSWORD_ID_PUSH_BUTTON; + + wsc->m1->device_password_id = u32; + device_password = l_settings_get_string(settings, "WSC", "DevicePassword"); if (device_password) {