From ba58f50caf44e14493eaa5ccaf5d30f17b792782 Mon Sep 17 00:00:00 2001
From: Jim Rees <rees@umich.edu>
Date: Tue, 5 Oct 2004 21:40:59 +0000
Subject: [PATCH] crypt-take-voids-20041005

make various crypt/decrypt routines take void * args to eliminate more
compiler warnings
---
 src/des/cbc_encrypt.c        |  2 +-
 src/des/des.c                | 10 +++++-----
 src/des/des_prototypes.h     |  6 +++---
 src/des/pcbc_encrypt.c       |  2 +-
 src/rxkad/rxkad_prototypes.h |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/des/cbc_encrypt.c b/src/des/cbc_encrypt.c
index 5583f0380..a2c8a52a4 100644
--- a/src/des/cbc_encrypt.c
+++ b/src/des/cbc_encrypt.c
@@ -61,7 +61,7 @@ RCSID
     des_cblock *iv;		* 8 bytes of ivec *
 */
 afs_int32
-des_cbc_encrypt(des_cblock * in, des_cblock * out, register afs_int32 length,
+des_cbc_encrypt(void * in, void * out, register afs_int32 length,
 		des_key_schedule key, des_cblock * iv, int encrypt)
 {
     register afs_uint32 *input = (afs_uint32 *) in;
diff --git a/src/des/des.c b/src/des/des.c
index 732e266bb..d6d652244 100644
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -72,7 +72,7 @@ pthread_mutex_t rxkad_stats_mutex;
 /* encrypt == 0  ==> decrypt, else encrypt */
 
 afs_int32
-des_ecb_encrypt(afs_uint32 * clear, afs_uint32 * cipher,
+des_ecb_encrypt(void * clear, void * cipher,
 		register des_key_schedule schedule, int encrypt)
 {
     /* better pass 8 bytes, length not checked here */
@@ -137,11 +137,11 @@ des_ecb_encrypt(afs_uint32 * clear, afs_uint32 * cipher,
 #endif
     {
 	if (clear)
-	    L1 = *clear++;
+	    L1 = *((afs_int32 *)clear)++;
 	else
 	    L1 = 0;
 	if (clear)
-	    R1 = *clear;
+	    R1 = *((afs_int32 *)clear);
 	else
 	    R1 = 0;
     }
@@ -446,8 +446,8 @@ des_ecb_encrypt(afs_uint32 * clear, afs_uint32 * cipher,
     } else
 #endif
     {
-	*cipher++ = L2;
-	*cipher = R2;
+	*((afs_int32 *)cipher)++ = L2;
+	*((afs_int32 *)cipher) = R2;
     }
 
 #ifdef DEBUG
diff --git a/src/des/des_prototypes.h b/src/des/des_prototypes.h
index d7871d22a..dee7c20f1 100644
--- a/src/des/des_prototypes.h
+++ b/src/des/des_prototypes.h
@@ -18,19 +18,19 @@ extern void test_set(FILE * stream, const char *src, int testbit,
 extern int des_debug;
 
 /* cbc_encrypt.c */
-extern afs_int32 des_cbc_encrypt(des_cblock * in, des_cblock * out,
+extern afs_int32 des_cbc_encrypt(void * in, void * out,
 				 register afs_int32 length,
 				 des_key_schedule key, des_cblock * iv,
 				 int encrypt);
 
 /* pcbc_encrypt.c */
-extern afs_int32 des_pcbc_encrypt(des_cblock * in, des_cblock * out,
+extern afs_int32 des_pcbc_encrypt(void * in, void * out,
 				  register afs_int32 length,
 				  des_key_schedule key, des_cblock * iv,
 				  int encrypt);
 
 /* des.c */
-extern afs_int32 des_ecb_encrypt(afs_uint32 * clear, afs_uint32 * cipher,
+extern afs_int32 des_ecb_encrypt(void * clear, void * cipher,
 				 register des_key_schedule schedule,
 				 int encrypt);
 
diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c
index 854d3b0af..12a22a8b6 100644
--- a/src/des/pcbc_encrypt.c
+++ b/src/des/pcbc_encrypt.c
@@ -74,7 +74,7 @@ RCSID
     des_cblock *iv;             * 8 bytes of ivec *
 */
 afs_int32
-des_pcbc_encrypt(des_cblock * in, des_cblock * out, register afs_int32 length,
+des_pcbc_encrypt(void * in, void * out, register afs_int32 length,
 		 des_key_schedule key, des_cblock * iv, int encrypt)
 {
     register afs_uint32 *input = (afs_uint32 *) in;
diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h
index adffe54fa..471b8ac13 100644
--- a/src/rxkad/rxkad_prototypes.h
+++ b/src/rxkad/rxkad_prototypes.h
@@ -28,9 +28,9 @@ extern afs_int32 rxkad_EncryptPacket(const struct rx_connection *conn,
 /* domestic/fcrypt.c */
 extern int fc_keysched(struct ktc_encryptionKey *key,
 		       fc_KeySchedule schedule);
-extern afs_int32 fc_ecb_encrypt(afs_uint32 * clear, afs_uint32 * cipher,
+extern afs_int32 fc_ecb_encrypt(void * clear, void * cipher,
 				fc_KeySchedule schedule, int encrypt);
-extern afs_int32 fc_cbc_encrypt(char *input, char *output, afs_int32 length,
+extern afs_int32 fc_cbc_encrypt(void *input, void *output, afs_int32 length,
 				fc_KeySchedule key, afs_uint32 * xor,
 				int encrypt);
 
-- 
2.39.5