diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-01-20 20:14:31 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-01-20 20:14:31 +0000 |
| commit | 7d81b44aceec2e25cf2872f195adff3613e27fd3 (patch) | |
| tree | dafe931f45b816968d1a44cfdeb03716ccd082be /libcrypt/crypt.c | |
| parent | 6bff678e1e8dd789d4c7f376217bc7aa4853460d (diff) | |
| download | uClibc-alpine-7d81b44aceec2e25cf2872f195adff3613e27fd3.tar.bz2 uClibc-alpine-7d81b44aceec2e25cf2872f195adff3613e27fd3.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libcrypt/crypt.c')
| -rw-r--r-- | libcrypt/crypt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c index 5d8215fac..8b361d393 100644 --- a/libcrypt/crypt.c +++ b/libcrypt/crypt.c @@ -8,16 +8,14 @@ #define __FORCE_GLIBC #include <crypt.h> #include <unistd.h> +#include "libcrypt.h" -extern char * __md5_crypt( const char *pw, const char *salt) attribute_hidden; -extern char * __des_crypt( const char *pw, const char *salt) attribute_hidden; - -char * crypt(const char *key, const char *salt) +char *crypt(const char *key, const char *salt) { /* First, check if we are supposed to be using the MD5 replacement * instead of DES... */ if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$') - return __md5_crypt(key, salt); + return __md5_crypt((unsigned char*)key, (unsigned char*)salt); else - return __des_crypt(key, salt); + return __des_crypt((unsigned char*)key, (unsigned char*)salt); } |