mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-10 17:30:17 +01:00
7a8f33aa3d
Remove NMAPSecurity objects, they are replaced with flags on the APs for each AP's capabilities, and by NMConnection/NMSettings objects for user defined connections. * include/NetworkManager.h - Redefine 802.11 security properties. There are now device capabilities and AP flags and AP security flags. It was way to unclear before. * src/Makefile.am src/nm-ap-security-leap.h src/nm-ap-security-leap.c src/nm-ap-security-wpa-eap.c src/nm-ap-security-wpa-eap.h src/nm-ap-security-private.h src/nm-ap-security-wpa-psk.c src/nm-ap-security-wpa-psk.h src/nm-ap-security-wep.c src/nm-ap-security-wep.h src/nm-ap-security.c src/nm-ap-security.h - Removed, to be replaced with NMConnection/NMSettings objects * src/nm-dbus-nmi.c src/nm-dbus-nmi.h - Removed, to be replaced by code that talks to the new info daemon interface and gets NMConnection/NMSettings objects * src/backends/NetworkManagerSuSE.c - Remove usage of NMAPSecurity; should be replaced by a system-level info-daemon that does the same thing but talks the new info-daemon D-Bus interface * src/NetworkManagerAP.h src/NetworkManagerAP.c src/NetworkManagerAPList.c libnm-glib/libnm-glib-test.c - Remove usage of NMAPSecurity objects and adjust to new flags for WPA/RSN * libnm-glib/nm-access-point.c libnm-glib/nm-access-point.h introspection/nm-access-point.xml test/nm-tool.c - Adjust to new flags for AP security * utils/nm-utils.c utils/nm-utils.h src/vpn-manager/nm-dbus-vpn.c - Remove D-Bus pending call stuff from nm-utils and put it in the VPN stuff which is the only place it's used * src/nm-device-interface.c src/nm-device-interface.h introspection/nm-device.xml src/nm-activation-request.c src/nm-activation-request.h src/nm-device.c - Add a new 'specific_object' argument that hints to NM what actual AP or other device-specific thing the connection should apply to. NMConnection objects can apply to more than one actual device/AP. * libnm-util/nm-connection.c * libnm-util/nm-connection.h - Add 'have_secrets" call stubs * libnm-util/cipher.h - Move NM_AUTH_TYPE_* defines here for now * src/nm-device-802-11-wireless.c - Remove usage of NMAPSecurity, to be replaced with NMConnection/ NMSettings objects * src/NetworkManagerDbus.c * src/NetworkManagerPolicy.c - Remove usage of update_allowed_networks, should be pushing data in a different manner git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2738 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
76 lines
2.7 KiB
C
76 lines
2.7 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 CIPHER_H
|
|
#define CIPHER_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/*
|
|
* 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
|
|
#define NM_AUTH_TYPE_LEAP 0x00000040
|
|
|
|
/*
|
|
* 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 */
|
|
|
|
|
|
typedef struct IEEE_802_11_Cipher IEEE_802_11_Cipher;
|
|
|
|
void ieee_802_11_cipher_ref (IEEE_802_11_Cipher *cipher);
|
|
void ieee_802_11_cipher_unref (IEEE_802_11_Cipher *cipher);
|
|
int ieee_802_11_cipher_get_we_cipher (IEEE_802_11_Cipher *cipher);
|
|
int ieee_802_11_cipher_get_input_min (IEEE_802_11_Cipher *cipher);
|
|
int ieee_802_11_cipher_get_input_max (IEEE_802_11_Cipher *cipher);
|
|
char * ieee_802_11_cipher_hash (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
|
|
int ieee_802_11_cipher_validate (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
|
|
|
|
char * cipher_bin2hexstr (const char *bytes, int len, int final_len);
|
|
char * cipher_hexstr2bin(const char *hex, size_t len);
|
|
|
|
|
|
/* Private API members (not part of the public API) */
|
|
int ieee_802_11_cipher_refcount (IEEE_802_11_Cipher *cipher);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* CIPHER_H */
|