colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-12-09 Dan Williams <dcbw@redhat.com>

Browse Source 
* libnm-util/*
		- More fixups
		- Remove cipher-manager.* because we don't need it
		- Forgot to add gnome-keyring-md5 files to compile list


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1154 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-10 19:33:26 +00:00
parent fdbaa9662e
commit d9ac9fbdf3
14 changed files with 56 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libnm-util/cipher-wep-ascii.c
View File

@@ -22,15 +22,9 @@
#include <glib.h>
#include <iwlib.h>
#include "cipher-wep-ascii.h"
#include "cipher.h"
#include "cipher-private.h"
#include "cipher-manager.h"
#ifdef HAVE_GCRYPT
#include <gcrypt.h>
#else
#include "gnome-keyring-md5.h"
#endif
#include "cipher-wep-ascii.h"
static char * cipher_wep128_ascii_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input);
@@ -60,9 +54,8 @@ static char * cipher_wep_ascii_hash_func (IEEE_802_11_Cipher *cipher, const char
#define WEP128_ASCII_INPUT_SIZE 13
int cipher_wep128_ascii_register (void)
IEEE_802_11_Cipher * cipher_wep128_ascii_new (void)
{
CipherManager * cm = cipher_manager_get_instance ();
IEEE_802_11_Cipher * cipher = g_malloc0 (sizeof (IEEE_802_11_Cipher));
cipher->we_cipher = IW_AUTH_CIPHER_WEP104;
@@ -70,8 +63,9 @@ int cipher_wep128_ascii_register (void)
cipher->input_max = WEP128_ASCII_INPUT_SIZE;
cipher->cipher_hash_func = cipher_wep128_ascii_hash_func;
cipher->cipher_input_validate_func = cipher_default_validate_func;
ieee_802_11_cipher_ref (cipher);
return cipher_manager_register_cipher (cm, cipher);
return cipher;
}
static char * cipher_wep128_ascii_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input)
@@ -84,9 +78,8 @@ static char * cipher_wep128_ascii_hash_func (IEEE_802_11_Cipher *cipher, const c
#define WEP64_ASCII_INPUT_SIZE 5
int cipher_wep64_ascii_register (void)
IEEE_802_11_Cipher * cipher_wep64_ascii_new (void)
{
CipherManager * cm = cipher_manager_get_instance ();
IEEE_802_11_Cipher * cipher = g_malloc0 (sizeof (IEEE_802_11_Cipher));
cipher->we_cipher = IW_AUTH_CIPHER_WEP40;
@@ -94,8 +87,9 @@ int cipher_wep64_ascii_register (void)
cipher->input_max = WEP64_ASCII_INPUT_SIZE;
cipher->cipher_hash_func = cipher_wep64_ascii_hash_func;
cipher->cipher_input_validate_func = cipher_default_validate_func;
ieee_802_11_cipher_ref (cipher);
return cipher_manager_register_cipher (cm, cipher);
return cipher;
}
static char * cipher_wep64_ascii_hash_func (IEEE_802_11_Cipher *cipher, const char *ssid, const char *input)