X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fmisc%2Fcrypt_r.c;h=f4716d6f767558574d4779f25d3930786e48344e;hp=d16ab48d6e8ef21955c11bd8c28fcc2c98720b76;hb=a02bf5fc508c32e8617ff0528d1cc89ed56e3d03;hpb=cdf51506ce895286011ff0abe5434557845108ee

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);
 }