From 0f9be4ff6fe130de3d561b77f1ab4205da6f6430 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 14 Sep 2004 22:56:57 +0000
Subject: do the char * to u_char * song and dance back and forth explicitly as
 we match API's against each other, fun eh; millert ok

---
 src/lib/libc/crypt/crypt.c  | 10 +++++-----
 src/lib/libc/crypt/crypt2.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index e0f5e8364a..f0e2900f6d 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/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/src/lib/libc/crypt/crypt2.c b/src/lib/libc/crypt/crypt2.c
index 0c93c12044..53b5bfb706 100644
--- a/src/lib/libc/crypt/crypt2.c
+++ b/src/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
-- 
cgit v1.2.3-55-g6feb