change unsigned char * to void *

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15686 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/des/des.c

@@ -267,9 +267,11 @@ DES_ecb_encrypt(DES_cblock *input, DES_cblock *output,
  */
 
 void
-DES_cbc_encrypt(unsigned char *input, unsigned char *output, long length,
+DES_cbc_encrypt(const void *in, void *out, long length,
 		DES_key_schedule *ks, DES_cblock *iv, int forward_encrypt)
 {
+    const unsigned char *input = in;
+    unsigned char *output = out;
     uint32_t u[2];
     uint32_t uiv[2];
 
@@ -328,9 +330,11 @@ DES_cbc_encrypt(unsigned char *input, unsigned char *output, long length,
  */
 
 void
-DES_pcbc_encrypt(unsigned char *input, unsigned char *output, long length,
+DES_pcbc_encrypt(const void *in, void *out, long length,
 		 DES_key_schedule *ks, DES_cblock *iv, int forward_encrypt)
 {
+    const unsigned char *input = in;
+    unsigned char *output = out;
     uint32_t u[2];
     uint32_t uiv[2];
 
@@ -430,11 +434,13 @@ DES_ecb3_encrypt(DES_cblock *input,
  */
 
 void
-DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
+DES_ede3_cbc_encrypt(const void *in, void *out,
 		     long length, DES_key_schedule *ks1, 
 		     DES_key_schedule *ks2, DES_key_schedule *ks3,
 		     DES_cblock *iv, int forward_encrypt)
 {
+    const unsigned char *input = in;
+    unsigned char *output = out;
     uint32_t u[2];
     uint32_t uiv[2];
 
@@ -494,10 +500,12 @@ DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
  */
 
 void
-DES_cfb64_encrypt(unsigned char *input, unsigned char *output, 
+DES_cfb64_encrypt(const void *in, void *out, 
 		  long length, DES_key_schedule *ks, DES_cblock *iv,
 		  int *num, int forward_encrypt)
 {
+    const unsigned char *input = in;
+    unsigned char *output = out;
     unsigned char tmp[DES_CBLOCK_LEN];
     uint32_t uiv[2];
 
@@ -555,9 +563,10 @@ DES_cfb64_encrypt(unsigned char *input, unsigned char *output,
  */
 
 uint32_t
-DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
+DES_cbc_cksum(const void *in, DES_cblock *output,
 	      long length, DES_key_schedule *ks, DES_cblock *iv)
 {
+    const unsigned char *input = in;
     uint32_t uiv[2];
     uint32_t u[2] = { 0, 0 };
 

lib/des/des.h

@@ -59,10 +59,10 @@ int	DES_read_password(DES_cblock *, char *, int);
 
 int	UI_UTIL_read_pw_string(char *, int, const char *, int); /* XXX */
 
-void	DES_rand_data(unsigned char *, int);
+void	DES_rand_data(void *, int);
 void	DES_set_random_generator_seed(DES_cblock *);
 void	DES_generate_random_block(DES_cblock *);
-void	DES_set_sequence_number(unsigned char *);
+void	DES_set_sequence_number(void *);
 void 	DES_init_random_number_generator(DES_cblock *);
 void	DES_random_key(DES_cblock *);
 
@@ -71,18 +71,18 @@ void	DES_encrypt(uint32_t [2], DES_key_schedule *, int);
 void	DES_ecb_encrypt(DES_cblock *, DES_cblock *, DES_key_schedule *, int);
 void	DES_ecb3_encrypt(DES_cblock *,DES_cblock *, DES_key_schedule *,
 			 DES_key_schedule *, DES_key_schedule *, int);
-void	DES_pcbc_encrypt(unsigned char *, unsigned char *, long,
+void	DES_pcbc_encrypt(const void *, void *, long,
 			 DES_key_schedule *, DES_cblock *, int);
-void	DES_cbc_encrypt(unsigned char *, unsigned char *, long,
+void	DES_cbc_encrypt(const void *, void *, long,
 			DES_key_schedule *, DES_cblock *, int);
-void	DES_ede3_cbc_encrypt(const unsigned char *, unsigned char *, long, 
+void	DES_ede3_cbc_encrypt(const void *, void *, long, 
 			     DES_key_schedule *, DES_key_schedule *, 
 			     DES_key_schedule *, DES_cblock *, int);
-void DES_cfb64_encrypt(unsigned char *, unsigned char *, long,
+void DES_cfb64_encrypt(const void *, void *, long,
 		       DES_key_schedule *, DES_cblock *, int *, int);
 
 
-uint32_t DES_cbc_cksum(const unsigned char *, DES_cblock *,
+uint32_t DES_cbc_cksum(const void *, DES_cblock *,
 		      long, DES_key_schedule *, DES_cblock *);
 
 

lib/des/rnd_keys.c

@@ -240,8 +240,9 @@ static RETSIGTYPE
  * It's not neccessary to be root to run it.
  */
 void
-DES_rand_data(unsigned char *data, int size)
+DES_rand_data(void *outdata, int size)
 {
+    unsigned char *data = outdata;
     struct itimerval tv, otv;
     RETSIGTYPE (*osa)(int);
     int i, j;
@@ -388,7 +389,7 @@ memcpy((char *)sequence_index, (ll), sizeof(sequence_index));
  * Set the sequnce number to this value (a long long).
  */
 void
-DES_set_sequence_number(unsigned char *ll)
+DES_set_sequence_number(void *ll)
 {
     set_sequence_number(ll);
 }