2006-02-25 Robert Love <rml@novell.com>
Add WPA Enterprise support: * gnome/applet/Makefile.am: Build the files nm-gconf-wso-wpa-eap.c and nm-gconf-wso-wpa-eap.h. * gnome/applet/nm-gconf-wso-wpa-eap.c, gnome/applet/nm-gconf-wso-wpa-eap.h: Add WPA Enterprise Gconf serialization and deserialization. * gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c, gnome/applet/wireless-security-option.c, gnome/applet/wso-wpa-psk.c, gnome/applet/wso-wpa-psk.h: Clean up, support new defines. * gnome/applet/wireless-applet.glade: Add UI for configurating security settings related to WPA Enterprise. * gnome/applet/wireless-security-manager.c: Invoke wso_wpa_eap_new() to instantiate WPA Enterprise wireless-security-option. * gnome/applet/wso-wpa-eap.c, gnome/applet/wso-wpa-eap.h: New files. Implement WPA Enterprise wireless-security-option object. * include/NetworkManager.h: Add new NM_AUTH_TYPE_* and NM_EAP_METHOD_* defines. Cleanup. * libnm-util/cipher-wpa-psk-hex.c, libnm-util/cipher-wpa-psk-passphrase.c: Cleanup. * libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h: Add nmu_security_serialize_wpa_eap() to serialize input to DBUS method, nmu_security_serialize_wpa_eap_with_cipher() to serialize input including the cipher to DBUS method, and nmu_security_deserialize_wpa_eap() to deserialize from DBUS return to output. * src/Makefile.am: Build the files nm-ap-security-wpa-eap.c and nm-ap-security-wpa-eap.h * src/NetworkManagerAP.c: Add NM_AUTH_TYPE_WPA_EAP to NM_802_11_CAP_KEY_MGMT_802_1X cipher to capability mapping. * src/nm-ap-security-wpa-eap.c, src/nm-ap-security-wpa-eap.h: New files. Implement NMAPSecurityWPA_EAP object. * src/nm-ap-security-wpa-psk.c: Cleanup. * src/nm-ap-security.c: Support NM_AUTH_TYPE_EAP cipher and instantiate an NMAPSecurityWPA_EAP object via the method nm_ap_security_wpa_eap_new_deserialize(). * src/nm-dbus-nm.c: Cleanup. * test/nm-tool.c: Display "Enterprise" for wireless networks providing WPA Enterprise support. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1493 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
/*
|
||||
* NetworkManager signals
|
||||
*/
|
||||
#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
|
||||
#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
|
||||
|
||||
|
||||
/*
|
||||
@@ -92,26 +92,45 @@ typedef enum NMDeviceType
|
||||
|
||||
|
||||
/* 802.11 wireless-specific device capability bits */
|
||||
#define NM_802_11_CAP_NONE 0x00000000
|
||||
#define NM_802_11_CAP_PROTO_NONE 0x00000001
|
||||
#define NM_802_11_CAP_PROTO_WEP 0x00000002
|
||||
#define NM_802_11_CAP_PROTO_WPA 0x00000004
|
||||
#define NM_802_11_CAP_PROTO_WPA2 0x00000008
|
||||
#define NM_802_11_CAP_RESERVED1 0x00000010
|
||||
#define NM_802_11_CAP_RESERVED2 0x00000020
|
||||
#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000040
|
||||
#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000080
|
||||
#define NM_802_11_CAP_RESERVED3 0x00000100
|
||||
#define NM_802_11_CAP_RESERVED4 0x00000200
|
||||
#define NM_802_11_CAP_RESERVED5 0x00000400
|
||||
#define NM_802_11_CAP_RESERVED6 0x00000800
|
||||
#define NM_802_11_CAP_CIPHER_WEP40 0x00001000
|
||||
#define NM_802_11_CAP_CIPHER_WEP104 0x00002000
|
||||
#define NM_802_11_CAP_CIPHER_TKIP 0x00004000
|
||||
#define NM_802_11_CAP_CIPHER_CCMP 0x00008000
|
||||
#define NM_802_11_CAP_NONE 0x00000000
|
||||
#define NM_802_11_CAP_PROTO_NONE 0x00000001
|
||||
#define NM_802_11_CAP_PROTO_WEP 0x00000002
|
||||
#define NM_802_11_CAP_PROTO_WPA 0x00000004
|
||||
#define NM_802_11_CAP_PROTO_WPA2 0x00000008
|
||||
#define NM_802_11_CAP_RESERVED1 0x00000010
|
||||
#define NM_802_11_CAP_RESERVED2 0x00000020
|
||||
#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000040
|
||||
#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000080
|
||||
#define NM_802_11_CAP_RESERVED3 0x00000100
|
||||
#define NM_802_11_CAP_RESERVED4 0x00000200
|
||||
#define NM_802_11_CAP_RESERVED5 0x00000400
|
||||
#define NM_802_11_CAP_RESERVED6 0x00000800
|
||||
#define NM_802_11_CAP_CIPHER_WEP40 0x00001000
|
||||
#define NM_802_11_CAP_CIPHER_WEP104 0x00002000
|
||||
#define NM_802_11_CAP_CIPHER_TKIP 0x00004000
|
||||
#define NM_802_11_CAP_CIPHER_CCMP 0x00008000
|
||||
|
||||
/* Let wpa_supplicant figure out the cipher */
|
||||
#define NM_AUTH_CIPHER_AUTO 0x0
|
||||
/*
|
||||
* NM-supported Authentication Methods
|
||||
*/
|
||||
#define NM_AUTH_TYPE_WPA_PSK_AUTO 0x00000000
|
||||
#define NM_AUTH_TYPE_NONE 0x00000001
|
||||
#define NM_AUTH_TYPE_WEP40 0x00000002
|
||||
#define NM_AUTH_TYPE_WPA_PSK_TKIP 0x00000004
|
||||
#define NM_AUTH_TYPE_WPA_PSK_CCMP 0x00000008
|
||||
#define NM_AUTH_TYPE_WEP104 0x00000010
|
||||
#define NM_AUTH_TYPE_WPA_EAP 0x00000020
|
||||
|
||||
/*
|
||||
* EAP Methods
|
||||
*/
|
||||
#define NM_EAP_METHOD_MD5 0x00000001 /* EAP-MD5 */
|
||||
#define NM_EAP_METHOD_MSCHAP 0x00000002 /* EAP-MSCHAPv2 */
|
||||
#define NM_EAP_METHOD_OTP 0x00000004 /* EAP-OTP */
|
||||
#define NM_EAP_METHOD_GTC 0x00000008 /* EAP-GTC */
|
||||
#define NM_EAP_METHOD_PEAP 0x00000010 /* EAP-PEAP */
|
||||
#define NM_EAP_METHOD_TLS 0x00000020 /* EAP-TLS */
|
||||
#define NM_EAP_METHOD_TTLS 0x00000040 /* EAP-TTLS */
|
||||
|
||||
/*
|
||||
* Wireless network update types
|
||||
|
Reference in New Issue
Block a user