NetworkManager/libnm-util/cipher-private.h
Dan Williams 5c35a1372c 2005-12-23 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-compat.c
		- Fix bugs in GConf entry conversion

	* gnome/applet/applet-dbus-info.c
		- (nmi_dbus_get_network_properties): handle case of the BSSID
			list being zero-length

	* libnm-util/cipher-*
	  libnm-util/dbus-helpers.c
		- All ciphers must now return hashed keys as UTF-8 valid
			hexadecimal strings, ie "8f3dae4023".  They are pushed
			through dbus as strings too.
		- Consolidate various functions that do bin->hex and hex->bin
			conversion into cipher.c

	* src/nm-ap-security-wep.c
	  src/nm-ap-security-wpa-psk.c
		- Handle NULL keys since we may not know keys right away

	* src/nm-dbus-nmi.c
		- (nm_dbus_get_network_data_cb): actually advance to the start
			of the wireless security info before we try to deserialize it

	* libnm-util/test-ciphers.c
		- Update cipher tests for the change to UTF-8 hexadecimal strings


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1230 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2005-12-23 08:20:12 +00:00

65 lines
2.2 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_PRIVATE_H
#define CIPHER_PRIVATE_H
struct IEEE_802_11_Cipher
{
int refcount;
/* From /usr/include/wireless.h, IW_AUTH_CIPHER_* value
* corresponding to this encryption method,
* ex IW_AUTH_CIPHER_WEP104
*/
int we_cipher;
/* Min & max lengths of user-input for this cipher method */
int input_min;
int input_max;
/* Secret hash function, if any. Takes user-entered
* password/passphrase/key and returns binary key to be
* sent to the card's driver itself. Returns an allocated
* value the the caller must free.
*/
char * (*cipher_hash_func)(IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
/* Input validation function, if any. Takes a user-entered
* password/passphrase/key and determines whether it is valid
* for this cipher. Return 0 if valid, -1 if invalid.
*/
int (*cipher_input_validate_func)(IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
};
int cipher_default_validate_func (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);
#endif /* CIPHER_PRIVATE_H */