Author: jsuchome Date: Wed Jul 20 11:13:45 2011 New Revision: 64911 URL: http://svn.opensuse.org/viewcvs/yast?rev=64911&view=rev Log: - remove blowfish hash from selections, make sha512 the default (fate#312321) - 2.21.6 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/helps.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp trunk/users/src/widgets.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Jul 20 11:13:45 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Jul 20 11:13:45 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 20 11:10:22 CEST 2011 - jsuchome@suse.cz + +- remove blowfish hash from selections, make sha512 the default + (fate#312321) +- 2.21.6 + +------------------------------------------------------------------- Fri Jul 15 12:45:19 CEST 2011 - jsuchome@suse.cz - adapted testsuite to previous change Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Wed Jul 20 11:13:45 2011 @@ -47,7 +47,7 @@ # password encryption method -my $encryption_method = "blowfish"; +my $encryption_method = "sha512"; # mail alias for root my $root_alias = ""; Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Wed Jul 20 11:13:45 2011 @@ -35,8 +35,6 @@ "crypt" :_("DES"), // encryption type "md5" : _("MD5"), - // encryption type - "blowfish" : _("Blowfish") ]; string method = Users::EncryptionMethod (); if (type == "ldap") Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Wed Jul 20 11:13:45 2011 @@ -99,8 +99,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -161,12 +159,10 @@ `RadioButtonGroup (`id (`encryption_method), `VBox ( `VSpacing (0.5), // Radio button label: password encryption type - `Left (`RadioButton (`id ("des"), _("&DES (Linux default)"))), + `Left (`RadioButton (`id ("des"), _("&DES"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("md5"), _("&MD5"))), // Radio button label: password encryption type - `Left (`RadioButton (`id ("blowfish"), _("&Blowfish"))), - // Radio button label: password encryption type `Left (`RadioButton (`id ("sha256"), _("SHA-&256"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("sha512"), _("SHA-&512"))), @@ -205,11 +201,7 @@ </p>") + // Help text for password expert dialog - _("<p> -<b>Blowfish</b> is similar to MD5, but uses a different algorithm -to encrypt passwords. -</P>"); - + _("<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"); // help text for main add user dialog string main_help () { Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Wed Jul 20 11:13:45 2011 @@ -33,8 +33,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -95,7 +93,8 @@ ahref, "/a", user["cn"]:"", user["uid"]:""); } string rest = ""; - if (UsersSimple::EncryptionMethod () != "blowfish") + // only show in summary if non-default method is used + if (UsersSimple::EncryptionMethod () != "sha512") { // summary line rest = sformat (_("Password Encryption Method: %1"), Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=64911&r1=64910&r2=64911&view=diff ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Wed Jul 20 11:13:45 2011 @@ -157,14 +157,7 @@ </p>"); // Help text for password expert dialog 4/5 - help_text = help_text + _("<p> -<b>Blowfish</b> is similar to MD5, but uses a different algorithm -to encrypt passwords. -</P>"); - // Help text for password expert dialog 5/5 - help_text = help_text + _("<p> -As a general rule of thumb, use DES if you are unsure. -</p>"); + help_text = help_text + _("<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"); UI::OpenDialog( `VBox( @@ -174,26 +167,22 @@ `HBox( `HSpacing( 2 ), // frame label - `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), - `VBox( + `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), `HBox (`HSpacing (), `VBox( `VSpacing( 0.5 ), // Radio buttons for password encryption: DES-crypt - `Left(`RadioButton(`id("des"), _("&DES (Linux default)"), + `Left(`RadioButton(`id("des"), _("&DES"), method == "des" ) ), // Radio buttons for password encryption: MD5-crypt `Left(`RadioButton(`id("md5"), _("&MD5"), method == "md5" ) ), - // Radio buttons for password encryption: blowfish-crypt - `Left(`RadioButton(`id("blowfish"), _("&Blowfish"), - method == "blowfish" ) ), // Radio buttons for password encryption: sha256 crypt `Left(`RadioButton(`id("sha256"), _("SHA-&256"), method == "sha256" ) ), // Radio buttons for password encryption: sha512 crypt `Left(`RadioButton(`id("sha512"), _("SHA-&512"), - method == "sha512" ) ) - ) - )), + method == "sha512" ) ), + `VSpacing( 0.5 ) + )))), `HSpacing( 2 ) ), `VSpacing( 0.5 ), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org