fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-03-15 Robert Love <rml@novell.com>

Browse source 
* 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
This commit is contained in:
Robert Love 2006-03-15 20:27:11 +00:00 • committed by Robert Love
parent c7e71729b7
commit f8ad81d8bc
5 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2006-03-15 Robert Love <rml@novell.com>
* 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 <rml@novell.com> 2006-03-15 Robert Love <rml@novell.com>
* src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on * src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on

12
gnome/applet/applet.glade
View file

@ -558,9 +558,9 @@ You have chosen to log in to the wireless network '%s'. If you are sure that th
<widget class="GtkComboBox" id="security_combo"> <widget class="GtkComboBox" id="security_combo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes">None <property name="items" translatable="yes">None
WEP Passphrase WEP 128-bit Passphrase
WEP 40/128-bit hex WEP 64/128-bit hex
WEP 40/128-bit ASCII WEP 64/128-bit ASCII
</property> </property>
<property name="add_tearoffs">False</property> <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
@ -773,9 +773,9 @@ A passphrase or encryption key is required to access the wireless network '%s'.<
<widget class="GtkComboBox" id="security_combo"> <widget class="GtkComboBox" id="security_combo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes">None <property name="items" translatable="yes">None
WEP Passphrase WEP 128-bit Passphrase
WEP 40/128-bit hex WEP 64/128-bit hex
WEP 40/128-bit ASCII WEP 64/128-bit ASCII
</property> </property>
<property name="add_tearoffs">False</property> <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>

2
gnome/applet/wso-wep-ascii.c
View file

@ -135,7 +135,7 @@ WirelessSecurityOption * wso_wep_ascii_new (const char *glade_file)
g_return_val_if_fail (glade_file != NULL, NULL); g_return_val_if_fail (glade_file != NULL, NULL);
opt = g_malloc0 (sizeof (WirelessSecurityOption)); 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->widget_name = "wep_key_notebook";
opt->data_free_func = data_free_func; opt->data_free_func = data_free_func;
opt->validate_input_func = validate_input_func; opt->validate_input_func = validate_input_func;

2
gnome/applet/wso-wep-hex.c
View file

@ -132,7 +132,7 @@ WirelessSecurityOption * wso_wep_hex_new (const char *glade_file)
g_return_val_if_fail (glade_file != NULL, NULL); g_return_val_if_fail (glade_file != NULL, NULL);
opt = g_malloc0 (sizeof (WirelessSecurityOption)); 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->widget_name = "wep_key_notebook";
opt->data_free_func = data_free_func; opt->data_free_func = data_free_func;
opt->validate_input_func = validate_input_func; opt->validate_input_func = validate_input_func;

2
gnome/applet/wso-wep-passphrase.c
View file

@ -132,7 +132,7 @@ WirelessSecurityOption * wso_wep_passphrase_new (const char *glade_file)
g_return_val_if_fail (glade_file != NULL, NULL); g_return_val_if_fail (glade_file != NULL, NULL);
opt = g_malloc0 (sizeof (WirelessSecurityOption)); 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->widget_name = "wep_passphrase_notebook";
opt->data_free_func = data_free_func; opt->data_free_func = data_free_func;
opt->validate_input_func = validate_input_func; opt->validate_input_func = validate_input_func;