From 33d62bb31fdb6c13fb427fbf230b86e88d5d230a Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 19 Sep 2013 13:41:13 +0100 Subject: [PATCH] Implement EAP-PWD support --- src/wireless-security/eap-method-simple.c | 3 +++ src/wireless-security/eap-method-simple.h | 1 + src/wireless-security/wireless-security.c | 13 +++++++++++++ 3 files changed, 17 insertions(+) diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c index 401eeb2..23ccb4e 100644 --- a/src/wireless-security/eap-method-simple.c +++ b/src/wireless-security/eap-method-simple.c @@ -125,6 +125,9 @@ fill_connection (EAPMethod *parent, NMConnection *connection) case EAP_METHOD_SIMPLE_TYPE_GTC: eap = "gtc"; break; + case EAP_METHOD_SIMPLE_TYPE_PWD: + eap = "pwd"; + break; default: g_assert_not_reached (); break; diff --git a/src/wireless-security/eap-method-simple.h b/src/wireless-security/eap-method-simple.h index 8a955dc..6f43104 100644 --- a/src/wireless-security/eap-method-simple.h +++ b/src/wireless-security/eap-method-simple.h @@ -30,6 +30,7 @@ typedef enum { EAP_METHOD_SIMPLE_TYPE_MSCHAP, EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2, EAP_METHOD_SIMPLE_TYPE_MD5, + EAP_METHOD_SIMPLE_TYPE_PWD, EAP_METHOD_SIMPLE_TYPE_CHAP, EAP_METHOD_SIMPLE_TYPE_GTC } EAPMethodSimpleType; diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c index 73315b1..2bc7648 100644 --- a/src/wireless-security/wireless-security.c +++ b/src/wireless-security/wireless-security.c @@ -387,6 +387,7 @@ ws_802_1x_auth_combo_init (WirelessSecurity *sec, EAPMethodSimple *em_md5; EAPMethodTLS *em_tls; EAPMethodLEAP *em_leap; + EAPMethodSimple *em_pwd; EAPMethodFAST *em_fast; EAPMethodTTLS *em_ttls; EAPMethodPEAP *em_peap; @@ -458,6 +459,18 @@ ws_802_1x_auth_combo_init (WirelessSecurity *sec, item++; } + em_pwd = eap_method_simple_new (sec, connection, EAP_METHOD_SIMPLE_TYPE_PWD, + FALSE, is_editor, secrets_only); + gtk_list_store_append (auth_model, &iter); + gtk_list_store_set (auth_model, &iter, + AUTH_NAME_COLUMN, _("PWD"), + AUTH_METHOD_COLUMN, em_pwd, + -1); + eap_method_unref (EAP_METHOD (em_pwd)); + if (default_method && (active < 0) && !strcmp (default_method, "pwd")) + active = item; + item++; + em_fast = eap_method_fast_new (sec, connection, is_editor, secrets_only); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, -- 1.8.3.2