Date: Thu, 5 Jun 2014 15:16:44 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r267111 - stable/10/lib/libcrypt Message-ID: <201406051516.s55FGiRL019332@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Jun 5 15:16:44 2014 New Revision: 267111 URL: http://svnweb.freebsd.org/changeset/base/267111 Log: MFH r266813: Don't break the legacy applications which set just 2 bytes to salt. Modified: stable/10/lib/libcrypt/crypt.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libcrypt/crypt.c ============================================================================== --- stable/10/lib/libcrypt/crypt.c Thu Jun 5 14:19:32 2014 (r267110) +++ stable/10/lib/libcrypt/crypt.c Thu Jun 5 15:16:44 2014 (r267111) @@ -104,12 +104,16 @@ char * crypt(const char *passwd, const char *salt) { const struct crypt_format *cf; +#ifdef HAS_DES + int len; +#endif for (cf = crypt_formats; cf->name != NULL; ++cf) if (cf->magic != NULL && strstr(salt, cf->magic) == salt) return (cf->func(passwd, salt)); #ifdef HAS_DES - if (strlen(salt) == 13 && strspn(salt, DES_SALT_ALPHABET) == 13) + len = strlen(salt); + if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len) return (crypt_des(passwd, salt)); #endif return (crypt_format->func(passwd, salt));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051516.s55FGiRL019332>