From 0cb06892fa69b835eac75073f88b582e04799562 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Wed, 28 May 2014 16:50:18 +0000 Subject: [PATCH] Don't break the legacy applications which set just 2 bytes to salt. MFC after: 1 week --- lib/libcrypt/crypt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index 040fdc1b90af..c3ca4c225cb7 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -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));