diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-01-19 17:24:19 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-01-19 17:29:21 +0100 |
| commit | 78b154a95b507c205241dd883396952e0dfbede7 (patch) | |
| tree | 4791cc8563e4f5f36f28c393e026da8d85510d69 | |
| parent | 516c45013d9fa31905f172e6fc7ca9072b5148cf (diff) | |
libcrypt: return NULL on unsupported salt
BZ #7808 asks us not to fallback to DES if the optional SHA are disabled
but requested by the user.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | libcrypt/crypt.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c index f79c9fe8b..10061a073 100644 --- a/libcrypt/crypt.c +++ b/libcrypt/crypt.c @@ -14,17 +14,21 @@ char *crypt(const char *key, const char *salt) const unsigned char *ukey = (const unsigned char *)key; const unsigned char *usalt = (const unsigned char *)salt; - if (salt[0] == '$' && salt[2] == '$') { - if (*++salt == '1') - return __md5_crypt(ukey, usalt); + if (salt[0] == '$') { + if (salt[1] && salt[2] == '$') { /* no blowfish '2X' here ATM */ + if (*++salt == '1') + return __md5_crypt(ukey, usalt); #ifdef __UCLIBC_HAS_SHA256_CRYPT_IMPL__ - else if (*salt == '5') - return __sha256_crypt(ukey, usalt); + else if (*salt == '5') + return __sha256_crypt(ukey, usalt); #endif #ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__ - else if (*salt == '6') - return __sha512_crypt(ukey, usalt); + else if (*salt == '6') + return __sha512_crypt(ukey, usalt); #endif + } + /* __set_errno(EINVAL);*/ /* ENOSYS might be misleading */ + return NULL; } return __des_crypt(ukey, usalt); } |