projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add blowfish hash support to crypt
[musl]
/
src
/
misc
/
crypt_r.c
diff --git
a/src/misc/crypt_r.c
b/src/misc/crypt_r.c
index
d16ab48
..
f4716d6
100644
(file)
--- 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_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;
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
#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
#endif
+ if (salt[1] == '2' && salt[3] == '$')
+ return __crypt_blowfish(key, salt, output);
+ }
return __crypt_des(key, salt, output);
}
return __crypt_des(key, salt, output);
}