Author: mzugec
Date: Wed Jul 25 22:24:50 2007
New Revision: 39683
URL: http://svn.opensuse.org/viewcvs/yast?rev=39683&view=rev
Log:
new option "No Encryption" in wireless dialog (#213001)
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/complex.ycp
trunk/network/src/lan/help.ycp
trunk/network/src/lan/wireless.ycp
trunk/network/src/modules/LanItems.ycp
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Wed Jul 25 22:24:50 2007
@@ -1 +1 @@
-2.15.53
+2.15.54
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Wed Jul 25 22:24:50 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 25 22:23:54 CEST 2007 - mzugec@suse.de
+
+- new option "No Encryption" in wireless dialog (#213001)
+- 2.15.54
+
+-------------------------------------------------------------------
Wed Jul 25 16:44:14 CEST 2007 - kmachalkova@suse.cz
- A better layout of internet test dialog (#292621, also in 80x25
Modified: trunk/network/src/lan/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/src/lan/complex.ycp (original)
+++ trunk/network/src/lan/complex.ycp Wed Jul 25 22:24:50 2007
@@ -132,7 +132,10 @@
"rt73usb" : "",
"prism54usb":""
];
-
+/*
+ Unsupported:
+rt61, rt2500, z1211
+*/
Lan::Add ();
LanItems::SelectHWMap(LanItems::getCurrentItem()["hwinfo"]:$[]);
@@ -234,7 +237,6 @@
}
void initOverview (string key) ``{
-y2internal("init");
list<term> term_items = maplist (map i, (list >)LanItems::Overview(), {
term t = `item (`id (i["id"]:-1));
Modified: trunk/network/src/lan/help.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/src/lan/help.ycp (original)
+++ trunk/network/src/lan/help.ycp Wed Jul 25 22:24:50 2007
@@ -230,7 +230,98 @@
the <b>Netmask</b>.</p>") +
/* Aliases dialog help 3/3, #83766 */
- _("<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>")
+ _("<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"),
+
+
+// shared between WirelessDialog and WirelessKeyPopup
+// this is suited to the button-switched key typing
+// Translators: dialog help
+"wep_key" :
+ _("<p>Choose among three <b>key input types</b> for your key.
+<br><b>Passphrase</b>: The key is generated from the phrase entered.
+<br><b>ASCII</b>: The ASCII values of the characters entered form the
+key. Enter 5 characters for 64-bit keys, up to 13
+characters for 128-bit keys, up to 16 characters for 156-bit keys, and
+up to 29 characters for 256-bit keys.
+<br><b>Hexadecimal</b>: Directly enter the hex codes of the key. Enter
+10 hex digits for 64-bit keys, 26 digits for 128-bit keys, 32 digits
+for 156-bit keys, and 58 digits for 256-bit keys. You can
+use hyphens ('-') to separate pairs or groups of digits, for example,
+'0a5f-41e6-48'.
+</p> "),
+
+ // Wireless dialog help
+"wireless":
+_("<p>Here, set the most important settings
+for wireless networking.</p>") +
+
+ // Wireless dialog help
+_("<p>The <b>Operating Mode</b> depends on the network topology. The mode
+can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),
+<b>Managed</b> (network managed by an access point, sometimes also
+called <i>Infrastructure Mode</i>), or <b>Master</b> (the network card
+acts as an access point).</p>
+") +
+
+ // Wireless dialog help
+_("<p>Set the <b>Network Name (ESSID)</b> used to identify
+cells that are part of the same virtual network. All stations in a
+wireless LAN need the same ESSID to communicate with each other. If
+you choose the operation mode <b>Managed</b> and no <b>WPA</b> authentication mode,
+you can leave this field empty or set it to <tt>any</tt>. In this
+case, your WLAN card associates with the access point with the best
+signal strength.</p>
+") +
+
+ // Wireless dialog help
+_("<p>In some networks, you need to set an <b>Authentication Mode</b>.
+It depends on the protection technology used, WEP or WPA. <b>WEP</b>
+(Wired Equivalent Privacy) is a system to encrypt wireless network
+traffic with an optional authentication based on the encryption
+key used. In most cases where WEP is used, <b>WEP-Open</b> mode (no
+authentication at all) is fine. This does not mean that you cannot
+use WEP encryption (in that case use <b>No Encryption</b>).
+Some networks may require <b>WEP-Shared Key</b> authentication.
+NOTE: Shared key authentication makes it easier for a
+potential attacker to break into your network. Unless you have
+specific needs for shared key authentication, use the <b>Open</b>
+mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected Access)
+was defined to close its security holes, but not all hardware supports
+WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the
+authentication mode. This is only possible in the operation mode
+<b>Managed</b>.</p>
+") +
+
+ // Wireless dialog help
+_("<p>To use WEP, enter the
+WEP encryption key to use. It can have a key
+length of 64, 128, 156, or 256 bits, but not all sizes are
+supported by all devices. Of these keys, 24 bits
+are dynamically generated, so you only need to enter 40 to 232 bits.</p>
+"),
+
+
+ // Wireless dialog help
+"wpa":
+_("<p>To use WPA-PSK (sometimes referred to as WPA Home),
+enter the preshared key. This
+key is used for authentication and encryption keys are generated from
+it. These are not vulnerable to known attacks against WEP keys, but
+dictionary attacks are still possible. Do not use a word that is
+easy to guess as the passphrase.</p>
+") +
+
+ // Wireless dialog help
+_("<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),
+enter some additional parameters in the next dialog.</p>
+") +
+
+ // Wireless dialog help
+_("<p>These values will be written to the interface configuration file
+'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,
+add them manually. Refer to the file 'wireless' in the same directory for all
+available options.</p>")
+
];
Modified: trunk/network/src/lan/wireless.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wireless.ycp?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/src/lan/wireless.ycp (original)
+++ trunk/network/src/lan/wireless.ycp Wed Jul 25 22:24:50 2007
@@ -23,6 +23,7 @@
import "Wizard";
include "network/routines.ycp";
+include "network/lan/help.ycp";
// key input type buttons
term type_w = `RadioButtonGroup (
@@ -44,23 +45,6 @@
)
);
-// shared between WirelessDialog and WirelessKeyPopup
-// this is suited to the button-switched key typing
-// Translators: dialog help
-string wep_key_help =
- _("<p>Choose among three <b>key input types</b> for your key.
-<br><b>Passphrase</b>: The key is generated from the phrase entered.
-<br><b>ASCII</b>: The ASCII values of the characters entered form the
-key. Enter 5 characters for 64-bit keys, up to 13
-characters for 128-bit keys, up to 16 characters for 156-bit keys, and
-up to 29 characters for 256-bit keys.
-<br><b>Hexadecimal</b>: Directly enter the hex codes of the key. Enter
-10 hex digits for 64-bit keys, 26 digits for 128-bit keys, 32 digits
-for 156-bit keys, and 58 digits for 256-bit keys. You can
-use hyphens ('-') to separate pairs or groups of digits, for example,
-'0a5f-41e6-48'.
-</p>
-");
/**
* Compose a typed key into a single-string representation
@@ -185,9 +169,11 @@
map names = $[
// Wireless authentication modes:
/* ComboBox item */
- "open": _("Open"),
+ "no-encryption" : _("No Encryption"),
+ /* ComboBox item */
+ "open": _("WEP - Open"),
/* ComboBox item */
- "sharedkey": _("Shared Key"),
+ "sharedkey": _("WEP - Shared Key"),
/* ComboBox item */
// Ask me what it means, I don't know yet
"wpa-psk": _("WPA-PSK"),
@@ -217,77 +203,6 @@
/* Wireless dialog caption */
string caption = _("Wireless Network Card Configuration");
-
- // Wireless dialog help
- string helptext = _("<p>Here, set the most important settings
-for wireless networking.</p>") +
-
- // Wireless dialog help
-_("<p>The <b>Operating Mode</b> depends on the network topology. The mode
-can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),
-<b>Managed</b> (network managed by an access point, sometimes also
-called <i>Infrastructure Mode</i>), or <b>Master</b> (the network card
-acts as an access point).</p>
-") +
-
- // Wireless dialog help
-_("<p>Set the <b>Network Name (ESSID)</b> used to identify
-cells that are part of the same virtual network. All stations in a
-wireless LAN need the same ESSID to communicate with each other. If
-you choose the operation mode <b>Managed</b> and no <b>WPA</b> authentication mode,
-you can leave this field empty or set it to <tt>any</tt>. In this
-case, your WLAN card associates with the access point with the best
-signal strength.</p>
-") +
-
- // Wireless dialog help
-_("<p>In some networks, you need to set an <b>Authentication Mode</b>.
-It depends on the protection technology used, WEP or WPA. <b>WEP</b>
-(Wired Equivalent Privacy) is a system to encrypt wireless network
-traffic with an optional authentication based on the encryption
-key used. In most cases where WEP is used, <b>Open</b> mode (no
-authentication at all) is fine. This does not mean that you cannot
-use WEP encryption. Some networks may require WEP <b>Shared Key</b>
-authentication. NOTE: Shared key authentication makes it easier for a
-potential attacker to break into your network. Unless you have
-specific needs for shared key authentication, use the <b>Open</b>
-mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected Access)
-was defined to close its security holes, but not all hardware supports
-WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the
-authentication mode. This is only possible in the operation mode
-<b>Managed</b>.</p>
-") +
-
- // Wireless dialog help
-_("<p>To use WEP, enter the
-WEP encryption key to use. It can have a key
-length of 64, 128, 156, or 256 bits, but not all sizes are
-supported by all devices. Of these keys, 24 bits
-are dynamically generated, so you only need to enter 40 to 232 bits.</p>
-") +
-
-wep_key_help +
-
- // Wireless dialog help
-_("<p>To use WPA-PSK (sometimes referred to as WPA Home),
-enter the preshared key. This
-key is used for authentication and encryption keys are generated from
-it. These are not vulnerable to known attacks against WEP keys, but
-dictionary attacks are still possible. Do not use a word that is
-easy to guess as the passphrase.</p>
-") +
-
- // Wireless dialog help
-_("<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),
-enter some additional parameters in the next dialog.</p>
-") +
-
- // Wireless dialog help
-_("<p>These values will be written to the interface configuration file
-'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,
-add them manually. Refer to the file 'wireless' in the same directory for all
-available options.</p>");
-
string mode = LanItems::wl_mode;
string essid = LanItems::wl_essid;
string authmode = LanItems::wl_auth_mode;
@@ -357,8 +272,7 @@
),
`HSpacing(4)
);
-
- Wizard::SetContentsButtons(caption, contents, helptext,
+ Wizard::SetContentsButtons(caption, contents, sformat("%1%2%3", help["wireless"]:"", help["wep_key"]:"", help["wpa"]:""),
Label::BackButton(), Label::NextButton());
// workaround for #118157
@@ -378,11 +292,11 @@
{
UI::ChangeWidget (`id (`mode), `Value, "Managed");
}
- UI::ChangeWidget (`id (`type_g), `Enabled, authmode != "eap");
- UI::ChangeWidget (`id (`key), `Enabled, authmode != "eap");
- UI::ChangeWidget (`id (`keys), `Enabled, !authmode_wpa);
- UI::ChangeWidget (`id ("ascii"), `Enabled, authmode != "psk");
+ UI::ChangeWidget (`id (`type_g), `Enabled, authmode!="no-encryption" && authmode!="eap");
+ UI::ChangeWidget (`id (`key), `Enabled, authmode!="no-encryption" && authmode!="eap");
+ UI::ChangeWidget (`id (`keys), `Enabled, authmode!="no-encryption" && !authmode_wpa);
+ UI::ChangeWidget (`id ("ascii"), `Enabled, authmode!="no-encryption" && authmode!="psk");
ret = UI::UserInput();
@@ -493,7 +407,7 @@
{
LanItems::wl_wpa_psk = key;
}
- else if (!authmode_wpa)
+ else if (!authmode_wpa && authmode!="no-encryption")
{
LanItems::wl_key[LanItems::wl_default_key] = ckey;
}
@@ -693,7 +607,7 @@
if (ret == `help)
{
// Translators: popup title
- Popup::LongText (_("Help"), `RichText (wep_key_help), 50, 18);
+ Popup::LongText (_("Help"), `RichText (help["wep_key"]:""), 50, 18);
}
else if (ret == `cancel)
{
Modified: trunk/network/src/modules/LanItems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=39683&r1=39682&r2=39683&view=diff
==============================================================================
--- trunk/network/src/modules/LanItems.ycp (original)
+++ trunk/network/src/modules/LanItems.ycp Wed Jul 25 22:24:50 2007
@@ -422,7 +422,7 @@
y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug);
// Wireless Card Features
- wl_auth_modes = hardware["wl_auth_modes"]:nilliststring;
+ wl_auth_modes = prepend(hardware["wl_auth_modes"]:nilliststring, "no-encryption");
wl_enc_modes = hardware["wl_enc_modes"]:nilliststring;
wl_channels = hardware["wl_channels"]:nilliststring;
wl_bitrates = hardware["wl_bitrates"]:nilliststring;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
