summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/crypt/crypt.c10
-rw-r--r--lib/libc/crypt/crypt2.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c
index e0f5e8364ab..f0e2900f6d3 100644
--- a/lib/libc/crypt/crypt.c
+++ b/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypt.c,v 1.18 2003/08/12 01:22:17 deraadt Exp $ */
+/* $OpenBSD: crypt.c,v 1.19 2004/09/14 22:56:57 deraadt Exp $ */
/*
* FreeSec: libcrypt
@@ -47,7 +47,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt.c,v 1.18 2003/08/12 01:22:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: crypt.c,v 1.19 2004/09/14 22:56:57 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -604,7 +604,7 @@ crypt(const char *key, const char *setting)
if ((*q++ = *key << 1))
key++;
}
- if (des_setkey((u_char *) keybuf))
+ if (des_setkey((char *) keybuf))
return(NULL);
if (*setting == _PASSWORD_EFMT1) {
@@ -623,7 +623,7 @@ crypt(const char *key, const char *setting)
/*
* Encrypt the key with itself.
*/
- if (des_cipher((u_char*)keybuf, (u_char*)keybuf, 0, 1))
+ if (des_cipher((char *)keybuf, (char *)keybuf, 0, 1))
return(NULL);
/*
* And XOR with the next 8 characters of the key.
@@ -633,7 +633,7 @@ crypt(const char *key, const char *setting)
*key)
*q++ ^= *key++ << 1;
- if (des_setkey((u_char *) keybuf))
+ if (des_setkey((char *) keybuf))
return(NULL);
}
strlcpy((char *)output, setting, 10);
diff --git a/lib/libc/crypt/crypt2.c b/lib/libc/crypt/crypt2.c
index 0c93c120445..53b5bfb7067 100644
--- a/lib/libc/crypt/crypt2.c
+++ b/lib/libc/crypt/crypt2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypt2.c,v 1.1 2003/08/12 01:22:17 deraadt Exp $ */
+/* $OpenBSD: crypt2.c,v 1.2 2004/09/14 22:56:57 deraadt Exp $ */
/*
* FreeSec: libcrypt
@@ -47,7 +47,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt2.c,v 1.1 2003/08/12 01:22:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: crypt2.c,v 1.2 2004/09/14 22:56:57 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -79,7 +79,7 @@ setkey(const char *key)
if (*key++ & 1)
p[i] |= _des_bits8[j];
}
- return(des_setkey(p));
+ return(des_setkey((char *)p));
}
int