summaryrefslogtreecommitdiffstats
path: root/apps/passwd.c
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>2000-02-20 20:59:21 +0000
committerUlf Möller <ulf@openssl.org>2000-02-20 20:59:21 +0000
commit4ec19e203c7ad918c1fb61dfdf92042bca113238 (patch)
tree586755a9dba84874a2b061e0790d824c346ec47a /apps/passwd.c
parentd754b3850f0230c187236d89c42d1a971a97264d (diff)
Fix gcc warnings.
Diffstat (limited to 'apps/passwd.c')
-rw-r--r--apps/passwd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/passwd.c b/apps/passwd.c
index 6b8aafa157..d3893d7f83 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -20,7 +20,7 @@
# include <openssl/des.h>
#endif
#ifndef NO_APR1
-# include <openssl/des.h>
+# include <openssl/md5.h>
#endif
@@ -323,13 +323,13 @@ static char *apr1_crypt(const char *passwd, const char *salt)
MD5_CTX md2;
MD5_Init(&md2);
- MD5_Update(&md2, (i & 1) ? passwd : buf,
+ MD5_Update(&md2, (i & 1) ? (unsigned char *) passwd : buf,
(i & 1) ? passwd_len : sizeof buf);
if (i % 3)
MD5_Update(&md2, salt_out, salt_len);
if (i % 7)
MD5_Update(&md2, passwd, passwd_len);
- MD5_Update(&md2, (i & 1) ? buf : passwd,
+ MD5_Update(&md2, (i & 1) ? buf : (unsigned char *) passwd,
(i & 1) ? sizeof buf : passwd_len);
MD5_Final(buf, &md2);
}