diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 02:46:20 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 02:46:20 +0000 |
| commit | 1c7c8d902f3674f81f848057cab06264288cbfe7 (patch) | |
| tree | 9583322c80f94b80f1e8a62127be8d9af1ed33c9 /libcrypt | |
| parent | 6e538396c7c8fa82f1134a7acf4b2b20078749f7 (diff) | |
| download | uClibc-alpine-1c7c8d902f3674f81f848057cab06264288cbfe7.tar.bz2 uClibc-alpine-1c7c8d902f3674f81f848057cab06264288cbfe7.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libcrypt')
| -rw-r--r-- | libcrypt/crypt.c | 4 | ||||
| -rw-r--r-- | libcrypt/des.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c index a7dd35458..a1bba6ebd 100644 --- a/libcrypt/crypt.c +++ b/libcrypt/crypt.c @@ -26,8 +26,8 @@ #include <crypt.h> #include <unistd.h> -extern char * __md5_crypt( const char *pw, const char *salt); -extern char * __des_crypt( const char *pw, const char *salt); +extern char * __md5_crypt( const char *pw, const char *salt) attribute_hidden; +extern char * __des_crypt( const char *pw, const char *salt) attribute_hidden; extern char * crypt(const char *key, const char *salt) { diff --git a/libcrypt/des.c b/libcrypt/des.c index 5966da0b9..80e513183 100644 --- a/libcrypt/des.c +++ b/libcrypt/des.c @@ -349,7 +349,7 @@ des_init(void) static void -setup_salt(long salt) +setup_salt(u_int32_t salt) { u_int32_t obit, saltbit; int i; |