From a02bf5fc508c32e8617ff0528d1cc89ed56e3d03 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 10 Aug 2012 00:20:00 -0400 Subject: add blowfish hash support to crypt there are still some discussions going on about tweaking the code, but at least thing brings us to the point of having something working in the repository. hopefully the remaining major hashes (md5,sha) will follow soon. --- src/misc/crypt_r.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/misc/crypt_r.c') diff --git a/src/misc/crypt_r.c b/src/misc/crypt_r.c index d16ab48d..f4716d6f 100644 --- a/src/misc/crypt_r.c +++ b/src/misc/crypt_r.c @@ -5,19 +5,19 @@ struct crypt_data; char *__crypt_des(const char *, const char *, char *); char *__crypt_md5(const char *, const char *, char *); +char *__crypt_blowfish(const char *, const char *, char *); char *__crypt_r(const char *key, const char *salt, struct crypt_data *data) { char *output = (char *)data; + if (salt[0] == '$' && salt[1] && salt[2]) { #if 0 - /* MD5 or SHA? */ - if (salt[0] == '$' && salt[1] && salt[2] == '$') { - if (salt[1] == '1') - return __crypt_md5((char *)data, key, salt); - else - return "x"; - } + if (salt[1] == '1' && salt[2] == '$') + return __crypt_md5(key, salt, output); #endif + if (salt[1] == '2' && salt[3] == '$') + return __crypt_blowfish(key, salt, output); + } return __crypt_des(key, salt, output); } -- cgit v1.2.1