7301a244b2
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
112 lines
4.1 KiB
C
112 lines
4.1 KiB
C
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2005 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef DBUS_HELPERS_H
|
|
#define DBUS_HELPERS_H
|
|
|
|
#include <dbus/dbus.h>
|
|
|
|
#include "cipher.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
dbus_bool_t nmu_security_serialize_wep (DBusMessageIter *iter,
|
|
const char *key,
|
|
int auth_alg);
|
|
|
|
dbus_bool_t nmu_security_deserialize_wep (DBusMessageIter *iter,
|
|
char **key,
|
|
int *key_len,
|
|
int *auth_alg);
|
|
|
|
dbus_bool_t nmu_security_serialize_none_with_cipher (DBusMessage *message);
|
|
|
|
dbus_bool_t nmu_security_serialize_wep_with_cipher (DBusMessage *message,
|
|
IEEE_802_11_Cipher *cipher,
|
|
const char *ssid,
|
|
const char *input,
|
|
int auth_alg);
|
|
|
|
dbus_bool_t nmu_security_serialize_wpa_psk (DBusMessageIter *iter,
|
|
const char *key,
|
|
int wpa_version,
|
|
int key_mgt);
|
|
|
|
dbus_bool_t nmu_security_deserialize_wpa_psk (DBusMessageIter *iter,
|
|
char **key,
|
|
int *key_len,
|
|
int *wpa_version,
|
|
int *key_mgt);
|
|
|
|
dbus_bool_t nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message,
|
|
IEEE_802_11_Cipher *cipher,
|
|
const char *ssid,
|
|
const char *input,
|
|
int wpa_version,
|
|
int key_mgt);
|
|
|
|
dbus_bool_t nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
|
|
int eap_method,
|
|
const char *identity,
|
|
const char *passwd,
|
|
const char *anon_identity,
|
|
const char *private_key_passwd,
|
|
const char *private_key_file,
|
|
const char *client_cert_file,
|
|
const char *ca_cert_file,
|
|
int wpa_version);
|
|
|
|
dbus_bool_t nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
|
|
int eap_method,
|
|
const char *identity,
|
|
const char *passwd,
|
|
const char *anon_identity,
|
|
const char *private_key_passwd,
|
|
const char *private_key_file,
|
|
const char *client_cert_file,
|
|
const char *ca_cert_file,
|
|
int wpa_version);
|
|
|
|
dbus_bool_t nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
|
|
int *eap_method,
|
|
char **identity,
|
|
char **passwd,
|
|
char **anon_identity,
|
|
char **private_key_passwd,
|
|
char **private_key_file,
|
|
char **client_cert_file,
|
|
char **ca_cert_file,
|
|
int *wpa_version);
|
|
|
|
DBusMessage * nmu_create_dbus_error_message (DBusMessage *message,
|
|
const char *exception_namespace,
|
|
const char *exception,
|
|
const char *format,
|
|
...);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* DBUS_HELPERS_H */
|