commit 1009da18d3e8fb9a86a01b43d27bd5cfc3a46336 Author: Dan Williams <dcbw@redhat.com> Date: Sat May 9 23:12:04 2009 -0400 let NM handle WEP & WPA passphrases (bgo #513820) (rh #441070) requires the following commits: f3c9887472ef6d773aeabd0bb7fcf102cf725398 (0.7.x) 07cc26d5fc3df0ed47b4bb993ce9a0d4f0008876 (master) diff --git a/network-manager-applet-0.7.0/src/connection-editor/page-wireless-security.c b/network-manager-applet-0.7.0/src/connection-editor/page-wireless-security.c index bedf239..661d5e3 100644 --- a/network-manager-applet-0.7.0/src/connection-editor/page-wireless-security.c +++ b/network-manager-applet-0.7.0/src/connection-editor/page-wireless-security.c @@ -244,25 +244,32 @@ finish_setup (CEPageWirelessSecurity *self, gpointer unused, GError *error, gpoi if (nm_utils_security_valid (NMU_SEC_STATIC_WEP, dev_caps, FALSE, is_adhoc, 0, 0, 0)) { WirelessSecurityWEPKey *ws_wep; - WEPKeyType default_wep_type = WEP_KEY_TYPE_KEY; + NMWepKeyType wep_type = NM_WEP_KEY_TYPE_KEY; - if (default_type == NMU_SEC_STATIC_WEP) - default_wep_type = ws_wep_guess_key_type (connection); + if (default_type == NMU_SEC_STATIC_WEP) { + NMSettingWirelessSecurity *s_wsec; - ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_KEY, FALSE); + s_wsec = (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY); + if (s_wsec) + wep_type = nm_setting_wireless_security_get_wep_key_type (s_wsec); + if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN) + wep_type = NM_WEP_KEY_TYPE_KEY; + } + + ws_wep = ws_wep_key_new (glade_file, connection, NM_WEP_KEY_TYPE_KEY, FALSE); if (ws_wep) { add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model, &iter, _("WEP 40/128-bit Key")); - if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_KEY)) + if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_KEY)) active = item; item++; } - ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_PASSPHRASE, FALSE); + ws_wep = ws_wep_key_new (glade_file, connection, NM_WEP_KEY_TYPE_PASSPHRASE, FALSE); if (ws_wep) { add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model, &iter, _("WEP 128-bit Passphrase")); - if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_PASSPHRASE)) + if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_PASSPHRASE)) active = item; item++; } diff --git a/network-manager-applet-0.7.0/src/utils/utils.c b/network-manager-applet-0.7.0/src/utils/utils.c index 53281b8..eee14e8 100644 --- a/network-manager-applet-0.7.0/src/utils/utils.c +++ b/network-manager-applet-0.7.0/src/utils/utils.c @@ -43,39 +43,6 @@ #include "utils.h" #include "gconf-helpers.h" -/* - * utils_bin2hexstr - * - * Convert a byte-array into a hexadecimal string. - * - * Code originally by Alex Larsson <alexl@redhat.com> and - * copyright Red Hat, Inc. under terms of the LGPL. - * - */ -char * -utils_bin2hexstr (const char *bytes, int len, int final_len) -{ - static char hex_digits[] = "0123456789abcdef"; - char * result; - int i; - - g_return_val_if_fail (bytes != NULL, NULL); - g_return_val_if_fail (len > 0, NULL); - g_return_val_if_fail (len < 256, NULL); /* Arbitrary limit */ - - result = g_malloc0 (len * 2 + 1); - for (i = 0; i < len; i++) - { - result[2*i] = hex_digits[(bytes[i] >> 4) & 0xf]; - result[2*i+1] = hex_digits[bytes[i] & 0xf]; - } - /* Cut converted key off at the correct length for this cipher type */ - if (final_len > -1) - result[final_len] = '\0'; - - return result; -} - static char *ignored_words[] = { "Semiconductor", "Components", diff --git a/network-manager-applet-0.7.0/src/utils/utils.h b/network-manager-applet-0.7.0/src/utils/utils.h index ce31e8a..97d1ca7 100644 --- a/network-manager-applet-0.7.0/src/utils/utils.h +++ b/network-manager-applet-0.7.0/src/utils/utils.h @@ -28,9 +28,7 @@ #include <net/ethernet.h> #include <nm-access-point.h> -char * utils_bin2hexstr (const char *bytes, int len, int final_len); - -const char * utils_get_device_description (NMDevice *device); +const char *utils_get_device_description (NMDevice *device); void utils_fill_connection_certs (NMConnection *connection); diff --git a/network-manager-applet-0.7.0/src/wireless-dialog.c b/network-manager-applet-0.7.0/src/wireless-dialog.c index 8c6a7fb..9099ca4 100644 --- a/network-manager-applet-0.7.0/src/wireless-dialog.c +++ b/network-manager-applet-0.7.0/src/wireless-dialog.c @@ -716,6 +716,7 @@ guint32 dev_caps; NMSettingWirelessSecurity *wsec = NULL; NMUtilsSecurityType default_type = NMU_SEC_NONE; + NMWepKeyType wep_type = NM_WEP_KEY_TYPE_KEY; int active = -1; int item = 0; NMSettingWireless *s_wireless = NULL; @@ -757,8 +758,13 @@ security = nm_setting_wireless_get_security (s_wireless); if (!security || strcmp (security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)) wsec = NULL; - if (wsec) + if (wsec) { default_type = get_default_type_for_security (wsec, !!priv->ap, ap_flags, dev_caps); + if (default_type == NMU_SEC_STATIC_WEP) + wep_type = nm_setting_wireless_security_get_wep_key_type (wsec); + if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN) + wep_type = NM_WEP_KEY_TYPE_KEY; + } } sec_model = gtk_list_store_new (2, G_TYPE_STRING, wireless_security_get_g_type ()); @@ -779,25 +785,21 @@ if ( nm_utils_security_valid (NMU_SEC_STATIC_WEP, dev_caps, !!priv->ap, is_adhoc, ap_flags, ap_wpa, ap_rsn) && ((!ap_wpa && !ap_rsn) || !(dev_caps & (NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN)))) { WirelessSecurityWEPKey *ws_wep; - WEPKeyType default_wep_type = WEP_KEY_TYPE_KEY; - - if (default_type == NMU_SEC_STATIC_WEP) - default_wep_type = ws_wep_guess_key_type (priv->connection); - ws_wep = ws_wep_key_new (priv->glade_file, priv->connection, WEP_KEY_TYPE_KEY, priv->adhoc_create); + ws_wep = ws_wep_key_new (priv->glade_file, priv->connection, NM_WEP_KEY_TYPE_KEY, priv->adhoc_create); if (ws_wep) { add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model, &iter, _("WEP 40/128-bit Key")); - if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_KEY)) + if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_KEY)) active = item; item++; } - ws_wep = ws_wep_key_new (priv->glade_file, priv->connection, WEP_KEY_TYPE_PASSPHRASE, priv->adhoc_create); + ws_wep = ws_wep_key_new (priv->glade_file, priv->connection, NM_WEP_KEY_TYPE_PASSPHRASE, priv->adhoc_create); if (ws_wep) { add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model, &iter, _("WEP 128-bit Passphrase")); - if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_PASSPHRASE)) + if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_PASSPHRASE)) active = item; item++; } diff --git a/network-manager-applet-0.7.0/src/wireless-security/Makefile.am b/network-manager-applet-0.7.0/src/wireless-security/Makefile.am index 7e0c562..0562262 100644 --- a/network-manager-applet-0.7.0/src/wireless-security/Makefile.am +++ b/network-manager-applet-0.7.0/src/wireless-security/Makefile.am @@ -7,8 +7,6 @@ libwireless_security_la_SOURCES = \ ws-wep-key.c \ ws-wpa-psk.h \ ws-wpa-psk.c \ - sha1.c \ - sha1.h \ ws-leap.h \ ws-leap.c \ ws-wpa-eap.h \ diff --git a/network-manager-applet-0.7.0/src/wireless-security/sha1.c b/network-manager-applet-0.7.0/src/wireless-security/sha1.c deleted file mode 100644 index f7ceaa6..0000000 --- a/network-manager-applet-0.7.0/src/wireless-security/sha1.c +++ /dev/null @@ -1,692 +0,0 @@ -/* - * SHA1 hash implementation and interface functions - * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - * - * See README and COPYING for more details. - */ - -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "sha1.h" - - -/* Define types for stupid code. Userspace should - * be using u_*_t rather than kernel-space u* types. - */ -typedef u_int8_t u8; -typedef u_int16_t u16; -typedef u_int32_t u32; -typedef u_int64_t u64; - -void sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac); -void sha1_transform(u8 *state, const u8 data[64]); - -void sha1_mac(const u8 *key, size_t key_len, const u8 *data, size_t data_len, - u8 *mac) -{ - const u8 *addr[3]; - size_t len[3]; - addr[0] = key; - len[0] = key_len; - addr[1] = data; - len[1] = data_len; - addr[2] = key; - len[2] = key_len; - sha1_vector(3, addr, len, mac); -} - - -/* HMAC code is based on RFC 2104 */ -void hmac_sha1_vector(const u8 *key, size_t key_len, size_t num_elem, - const u8 *addr[], const size_t *len, u8 *mac) -{ - unsigned char k_pad[64]; /* padding - key XORd with ipad/opad */ - unsigned char tk[20]; - const u8 *_addr[6]; - size_t _len[6], i; - - if (num_elem > 5) { - /* - * Fixed limit on the number of fragments to avoid having to - * allocate memory (which could fail). - */ - return; - } - - /* if key is longer than 64 bytes reset it to key = SHA1(key) */ - if (key_len > 64) { - sha1_vector(1, &key, &key_len, tk); - key = tk; - key_len = 20; - } - - /* the HMAC_SHA1 transform looks like: - * - * SHA1(K XOR opad, SHA1(K XOR ipad, text)) - * - * where K is an n byte key - * ipad is the byte 0x36 repeated 64 times - * opad is the byte 0x5c repeated 64 times - * and text is the data being protected */ - - /* start out by storing key in ipad */ - memset(k_pad, 0, sizeof(k_pad)); - memcpy(k_pad, key, key_len); - /* XOR key with ipad values */ - for (i = 0; i < 64; i++) - k_pad[i] ^= 0x36; - - /* perform inner SHA1 */ - _addr[0] = k_pad; - _len[0] = 64; - for (i = 0; i < num_elem; i++) { - _addr[i + 1] = addr[i]; - _len[i + 1] = len[i]; - } - sha1_vector(1 + num_elem, _addr, _len, mac); - - memset(k_pad, 0, sizeof(k_pad)); - memcpy(k_pad, key, key_len); - /* XOR key with opad values */ - for (i = 0; i < 64; i++) - k_pad[i] ^= 0x5c; - - /* perform outer SHA1 */ - _addr[0] = k_pad; - _len[0] = 64; - _addr[1] = mac; - _len[1] = SHA1_MAC_LEN; - sha1_vector(2, _addr, _len, mac); -} - - -void hmac_sha1(const u8 *key, size_t key_len, const u8 *data, size_t data_len, - u8 *mac) -{ - hmac_sha1_vector(key, key_len, 1, &data, &data_len, mac); -} - - -void sha1_prf(const u8 *key, size_t key_len, const char *label, - const u8 *data, size_t data_len, u8 *buf, size_t buf_len) -{ - u8 zero = 0, counter = 0; - size_t pos, plen; - u8 hash[SHA1_MAC_LEN]; - size_t label_len = strlen(label); - const unsigned char *addr[4]; - size_t len[4]; - - addr[0] = (u8 *) label; - len[0] = label_len; - addr[1] = &zero; - len[1] = 1; - addr[2] = data; - len[2] = data_len; - addr[3] = &counter; - len[3] = 1; - - pos = 0; - while (pos < buf_len) { - plen = buf_len - pos; - if (plen >= SHA1_MAC_LEN) { - hmac_sha1_vector(key, key_len, 4, addr, len, - &buf[pos]); - pos += SHA1_MAC_LEN; - } else { - hmac_sha1_vector(key, key_len, 4, addr, len, - hash); - memcpy(&buf[pos], hash, plen); - break; - } - counter++; - } -} - - -static void pbkdf2_sha1_f(const char *passphrase, const char *ssid, - size_t ssid_len, int iterations, int count, - u8 *digest) -{ - unsigned char tmp[SHA1_MAC_LEN], tmp2[SHA1_MAC_LEN]; - int i, j; - unsigned char count_buf[4]; - const u8 *addr[2]; - size_t len[2]; - size_t passphrase_len = strlen(passphrase); - - addr[0] = (u8 *) ssid; - len[0] = ssid_len; - addr[1] = count_buf; - len[1] = 4; - - /* F(P, S, c, i) = U1 xor U2 xor ... Uc - * U1 = PRF(P, S || i) - * U2 = PRF(P, U1) - * Uc = PRF(P, Uc-1) - */ - - count_buf[0] = (count >> 24) & 0xff; - count_buf[1] = (count >> 16) & 0xff; - count_buf[2] = (count >> 8) & 0xff; - count_buf[3] = count & 0xff; - hmac_sha1_vector((u8 *) passphrase, passphrase_len, 2, addr, len, tmp); - memcpy(digest, tmp, SHA1_MAC_LEN); - - for (i = 1; i < iterations; i++) { - hmac_sha1((u8 *) passphrase, passphrase_len, tmp, SHA1_MAC_LEN, - tmp2); - memcpy(tmp, tmp2, SHA1_MAC_LEN); - for (j = 0; j < SHA1_MAC_LEN; j++) - digest[j] ^= tmp2[j]; - } -} - - -void pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, - int iterations, u8 *buf, size_t buflen) -{ - int count = 0; - unsigned char *pos = buf; - size_t left = buflen; - size_t plen; - unsigned char digest[SHA1_MAC_LEN]; - - while (left > 0) { - count++; - pbkdf2_sha1_f(passphrase, ssid, ssid_len, iterations, count, - digest); - plen = left > SHA1_MAC_LEN ? SHA1_MAC_LEN : left; - memcpy(pos, digest, plen); - pos += plen; - left -= plen; - } -} - - -#ifndef EAP_TLS_FUNCS - -typedef struct { - u32 state[5]; - u32 count[2]; - unsigned char buffer[64]; -} SHA1_CTX; - -static void SHA1Init(SHA1_CTX *context); -static void SHA1Update(SHA1_CTX *context, const void *data, u32 len); -static void SHA1Final(unsigned char digest[20], SHA1_CTX* context); -static void SHA1Transform(u32 state[5], const unsigned char buffer[64]); - - -/** - * sha1_vector - SHA-1 hash for data vector - * @num_elem: Number of elements in the data vector - * @addr: Pointers to the data areas - * @len: Lengths of the data blocks - * @mac: Buffer for the hash - */ -void sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, - u8 *mac) -{ - SHA1_CTX ctx; - size_t i; - - SHA1Init(&ctx); - for (i = 0; i < num_elem; i++) - SHA1Update(&ctx, addr[i], len[i]); - SHA1Final(mac, &ctx); -} - - -/** - * sha1_transform - Perform one SHA-1 transform step - * @state: SHA-1 state - * @data: Input data for the SHA-1 transform - * - * This function is used to implement random number generation specified in - * NIST FIPS Publication 186-2 for EAP-SIM. This PRF uses a function that is - * similar to SHA-1, but has different message padding and as such, access to - * just part of the SHA-1 is needed. - */ -void sha1_transform(u8 *state, const u8 data[64]) -{ - SHA1Transform((u32 *) state, data); -} - - -/* ===== start - public domain SHA1 implementation ===== */ - -/* -SHA-1 in C -By Steve Reid <sreid@sea-to-sky.net> -100% Public Domain - ------------------ -Modified 7/98 -By James H. Brown <jbrown@burgoyne.com> -Still 100% Public Domain - -Corrected a problem which generated improper hash values on 16 bit machines -Routine SHA1Update changed from - void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int -len) -to - void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned -long len) - -The 'len' parameter was declared an int which works fine on 32 bit machines. -However, on 16 bit machines an int is too small for the shifts being done -against -it. This caused the hash function to generate incorrect values if len was -greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update(). - -Since the file IO in main() reads 16K at a time, any file 8K or larger would -be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million -"a"s). - -I also changed the declaration of variables i & j in SHA1Update to -unsigned long from unsigned int for the same reason. - -These changes should make no difference to any 32 bit implementations since -an -int and a long are the same size in those environments. - --- -I also corrected a few compiler warnings generated by Borland C. -1. Added #include <process.h> for exit() prototype -2. Removed unused variable 'j' in SHA1Final -3. Changed exit(0) to return(0) at end of main. - -ALL changes I made can be located by searching for comments containing 'JHB' ------------------ -Modified 8/98 -By Steve Reid <sreid@sea-to-sky.net> -Still 100% public domain - -1- Removed #include <process.h> and used return() instead of exit() -2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall) -3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net - ------------------ -Modified 4/01 -By Saul Kravitz <Saul.Kravitz@celera.com> -Still 100% PD -Modified to run on Compaq Alpha hardware. - ------------------ -Modified 4/01 -By Jouni Malinen <jkmaline@cc.hut.fi> -Minor changes to match the coding style used in Dynamics. - -Modified September 24, 2004 -By Jouni Malinen <jkmaline@cc.hut.fi> -Fixed alignment issue in SHA1Transform when SHA1HANDSOFF is defined. - -*/ - -/* -Test Vectors (from FIPS PUB 180-1) -"abc" - A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D -"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" - 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 -A million repetitions of "a" - 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F -*/ - -#define SHA1HANDSOFF - -#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -/* blk0() and blk() perform the initial expand. */ -/* I got the idea of expanding during the round function from SSLeay */ -#ifndef WORDS_BIGENDIAN -#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | \ - (rol(block->l[i], 8) & 0x00FF00FF)) -#else -#define blk0(i) block->l[i] -#endif -#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ \ - block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1)) - -/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v,w,x,y,z,i) \ - z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \ - w = rol(w, 30); -#define R1(v,w,x,y,z,i) \ - z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \ - w = rol(w, 30); -#define R2(v,w,x,y,z,i) \ - z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); -#define R3(v,w,x,y,z,i) \ - z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \ - w = rol(w, 30); -#define R4(v,w,x,y,z,i) \ - z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \ - w=rol(w, 30); - - -#ifdef VERBOSE /* SAK */ -void SHAPrintContext(SHA1_CTX *context, char *msg) -{ - printf("%s (%d,%d) %x %x %x %x %x\n", - msg, - context->count[0], context->count[1], - context->state[0], - context->state[1], - context->state[2], - context->state[3], - context->state[4]); -} -#endif - -/* Hash a single 512-bit block. This is the core of the algorithm. */ - -void SHA1Transform(u32 state[5], const unsigned char buffer[64]) -{ - u32 a, b, c, d, e; - typedef union { - unsigned char c[64]; - u32 l[16]; - } CHAR64LONG16; - CHAR64LONG16* block; -#ifdef SHA1HANDSOFF - u32 workspace[16]; - block = (CHAR64LONG16 *) workspace; - memcpy(block, buffer, 64); -#else - block = (CHAR64LONG16 *) buffer; -#endif - /* Copy context->state[] to working vars */ - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; - /* Wipe variables */ - a = b = c = d = e = 0; -#ifdef SHA1HANDSOFF - memset(block, 0, 64); -#endif -} - - -/* SHA1Init - Initialize new context */ - -static void SHA1Init(SHA1_CTX* context) -{ - /* SHA1 initialization constants */ - context->state[0] = 0x67452301; - context->state[1] = 0xEFCDAB89; - context->state[2] = 0x98BADCFE; - context->state[3] = 0x10325476; - context->state[4] = 0xC3D2E1F0; - context->count[0] = context->count[1] = 0; -} - - -/* Run your data through this. */ - -static void SHA1Update(SHA1_CTX* context, const void *_data, u32 len) -{ - u32 i, j; - const unsigned char *data = _data; - -#ifdef VERBOSE - SHAPrintContext(context, "before"); -#endif - j = (context->count[0] >> 3) & 63; - if ((context->count[0] += len << 3) < (len << 3)) - context->count[1]++; - context->count[1] += (len >> 29); - if ((j + len) > 63) { - memcpy(&context->buffer[j], data, (i = 64-j)); - SHA1Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) { - SHA1Transform(context->state, &data[i]); - } - j = 0; - } - else i = 0; - memcpy(&context->buffer[j], &data[i], len - i); -#ifdef VERBOSE - SHAPrintContext(context, "after "); -#endif -} - - -/* Add padding and return the message digest. */ - -static void SHA1Final(unsigned char digest[20], SHA1_CTX* context) -{ - u32 i; - unsigned char finalcount[8]; - - for (i = 0; i < 8; i++) { - finalcount[i] = (unsigned char) - ((context->count[(i >= 4 ? 0 : 1)] >> - ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ - } - SHA1Update(context, (unsigned char *) "\200", 1); - while ((context->count[0] & 504) != 448) { - SHA1Update(context, (unsigned char *) "\0", 1); - } - SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() - */ - for (i = 0; i < 20; i++) { - digest[i] = (unsigned char) - ((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & - 255); - } - /* Wipe variables */ - i = 0; - memset(context->buffer, 0, 64); - memset(context->state, 0, 20); - memset(context->count, 0, 8); - memset(finalcount, 0, 8); -} - -/* ===== end - public domain SHA1 implementation ===== */ - -#endif /* EAP_TLS_FUNCS */ - - -#ifdef TEST_MAIN - -static u8 key0[] = -{ - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b -}; -static u8 data0[] = "Hi There"; -static u8 prf0[] = -{ - 0xbc, 0xd4, 0xc6, 0x50, 0xb3, 0x0b, 0x96, 0x84, - 0x95, 0x18, 0x29, 0xe0, 0xd7, 0x5f, 0x9d, 0x54, - 0xb8, 0x62, 0x17, 0x5e, 0xd9, 0xf0, 0x06, 0x06, - 0xe1, 0x7d, 0x8d, 0xa3, 0x54, 0x02, 0xff, 0xee, - 0x75, 0xdf, 0x78, 0xc3, 0xd3, 0x1e, 0x0f, 0x88, - 0x9f, 0x01, 0x21, 0x20, 0xc0, 0x86, 0x2b, 0xeb, - 0x67, 0x75, 0x3e, 0x74, 0x39, 0xae, 0x24, 0x2e, - 0xdb, 0x83, 0x73, 0x69, 0x83, 0x56, 0xcf, 0x5a -}; - -static u8 key1[] = "Jefe"; -static u8 data1[] = "what do ya want for nothing?"; -static u8 prf1[] = -{ - 0x51, 0xf4, 0xde, 0x5b, 0x33, 0xf2, 0x49, 0xad, - 0xf8, 0x1a, 0xeb, 0x71, 0x3a, 0x3c, 0x20, 0xf4, - 0xfe, 0x63, 0x14, 0x46, 0xfa, 0xbd, 0xfa, 0x58, - 0x24, 0x47, 0x59, 0xae, 0x58, 0xef, 0x90, 0x09, - 0xa9, 0x9a, 0xbf, 0x4e, 0xac, 0x2c, 0xa5, 0xfa, - 0x87, 0xe6, 0x92, 0xc4, 0x40, 0xeb, 0x40, 0x02, - 0x3e, 0x7b, 0xab, 0xb2, 0x06, 0xd6, 0x1d, 0xe7, - 0xb9, 0x2f, 0x41, 0x52, 0x90, 0x92, 0xb8, 0xfc -}; - - -static u8 key2[] = -{ - 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, - 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, - 0xaa, 0xaa, 0xaa, 0xaa -}; -static u8 data2[] = -{ - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, - 0xdd, 0xdd -}; -static u8 prf2[] = -{ - 0xe1, 0xac, 0x54, 0x6e, 0xc4, 0xcb, 0x63, 0x6f, - 0x99, 0x76, 0x48, 0x7b, 0xe5, 0xc8, 0x6b, 0xe1, - 0x7a, 0x02, 0x52, 0xca, 0x5d, 0x8d, 0x8d, 0xf1, - 0x2c, 0xfb, 0x04, 0x73, 0x52, 0x52, 0x49, 0xce, - 0x9d, 0xd8, 0xd1, 0x77, 0xea, 0xd7, 0x10, 0xbc, - 0x9b, 0x59, 0x05, 0x47, 0x23, 0x91, 0x07, 0xae, - 0xf7, 0xb4, 0xab, 0xd4, 0x3d, 0x87, 0xf0, 0xa6, - 0x8f, 0x1c, 0xbd, 0x9e, 0x2b, 0x6f, 0x76, 0x07 -}; - - -struct passphrase_test { - char *passphrase; - char *ssid; - char psk[32]; -}; - -static struct passphrase_test passphrase_tests[] = -{ - { - "password", - "IEEE", - { - 0xf4, 0x2c, 0x6f, 0xc5, 0x2d, 0xf0, 0xeb, 0xef, - 0x9e, 0xbb, 0x4b, 0x90, 0xb3, 0x8a, 0x5f, 0x90, - 0x2e, 0x83, 0xfe, 0x1b, 0x13, 0x5a, 0x70, 0xe2, - 0x3a, 0xed, 0x76, 0x2e, 0x97, 0x10, 0xa1, 0x2e - } - }, - { - "ThisIsAPassword", - "ThisIsASSID", - { - 0x0d, 0xc0, 0xd6, 0xeb, 0x90, 0x55, 0x5e, 0xd6, - 0x41, 0x97, 0x56, 0xb9, 0xa1, 0x5e, 0xc3, 0xe3, - 0x20, 0x9b, 0x63, 0xdf, 0x70, 0x7d, 0xd5, 0x08, - 0xd1, 0x45, 0x81, 0xf8, 0x98, 0x27, 0x21, 0xaf - } - }, - { - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", - { - 0xbe, 0xcb, 0x93, 0x86, 0x6b, 0xb8, 0xc3, 0x83, - 0x2c, 0xb7, 0x77, 0xc2, 0xf5, 0x59, 0x80, 0x7c, - 0x8c, 0x59, 0xaf, 0xcb, 0x6e, 0xae, 0x73, 0x48, - 0x85, 0x00, 0x13, 0x00, 0xa9, 0x81, 0xcc, 0x62 - } - }, -}; - -#define NUM_PASSPHRASE_TESTS \ -(sizeof(passphrase_tests) / sizeof(passphrase_tests[0])) - - -int main(int argc, char *argv[]) -{ - u8 res[512]; - int ret = 0, i; - - printf("PRF-SHA1 test cases:\n"); - - sha1_prf(key0, sizeof(key0), "prefix", data0, sizeof(data0) - 1, - res, sizeof(prf0)); - if (memcmp(res, prf0, sizeof(prf0)) == 0) - printf("Test case 0 - OK\n"); - else { - printf("Test case 0 - FAILED!\n"); - ret++; - } - - sha1_prf(key1, sizeof(key1) - 1, "prefix", data1, sizeof(data1) - 1, - res, sizeof(prf1)); - if (memcmp(res, prf1, sizeof(prf1)) == 0) - printf("Test case 1 - OK\n"); - else { - printf("Test case 1 - FAILED!\n"); - ret++; - } - - sha1_prf(key2, sizeof(key2), "prefix", data2, sizeof(data2), - res, sizeof(prf2)); - if (memcmp(res, prf2, sizeof(prf2)) == 0) - printf("Test case 2 - OK\n"); - else { - printf("Test case 2 - FAILED!\n"); - ret++; - } - - ret += test_eap_fast(); - - printf("PBKDF2-SHA1 Passphrase test cases:\n"); - for (i = 0; i < NUM_PASSPHRASE_TESTS; i++) { - u8 psk[32]; - struct passphrase_test *test = &passphrase_tests[i]; - pbkdf2_sha1(test->passphrase, - test->ssid, strlen(test->ssid), - 4096, psk, 32); - if (memcmp(psk, test->psk, 32) == 0) - printf("Test case %d - OK\n", i); - else { - printf("Test case %d - FAILED!\n", i); - ret++; - } - } - - return ret; -} -#endif /* TEST_MAIN */ diff --git a/network-manager-applet-0.7.0/src/wireless-security/sha1.h b/network-manager-applet-0.7.0/src/wireless-security/sha1.h deleted file mode 100644 index 40863c8..0000000 --- a/network-manager-applet-0.7.0/src/wireless-security/sha1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * SHA1 hash implementation and interface functions - * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - * - * See README and COPYING for more details. - */ - -#ifndef SHA1_H -#define SHA1_H - -#include <sys/types.h> - - -#define SHA1_MAC_LEN 20 - -void sha1_mac(const u_int8_t *key, size_t key_len, const u_int8_t *data, size_t data_len, - u_int8_t *mac); -void hmac_sha1_vector(const u_int8_t *key, size_t key_len, size_t num_elem, - const u_int8_t *addr[], const size_t *len, u_int8_t *mac); -void hmac_sha1(const u_int8_t *key, size_t key_len, const u_int8_t *data, size_t data_len, - u_int8_t *mac); -void sha1_prf(const u_int8_t *key, size_t key_len, const char *label, - const u_int8_t *data, size_t data_len, u_int8_t *buf, size_t buf_len); -void pbkdf2_sha1(const char *passphrase, const char *ssid, size_t ssid_len, - int iterations, u_int8_t *buf, size_t buflen); - -#endif /* SHA1_H */ diff --git a/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.c b/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.c index 1de6bb5..8c728f8 100644 --- a/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.c +++ b/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.c @@ -99,7 +99,7 @@ validate (WirelessSecurity *parent, const GByteArray *ssid) if (!key) return FALSE; - if (sec->type == WEP_KEY_TYPE_KEY) { + if (sec->type == NM_WEP_KEY_TYPE_KEY) { if ((strlen (key) == 10) || (strlen (key) == 26)) { for (i = 0; i < strlen (key); i++) { if (!isxdigit (key[i])) @@ -113,7 +113,7 @@ validate (WirelessSecurity *parent, const GByteArray *ssid) } else { return FALSE; } - } else if (sec->type == WEP_KEY_TYPE_PASSPHRASE) { + } else if (sec->type == NM_WEP_KEY_TYPE_PASSPHRASE) { if (!strlen (key) || (strlen (key) > 64)) return FALSE; } @@ -136,40 +136,15 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group) gtk_size_group_add_widget (group, widget); } -static char * -wep128_passphrase_hash (const char *input) -{ - char md5_data[65]; - unsigned char digest[16]; - int input_len; - int i; - - g_return_val_if_fail (input != NULL, NULL); - - input_len = strlen (input); - if (input_len < 1) - return NULL; - - /* Get at least 64 bytes */ - for (i = 0; i < 64; i++) - md5_data [i] = input [i % input_len]; - - /* Null terminate md5 seed data and hash it */ - md5_data[64] = 0; - gnome_keyring_md5_string (md5_data, digest); - return (utils_bin2hexstr ((const char *) &digest, 16, 26)); -} - static void fill_connection (WirelessSecurity *parent, NMConnection *connection) { WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent; NMSettingWireless *s_wireless; - NMSettingWirelessSecurity *s_wireless_sec; + NMSettingWirelessSecurity *s_wsec; GtkWidget *widget; gint auth_alg; const char *key; - char *hashed = NULL; int i; widget = glade_xml_get_widget (parent->xml, "auth_method_combo"); @@ -185,31 +161,19 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); /* Blow away the old security setting by adding a clear one */ - s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); - nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec); + s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); + nm_connection_add_setting (connection, (NMSetting *) s_wsec); - g_object_set (s_wireless_sec, + g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none", NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, sec->cur_index, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, (auth_alg == 1) ? "shared" : "open", + NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, sec->type, NULL); for (i = 0; i < 4; i++) { - int key_len = strlen (sec->keys[i]); - - if (!key_len) - continue; - - if (sec->type == WEP_KEY_TYPE_KEY) { - if ((key_len == 10) || (key_len == 26)) - hashed = g_strdup (sec->keys[i]); - else if ((key_len == 5) || (key_len == 13)) - hashed = utils_bin2hexstr (sec->keys[i], key_len, key_len * 2); - } else if (sec->type == WEP_KEY_TYPE_PASSPHRASE) - hashed = wep128_passphrase_hash (sec->keys[i]); - - nm_setting_wireless_security_set_wep_key (s_wireless_sec, i, hashed); - g_free (hashed); + if (strlen (sec->keys[i])) + nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]); } } @@ -225,12 +189,12 @@ wep_entry_filter_cb (GtkEntry * entry, int i, count = 0; gchar *result = g_new (gchar, length); - if (sec->type == WEP_KEY_TYPE_KEY) { + if (sec->type == NM_WEP_KEY_TYPE_KEY) { for (i = 0; i < length; i++) { if (isxdigit(text[i]) || isascii(text[i])) result[count++] = text[i]; } - } else if (sec->type == WEP_KEY_TYPE_PASSPHRASE) { + } else if (sec->type == NM_WEP_KEY_TYPE_PASSPHRASE) { for (i = 0; i < length; i++) result[count++] = text[i]; } @@ -305,7 +269,7 @@ fill_secrets (WirelessSecurityWEPKey *sec, NMConnection *connection) WirelessSecurityWEPKey * ws_wep_key_new (const char *glade_file, NMConnection *connection, - WEPKeyType type, + NMWepKeyType type, gboolean adhoc_create) { WirelessSecurityWEPKey *sec; @@ -373,9 +337,9 @@ ws_wep_key_new (const char *glade_file, g_signal_connect (G_OBJECT (widget), "insert-text", (GCallback) wep_entry_filter_cb, sec); - if (sec->type == WEP_KEY_TYPE_KEY) + if (sec->type == NM_WEP_KEY_TYPE_KEY) gtk_entry_set_max_length (GTK_ENTRY (widget), 26); - else if (sec->type == WEP_KEY_TYPE_PASSPHRASE) + else if (sec->type == NM_WEP_KEY_TYPE_PASSPHRASE) gtk_entry_set_max_length (GTK_ENTRY (widget), 64); widget = glade_xml_get_widget (xml, "key_index_combo"); @@ -424,93 +388,3 @@ ws_wep_key_new (const char *glade_file, return sec; } -static WEPKeyType -guess_type_for_key (const char *key) -{ - size_t len = key ? strlen (key) : 0; - int i; - - if (!key || !len) - return WEP_KEY_TYPE_KEY; - - /* Hex key */ - if ((len == 10) || (len == 26)) { - gboolean hex = TRUE; - - for (i = 0; i < len; i++) { - if (!isxdigit(key[i])) { - hex = FALSE; - break; - } - } - if (hex) - return WEP_KEY_TYPE_KEY; - } - - /* ASCII key */ - if ((len == 5) || (len == 13)) { - gboolean ascii = TRUE; - - for (i = 0; i < len; i++) { - if (!isascii (key[i])) { - ascii = FALSE; - break; - } - } - if (ascii) - return WEP_KEY_TYPE_KEY; - } - - return WEP_KEY_TYPE_PASSPHRASE; -} - -WEPKeyType -ws_wep_guess_key_type (NMConnection *connection) -{ - GHashTable *secrets; - GError *error = NULL; - GValue *value; - WEPKeyType key_type = WEP_KEY_TYPE_KEY; - - if (!connection) - return WEP_KEY_TYPE_KEY; - - secrets = nm_gconf_get_keyring_items (connection, - NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, - FALSE, - &error); - if (!secrets || (g_hash_table_size (secrets) == 0)) { - if (error) - g_error_free (error); - return WEP_KEY_TYPE_KEY; - } - - value = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); - if (value) { - key_type = guess_type_for_key (g_value_get_string (value)); - goto out; - } - - value = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY1); - if (value) { - key_type = guess_type_for_key (g_value_get_string (value)); - goto out; - } - - value = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2); - if (value) { - key_type = guess_type_for_key (g_value_get_string (value)); - goto out; - } - - value = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3); - if (value) { - key_type = guess_type_for_key (g_value_get_string (value)); - goto out; - } - -out: - g_hash_table_destroy (secrets); - return key_type; -} - diff --git a/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.h b/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.h index f67f452..07cb472 100644 --- a/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.h +++ b/network-manager-applet-0.7.0/src/wireless-security/ws-wep-key.h @@ -22,25 +22,20 @@ #ifndef WS_WEP_KEY_H #define WS_WEP_KEY_H -typedef enum { - WEP_KEY_TYPE_KEY = 0, - WEP_KEY_TYPE_PASSPHRASE = 1, -} WEPKeyType; +#include <nm-setting-wireless-security.h> typedef struct { struct _WirelessSecurity parent; - WEPKeyType type; + NMWepKeyType type; char keys[4][65]; guint8 cur_index; } WirelessSecurityWEPKey; WirelessSecurityWEPKey * ws_wep_key_new (const char *glade_file, NMConnection *connection, - WEPKeyType type, + NMWepKeyType type, gboolean adhoc_create); -WEPKeyType ws_wep_guess_key_type (NMConnection *connection); - #endif /* WS_WEP_KEY_H */ diff --git a/network-manager-applet-0.7.0/src/wireless-security/ws-wpa-psk.c b/network-manager-applet-0.7.0/src/wireless-security/ws-wpa-psk.c index 2f2909c..a539165 100644 --- a/network-manager-applet-0.7.0/src/wireless-security/ws-wpa-psk.c +++ b/network-manager-applet-0.7.0/src/wireless-security/ws-wpa-psk.c @@ -26,7 +26,6 @@ #include "wireless-security.h" #include "utils.h" -#include "sha1.h" #include "gconf-helpers.h" #define WPA_PMK_LEN 32 @@ -99,8 +98,6 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) { GtkWidget *widget; const char *key; - char *hashed = NULL; - guint32 len; NMSettingWireless *s_wireless; NMSettingWirelessSecurity *s_wireless_sec; const char *mode; @@ -121,23 +118,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) widget = glade_xml_get_widget (parent->xml, "wpa_psk_entry"); key = gtk_entry_get_text (GTK_ENTRY (widget)); - - len = strlen (key); - if (len == 64) { - /* Hex key */ - hashed = g_strdup (key); - } else { - /* passphrase */ - const GByteArray *ssid = nm_setting_wireless_get_ssid (s_wireless); - unsigned char *buf = g_malloc0 (WPA_PMK_LEN * 2); - - pbkdf2_sha1 (key, (char *) ssid->data, ssid->len, 4096, buf, WPA_PMK_LEN); - hashed = utils_bin2hexstr ((const char *) buf, WPA_PMK_LEN, WPA_PMK_LEN * 2); - g_free (buf); - } - - g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, hashed, NULL); - g_free (hashed); + g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL); wireless_security_clear_ciphers (connection); if (is_adhoc) { commit 0e3cdd615a1cd2b86ee004d921451bdfe0bca67a Author: Dan Williams <dcbw@redhat.com> Date: Wed May 13 12:02:27 2009 -0400 wifi: 64-bit compile warning fix diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 4fb6a1e..6df7168 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -621,7 +621,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self, } } else { /* Invalid PSK */ - nm_warning ("Invalid PSK length %d: not between 8 and 63 characters inclusive.", psk_len); + nm_warning ("Invalid PSK length %u: not between 8 and 63 characters inclusive.", (guint32) psk_len); return FALSE; } }