svn commit: r266813 - head/lib/libcrypt

[Hajimu UMEMOTO]

Author: ume
Date: Wed May 28 16:50:18 2014
New Revision: 266813
URL: http://svnweb.freebsd.org/changeset/base/266813

Log:
  Don't break the legacy applications which set
  just 2 bytes to salt.
  
  MFC after:	1 week

Modified:
  head/lib/libcrypt/crypt.c

Modified: head/lib/libcrypt/crypt.c
==============================================================================
--- head/lib/libcrypt/crypt.c	Wed May 28 16:28:22 2014	(r266812)
+++ head/lib/libcrypt/crypt.c	Wed May 28 16:50:18 2014	(r266813)
@@ -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));