From 657121419ea98e852b4db7e4e97082d41fab9188 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 23 Oct 2007 18:28:41 +0000 Subject: [PATCH] 2007-10-23 Dan Williams * src/supplicant-manager/nm-supplicant-settings-verify.c - eap_allowed, phase2_allowed: harmonize with allowed values from nm-settings.c git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3009 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ .../nm-supplicant-settings-verify.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32bbfc3023..f0baa942c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-23 Dan Williams + + * src/supplicant-manager/nm-supplicant-settings-verify.c + - eap_allowed, phase2_allowed: harmonize with allowed values from + nm-settings.c + 2007-10-23 Dan Williams * src/nm-device-802-11-wireless.c diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index 92cb10703c..539bfc77e5 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -69,13 +69,17 @@ const char * proto_allowed[] = { "WPA", "RSN", NULL }; const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "NONE", NULL }; const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL }; -const char * eap_allowed[] = { "MD5", "TLS", "PEAP", "TTLS", "SIM", - "PSK", NULL }; +const char * eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM", + "PSK", "FAST", NULL }; + const char * phase1_allowed[] = {"peapver=0", "peapver=1", "peaplabel=1", "peap_outer_success=0", "include_tls_length=1", "sim_min_num_chal=3", NULL }; -const char * phase2_allowed[] = {"auth=MSCHAPV2", "auth=PAP", "autheap=TLS", - "autheap=MSCHAPV2", "autheap=MD5", NULL }; +const char * phase2_allowed[] = {"auth=PAP", "auth=CHAP", "auth=MSCHAP", + "auth=MSCHAPV2", "auth=GTC", "auth=OTP", + "auth=MD5", "auth=TLS", "autheap=MD5", + "autheap=MSCHAPV2", "autheap=OTP", + "autheap=GTC", "autheap=TLS", NULL }; static const struct Opt opt_table[] = { { "ssid", TYPE_BYTES, 0, 32,FALSE, NULL },