Author: jsuchome Date: Tue Apr 5 11:05:53 2011 New Revision: 63712 URL: http://svn.opensuse.org/viewcvs/yast?rev=63712&view=rev Log: - added support for SHA-2 based crypto methods (fate309705) - 2.21.3 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/UsersUI.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp trunk/users/src/widgets.ycp trunk/users/yast2-users.spec.in Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Tue Apr 5 11:05:53 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Tue Apr 5 11:05:53 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 5 11:01:12 CEST 2011 - jsuchome@suse.cz + +- added support for SHA-2 based crypto methods (fate309705) +- 2.21.3 + +------------------------------------------------------------------- Fri Apr 1 10:13:20 CEST 2011 - jsuchome@suse.cz - check for 'sss' in nsswitch.conf for LDAP users (bnc#683782) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Tue Apr 5 11:05:53 2011 @@ -70,6 +70,8 @@ "des" => 8, "md5" => 127, "blowfish" => 72, + "sha256" => 127, # arbitrary high number, there's probably no limit + "sha512" => 127 ); # name of user that should be logged in automatically Modified: trunk/users/src/UsersUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersUI.ycp?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/src/UsersUI.ycp (original) +++ trunk/users/src/UsersUI.ycp Tue Apr 5 11:05:53 2011 @@ -401,6 +401,10 @@ return cryptmd5 (pw); if (method == "blowfish") return cryptblowfish (pw); + if (method == "sha256") + return cryptsha256 (pw); + if (method == "sha512") + return cryptsha512 (pw); return crypt (pw); } Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Tue Apr 5 11:05:53 2011 @@ -100,6 +100,10 @@ "md5" : _("MD5"), // encryption type "blowfish" : _("Blowfish"), + // encryption type + "sha256" : _("SHA-256"), + // encryption type + "sha512" : _("SHA-512"), ]; term import_checkbox = `Left (`CheckBox (`id (`import_ch), // check box label @@ -162,6 +166,10 @@ `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"))), `VSpacing (0.5) )) ); @@ -202,6 +210,7 @@ to encrypt passwords. </P>"); + // help text for main add user dialog string main_help () { // help text for main add user dialog @@ -773,7 +782,7 @@ // preselect the required packages for installation y2milestone ("preselect required packages for installation"); map required_packages = $[ - "ldap" : [ "yast2-ldap-client", "pam_ldap", "nss_ldap"], + "ldap" : [ "yast2-ldap-client", "sssd" ], "nis" : [ "yast2-nis-client", "ypbind" ], "samba" : [ "yast2-samba-client", "krb5", "samba-client", Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Tue Apr 5 11:05:53 2011 @@ -34,6 +34,10 @@ "md5" : _("MD5"), // encryption type "blowfish" : _("Blowfish"), + // encryption type + "sha256" : _("SHA-256"), + // encryption type + "sha512" : _("SHA-512"), ]; Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Tue Apr 5 11:05:53 2011 @@ -173,20 +173,25 @@ `VSpacing( 0.7 ), `HBox( `HSpacing( 2 ), - `RadioButtonGroup( // frame label - `Frame( _("Encryption Type"), + `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), `VBox( `VSpacing( 0.5 ), // Radio buttons for password encryption: DES-crypt - `Left(`RadioButton(`id(`des), _("&DES (Linux default)"), + `Left(`RadioButton(`id("des"), _("&DES (Linux default)"), method == "des" ) ), // Radio buttons for password encryption: MD5-crypt - `Left(`RadioButton(`id(`md5), _("&MD5"), + `Left(`RadioButton(`id("md5"), _("&MD5"), method == "md5" ) ), // Radio buttons for password encryption: blowfish-crypt - `Left(`RadioButton(`id(`blowfish), _("&Blowfish"), - method == "blowfish" ) ) + `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" ) ) ) )), `HSpacing( 2 ) @@ -218,12 +223,7 @@ } else if ( button == `ok ) { - if ( (boolean) UI::QueryWidget( `id(`des), `Value ) ) - method = "des"; - else if ( (boolean) UI::QueryWidget( `id(`md5), `Value ) ) - method = "md5"; - else if ( (boolean) UI::QueryWidget( `id(`blowfish), `Value ) ) - method = "blowfish"; + method = (string) UI::QueryWidget (`id (`methods), `CurrentButton); y2milestone( "Changing encryption method to %1", method ); } } while ( button != `ok && button != `cancel ); Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=63712&r1=63711&r2=63712&view=diff ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Tue Apr 5 11:05:53 2011 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPL v2 or later BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite yast2-core-devel Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -18,6 +18,9 @@ # String::RemoveShortcut Requires: yast2 >= 2.18.0 +# cryptsha256, cryptsha516 +Requires: yast2-core >= 2.21.0 + Summary: YaST2 - User and Group Configuration %description -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org