From f8ad81d8bc0e16b05ea7b3cc5cdbbe1ac9ef56ef Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 15 Mar 2006 20:27:11 +0000 Subject: [PATCH] 2006-03-15 Robert Love * gnome/applet/applet.glade, gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c, gnome/applet/wso-wep-passphrase.c: The label "WEP 40/128-bit" is inconsistent because the physical key size is 40 or 104-bits, to which a 24-bit initialisation vector is appended, forming a 64 or 128-bit traffic key. Thus, the label ought to read "40/104" or "64/128". I do not care much which, but most users think of "silver" and "gold" encryption as 64 and 128-bits, so let's stick with that. Thus, s/"40/128"/"64/128"/g. Also, since our WEP passphrase support only handles 128-bit keys, and any future 64-bit passphrase support will require a new option (no way to auto- detect the target key size), explicitly label our passphrase support "WEP 128-bit Passphrase". git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1608 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 15 +++++++++++++++ gnome/applet/applet.glade | 12 ++++++------ gnome/applet/wso-wep-ascii.c | 2 +- gnome/applet/wso-wep-hex.c | 2 +- gnome/applet/wso-wep-passphrase.c | 2 +- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c18702878..83e942784d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-03-15 Robert Love + + * gnome/applet/applet.glade, gnome/applet/wso-wep-ascii.c, + gnome/applet/wso-wep-hex.c, gnome/applet/wso-wep-passphrase.c: The + label "WEP 40/128-bit" is inconsistent because the physical key size + is 40 or 104-bits, to which a 24-bit initialisation vector is + appended, forming a 64 or 128-bit traffic key. Thus, the label ought + to read "40/104" or "64/128". I do not care much which, but most + users think of "silver" and "gold" encryption as 64 and 128-bits, so + let's stick with that. Thus, s/"40/128"/"64/128"/g. Also, since our + WEP passphrase support only handles 128-bit keys, and any future + 64-bit passphrase support will require a new option (no way to auto- + detect the target key size), explicitly label our passphrase support + "WEP 128-bit Passphrase". + 2006-03-15 Robert Love * src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on diff --git a/gnome/applet/applet.glade b/gnome/applet/applet.glade index 606a20f5cb..db57385304 100644 --- a/gnome/applet/applet.glade +++ b/gnome/applet/applet.glade @@ -558,9 +558,9 @@ You have chosen to log in to the wireless network '%s'. If you are sure that th True None -WEP Passphrase -WEP 40/128-bit hex -WEP 40/128-bit ASCII +WEP 128-bit Passphrase +WEP 64/128-bit hex +WEP 64/128-bit ASCII False True @@ -773,9 +773,9 @@ A passphrase or encryption key is required to access the wireless network '%s'.< True None -WEP Passphrase -WEP 40/128-bit hex -WEP 40/128-bit ASCII +WEP 128-bit Passphrase +WEP 64/128-bit hex +WEP 64/128-bit ASCII False True diff --git a/gnome/applet/wso-wep-ascii.c b/gnome/applet/wso-wep-ascii.c index 20c08d23f1..1c51734b32 100644 --- a/gnome/applet/wso-wep-ascii.c +++ b/gnome/applet/wso-wep-ascii.c @@ -135,7 +135,7 @@ WirelessSecurityOption * wso_wep_ascii_new (const char *glade_file) g_return_val_if_fail (glade_file != NULL, NULL); opt = g_malloc0 (sizeof (WirelessSecurityOption)); - opt->name = g_strdup (_("WEP 40/128-bit ASCII")); + opt->name = g_strdup (_("WEP 64/128-bit ASCII")); opt->widget_name = "wep_key_notebook"; opt->data_free_func = data_free_func; opt->validate_input_func = validate_input_func; diff --git a/gnome/applet/wso-wep-hex.c b/gnome/applet/wso-wep-hex.c index 102b616630..6aa1ba9bf2 100644 --- a/gnome/applet/wso-wep-hex.c +++ b/gnome/applet/wso-wep-hex.c @@ -132,7 +132,7 @@ WirelessSecurityOption * wso_wep_hex_new (const char *glade_file) g_return_val_if_fail (glade_file != NULL, NULL); opt = g_malloc0 (sizeof (WirelessSecurityOption)); - opt->name = g_strdup (_("WEP 40/128-bit hex")); + opt->name = g_strdup (_("WEP 64/128-bit hex")); opt->widget_name = "wep_key_notebook"; opt->data_free_func = data_free_func; opt->validate_input_func = validate_input_func; diff --git a/gnome/applet/wso-wep-passphrase.c b/gnome/applet/wso-wep-passphrase.c index 29cc373d66..4253d45bba 100644 --- a/gnome/applet/wso-wep-passphrase.c +++ b/gnome/applet/wso-wep-passphrase.c @@ -132,7 +132,7 @@ WirelessSecurityOption * wso_wep_passphrase_new (const char *glade_file) g_return_val_if_fail (glade_file != NULL, NULL); opt = g_malloc0 (sizeof (WirelessSecurityOption)); - opt->name = g_strdup (_("WEP Passphrase")); + opt->name = g_strdup (_("WEP 128-bit Passphrase")); opt->widget_name = "wep_passphrase_notebook"; opt->data_free_func = data_free_func; opt->validate_input_func = validate_input_func;