5c35a1372c
* 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
98 lines
3.1 KiB
C
98 lines
3.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.
|
|
*/
|
|
|
|
#include <glib.h>
|
|
#include <iwlib.h>
|
|
|
|
#include "cipher.h"
|
|
#include "cipher-private.h"
|
|
#include "cipher-wep-hex.h"
|
|
|
|
|
|
static char * cipher_wep128_hex_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
|
|
static char * cipher_wep64_hex_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
|
|
|
|
|
|
#define WEP128_HEX_INPUT_SIZE 26
|
|
IEEE_802_11_Cipher * cipher_wep128_hex_new (void)
|
|
{
|
|
IEEE_802_11_Cipher * cipher = g_malloc0 (sizeof (IEEE_802_11_Cipher));
|
|
|
|
cipher->refcount = 1;
|
|
cipher->we_cipher = IW_AUTH_CIPHER_WEP104;
|
|
cipher->input_min = WEP128_HEX_INPUT_SIZE;
|
|
cipher->input_max = WEP128_HEX_INPUT_SIZE;
|
|
cipher->cipher_hash_func = cipher_wep128_hex_hash_func;
|
|
cipher->cipher_input_validate_func = cipher_default_validate_func;
|
|
|
|
return cipher;
|
|
}
|
|
|
|
static char * cipher_wep128_hex_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input)
|
|
{
|
|
char * bin = NULL;
|
|
char * hex = NULL;
|
|
|
|
g_return_val_if_fail (cipher != NULL, NULL);
|
|
g_return_val_if_fail (input != NULL, NULL);
|
|
|
|
/* Convert -> bin and back to -> hexstr for validation */
|
|
if (!(bin = cipher_hexstr2bin (input, WEP128_HEX_INPUT_SIZE)))
|
|
return NULL;
|
|
if (!(hex = cipher_bin2hexstr (bin, WEP128_HEX_INPUT_SIZE / 2, WEP128_HEX_INPUT_SIZE)))
|
|
return NULL;
|
|
g_free (bin);
|
|
return hex;
|
|
}
|
|
|
|
|
|
#define WEP64_HEX_INPUT_SIZE 10
|
|
IEEE_802_11_Cipher * cipher_wep64_hex_new (void)
|
|
{
|
|
IEEE_802_11_Cipher * cipher = g_malloc0 (sizeof (IEEE_802_11_Cipher));
|
|
|
|
cipher->refcount = 1;
|
|
cipher->we_cipher = IW_AUTH_CIPHER_WEP40;
|
|
cipher->input_min = WEP64_HEX_INPUT_SIZE;
|
|
cipher->input_max = WEP64_HEX_INPUT_SIZE;
|
|
cipher->cipher_hash_func = cipher_wep64_hex_hash_func;
|
|
cipher->cipher_input_validate_func = cipher_default_validate_func;
|
|
|
|
return cipher;
|
|
}
|
|
|
|
static char * cipher_wep64_hex_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input)
|
|
{
|
|
char * bin = NULL;
|
|
char * hex = NULL;
|
|
|
|
g_return_val_if_fail (cipher != NULL, NULL);
|
|
g_return_val_if_fail (input != NULL, NULL);
|
|
|
|
/* Convert -> bin and back to -> hexstr for validation */
|
|
if (!(bin = cipher_hexstr2bin (input, WEP64_HEX_INPUT_SIZE)))
|
|
return NULL;
|
|
if (!(hex = cipher_bin2hexstr (bin, WEP64_HEX_INPUT_SIZE / 2, WEP64_HEX_INPUT_SIZE)))
|
|
return NULL;
|
|
g_free (bin);
|
|
return hex;
|
|
}
|