Author: aschnell Date: Fri Mar 16 14:56:55 2012 New Revision: 67648 URL: http://svn.opensuse.org/viewcvs/yast?rev=67648&view=rev Log: - removed dead bigcrypt code Modified: trunk/core/libycp/src/YCPBuiltinString.cc trunk/core/libycp/src/y2crypt.cc trunk/core/libycp/src/y2crypt.h trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString.cc?rev=67648&r1=67647&r2=67648&view=diff ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Fri Mar 16 14:56:55 2012 @@ -1290,37 +1290,6 @@ static YCPValue -s_cryptbigcrypt(const YCPString& original) -{ - /** - * @builtin cryptbigcrypt - * @short Encrypts a string using bigcrypt - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using bigcrypt - * password encryption. The password is not truncated. - * @param string UNENCRYPTED - * @return string - * - * @usage cryptbigcrypt ("readable") -> "d4brTQmcVbtNg" - */ - - if (original.isNull ()) - return YCPNull (); - - string unencrypted = original->value(); - string encrypted; - - if (crypt_pass (unencrypted, BIGCRYPT, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using bigcrypt failed"); - return YCPNull (); - } -} - - -static YCPValue s_cryptblowfish(const YCPString& original) { /** @@ -1598,7 +1567,6 @@ { "mergestring", "string (const list <string>, string)", (void *)s_mergestring, ETC }, { "crypt", "string (string)", (void *)s_crypt, ETC }, { "cryptmd5", "string (string)", (void *)s_cryptmd5, ETC }, - { "cryptbigcrypt", "string (string)", (void *)s_cryptbigcrypt, ETC }, { "cryptblowfish", "string (string)", (void *)s_cryptblowfish, ETC }, { "cryptsha256", "string (string)", (void *)s_cryptsha256, ETC }, { "cryptsha512", "string (string)", (void *)s_cryptsha512, ETC }, Modified: trunk/core/libycp/src/y2crypt.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/y2crypt.cc?rev=67648&r1=67647&r2=67648&view=diff ============================================================================== --- trunk/core/libycp/src/y2crypt.cc (original) +++ trunk/core/libycp/src/y2crypt.cc Fri Mar 16 14:56:55 2012 @@ -133,19 +133,6 @@ free (salt); break; -#if 0 - case BIGCRYPT: - salt = make_crypt_salt ("", 0); - if (!salt) - { - y2error ("Cannot create salt for bigcrypt"); - return false; - } - newencrypted = bigcrypt (unencrypted.c_str (), salt); - free (salt); - break; -#endif - case BLOWFISH: salt = make_crypt_salt ("$2y$", 0); if (!salt) Modified: trunk/core/libycp/src/y2crypt.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/y2crypt.h?rev=67648&r1=67647&r2=67648&view=diff ============================================================================== --- trunk/core/libycp/src/y2crypt.h (original) +++ trunk/core/libycp/src/y2crypt.h Fri Mar 16 14:56:55 2012 @@ -14,7 +14,7 @@ using std::string; -enum crypt_t { CRYPT, MD5, BIGCRYPT, BLOWFISH, SHA256, SHA512 }; +enum crypt_t { CRYPT, MD5, BLOWFISH, SHA256, SHA512 }; bool crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=67648&r1=67647&r2=67648&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Mar 16 14:56:55 2012 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Mar 16 14:40:00 CET 2012 - aschnell@suse.de -- do not use xcrypt (fate #312617) +- do not use xcrypt (removes bigcrypt) (fate #312617) - 2.22.5 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org