system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 19:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-03-29 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/plugins/ifcfg-fedora/parser.c
		- Fix parsing of WEP keys; ifcfg files use indexes [1...4] rather than
			[0...3]; also handle KEY correctly in combination with DEFAULTKEY



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3509 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-29 12:57:44 +00:00
parent c1aaea48ff
commit d98c159e6b
2 changed files with 73 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-03-29 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/parser.c
- Fix parsing of WEP keys; ifcfg files use indexes [1...4] rather than
[0...3]; also handle KEY correctly in combination with DEFAULTKEY
2008-03-29 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/parser.c

106
system-settings/plugins/ifcfg-fedora/parser.c
View file

@ -382,15 +382,27 @@ utils_bin2hexstr (const char *bytes, int len, int final_len)
}
static char *
get_one_wep_key (shvarFile *ifcfg, const char *shvar_key, GError **error)
static gboolean
add_one_wep_key (shvarFile *ifcfg,
const char *shvar_key,
guint8 key_idx,
GHashTable *secrets,
GError **error)
{
char *key = NULL;
char *value = NULL;
gboolean success = FALSE;
g_return_val_if_fail (ifcfg != NULL, FALSE);
g_return_val_if_fail (shvar_key != NULL, FALSE);
g_return_val_if_fail (key_idx <= 3, FALSE);
g_return_val_if_fail (secrets != NULL, FALSE);
value = svGetValue (ifcfg, shvar_key);
if (!value || !strlen (value))
goto out;
if (!value || !strlen (value)) {
g_free (value);
return TRUE;
}
/* Validate keys */
if (strlen (value) == 10 || strlen (value) == 26) {
@ -419,28 +431,31 @@ get_one_wep_key (shvarFile *ifcfg, const char *shvar_key, GError **error)
p++;
}
value = utils_bin2hexstr (value, strlen (value), strlen (value) * 2);
key = utils_bin2hexstr (value, strlen (value), strlen (value) * 2);
} else {
g_set_error (error, ifcfg_plugin_error_quark (), 0, "Invalid WEP key length.");
}
if (key) {
g_message ("%s: adding key '%s' at index %d", __func__, key, key_idx);
if (key_idx == 0)
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, key);
else if (key_idx == 1)
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, key);
else if (key_idx == 2)
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, key);
else if (key_idx == 3)
g_hash_table_insert (secrets, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, key);
else
g_assert_not_reached ();
success = TRUE;
}
out:
g_free (value);
return key;
return success;
}
#define READ_WEP_KEY(shvar_key, idx, ifcfg_file, cdata) \
{ \
char *key = get_one_wep_key (ifcfg_file, shvar_key, error); \
if (*error) \
goto error; \
if (key) { \
g_hash_table_insert (cdata->wifi_secrets, \
NM_SETTING_WIRELESS_SECURITY_WEP_KEY##idx, \
key); \
} \
}
static shvarFile *
get_keys_ifcfg (const char *parent)
{
@ -470,6 +485,23 @@ out:
return ifcfg;
}
static gboolean
read_wep_keys (shvarFile *ifcfg, guint8 def_idx, GHashTable *secrets, GError **error)
{
if (!add_one_wep_key (ifcfg, "KEY1", 0, secrets, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY2", 1, secrets, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY3", 2, secrets, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY4", 3, secrets, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY", def_idx, secrets, error))
return FALSE;
return TRUE;
}
static NMSetting *
make_wireless_security_setting (shvarFile *ifcfg,
const char *file,
@ -479,34 +511,19 @@ make_wireless_security_setting (shvarFile *ifcfg,
NMSettingWirelessSecurity *s_wireless_sec;
char *value;
shvarFile *keys_ifcfg = NULL;
int default_key_idx = 0;
s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
READ_WEP_KEY("KEY", 0, ifcfg, cdata)
READ_WEP_KEY("KEY0", 0, ifcfg, cdata)
READ_WEP_KEY("KEY1", 1, ifcfg, cdata)
READ_WEP_KEY("KEY2", 2, ifcfg, cdata)
READ_WEP_KEY("KEY3", 3, ifcfg, cdata)
/* Try to get keys from the "shadow" key file */
keys_ifcfg = get_keys_ifcfg (file);
if (keys_ifcfg) {
READ_WEP_KEY("KEY", 0, keys_ifcfg, cdata)
READ_WEP_KEY("KEY0", 0, keys_ifcfg, cdata)
READ_WEP_KEY("KEY1", 1, keys_ifcfg, cdata)
READ_WEP_KEY("KEY2", 2, keys_ifcfg, cdata)
READ_WEP_KEY("KEY3", 3, keys_ifcfg, cdata)
}
value = svGetValue (ifcfg, "DEFAULTKEY");
if (value) {
gboolean success;
int key_idx = 0;
success = get_int (value, &key_idx);
if (success && (key_idx >= 0) && (key_idx <= 3))
s_wireless_sec->wep_tx_keyidx = key_idx;
else {
success = get_int (value, &default_key_idx);
if (success && (default_key_idx >= 1) && (default_key_idx <= 4)) {
default_key_idx--; /* convert to [0...3] */
s_wireless_sec->wep_tx_keyidx = default_key_idx;
} else {
g_set_error (error, ifcfg_plugin_error_quark (), 0,
"Invalid default WEP key '%s'", value);
g_free (value);
@ -515,6 +532,17 @@ make_wireless_security_setting (shvarFile *ifcfg,
g_free (value);
}
/* Read keys in the ifcfg file */
if (!read_wep_keys (ifcfg, default_key_idx, cdata->wifi_secrets, error))
goto error;
/* Try to get keys from the "shadow" key file */
keys_ifcfg = get_keys_ifcfg (file);
if (keys_ifcfg) {
if (!read_wep_keys (keys_ifcfg, default_key_idx, cdata->wifi_secrets, error))
goto error;
}
value = svGetValue (ifcfg, "SECURITYMODE");
if (value) {
char *lcase;