fix/add casts as needed

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13170 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 13 insertions, 6 deletions

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 7e9c1900b..af1ccab65 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-10  Ken Raeburn  <raeburn@mit.edu>
+
+	* checksum.c (krb5_dk_make_checksum): Add casts when mixing
+	pointers with different target signedness.
+	* dk_decrypt.c (krb5_dk_decrypt): Likewise.
+	* stringtokey.c (krb5_dk_string_to_key): Likewise.
+
 2001-03-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* checksum.c, derive.c, dk.h, dk_decrypt.c, dk_encrypt.c,
diff --git a/src/lib/crypto/dk/checksum.c b/src/lib/crypto/dk/checksum.c
index ab1d00a92..efa3f2172 100644
--- a/src/lib/crypto/dk/checksum.c
+++ b/src/lib/crypto/dk/checksum.c
@@ -73,7 +73,7 @@ krb5_dk_make_checksum(hash, key, usage, input, output)
 
     /* derive the key */
  
-    datain.data = constantdata;
+    datain.data = (char *) constantdata;
     datain.length = K5CLENGTH;
 
     datain.data[0] = (usage>>24)&0xff;
diff --git a/src/lib/crypto/dk/dk_decrypt.c b/src/lib/crypto/dk/dk_decrypt.c
index cd43c09a8..adc4d2348 100644
--- a/src/lib/crypto/dk/dk_decrypt.c
+++ b/src/lib/crypto/dk/dk_decrypt.c
@@ -79,7 +79,7 @@ krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
 
     /* derive the keys */
 
-    d1.data = constantdata;
+    d1.data = (char *) constantdata;
     d1.length = K5CLENGTH;
 
     d1.data[0] = (usage>>24)&0xff;
@@ -103,20 +103,20 @@ krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
     d1.data = input->data;
 
     d2.length = enclen;
-    d2.data = plaindata;
+    d2.data = (char *) plaindata;
 
     if ((ret = ((*(enc->decrypt))(&ke, ivec, &d1, &d2))) != 0)
 	goto cleanup;
 
     if (ivec != NULL && ivec->length == blocksize)
-	cn = d1.data + d1.length - blocksize;
+	cn = (unsigned char *) d1.data + d1.length - blocksize;
     else
 	cn = NULL;
 
     /* verify the hash */
 
     d1.length = hashsize;
-    d1.data = cksum;
+    d1.data = (char *) cksum;
 
     if ((ret = krb5_hmac(hash, &ki, 1, &d2, &d1)) != 0)
 	goto cleanup;
diff --git a/src/lib/crypto/dk/stringtokey.c b/src/lib/crypto/dk/stringtokey.c
index 1bbbe5731..57371cdf6 100644
--- a/src/lib/crypto/dk/stringtokey.c
+++ b/src/lib/crypto/dk/stringtokey.c
@@ -78,7 +78,7 @@ krb5_dk_string_to_key(enc, string, salt, key)
     /* now derive the key from this one */
 
     indata.length = kerberos_len;
-    indata.data = (unsigned char *) kerberos;
+    indata.data = (char *) kerberos;
 
     if ((ret = krb5_derive_key(enc, &foldkey, key, &indata)))
 	memset(key->contents, 0, key->length);