* raw-des.c (mit_raw_des_decrypt_func): ditto.

	(mit_raw_des_encrypt_func): ditto.
	* des-md5.c (mit_des_md5_decrypt_funct): cast zero_ivec.
	(mit_des_md5_encrypt_funct): ditto.

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 96ca8d86e4bf0caf7f6b98467a097d9064dd606d..07ebbe0083e5aeeaa719b66969b3dc354b862ff5 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -3,6 +3,10 @@ Tue Oct 18 15:46:01 1994  Mark Eichin  (eichin@cygnus.com)
        * des-crc.c (mit_des_crc_decrypt_func): cast key->key->contents to
        krb5_pointer to satisfy sunos cc about :? argument types.
        (mit_des_crc_encrypt_funct): ditto.
+       * raw-des.c (mit_raw_des_decrypt_func): ditto.
+       (mit_raw_des_encrypt_func): ditto.
+       * des-md5.c (mit_des_md5_decrypt_funct): cast zero_ivec.
+       (mit_des_md5_encrypt_funct): ditto.
 
 Fri Oct 14 00:37:08 1994  Theodore Y. Ts'o  (tytso@dcl)
 

diff --git a/src/lib/crypto/des-md5.c b/src/lib/crypto/des-md5.c
index def6d379ab7ecce66c64f34b4783d91ca4e9571b..ea9bd95a5ce9b898106d6502bb8e2a26d70ee592 100644 (file)
--- a/src/lib/crypto/des-md5.c
+++ b/src/lib/crypto/des-md5.c
@@ -127,7 +127,7 @@ OLDDECLARG(krb5_pointer, ivec)
                                out,
                                sumsize, 
                                (struct mit_des_ks_struct *) key->priv, 
-                               ivec ? ivec : zero_ivec,
+                               ivec ? ivec : (krb5_pointer)zero_ivec,
                                MIT_DES_ENCRYPT));
     
 }
@@ -157,7 +157,7 @@ OLDDECLARG(krb5_pointer, ivec)
                                 out,
                                 size,
                                 (struct mit_des_ks_struct *) key->priv,
-                                ivec ? ivec : zero_ivec,
+                                ivec ? ivec : (krb5_pointer)zero_ivec,
                                 MIT_DES_DECRYPT);
     if (retval)
        return retval;

diff --git a/src/lib/crypto/raw-des.c b/src/lib/crypto/raw-des.c
index 73ae6e3c0739cc1f1a066b153d62b7cc58d36f7d..bb0a7a4dcb360b4ce6507f39a8bd93756f7487bf 100644 (file)
--- a/src/lib/crypto/raw-des.c
+++ b/src/lib/crypto/raw-des.c
@@ -76,7 +76,7 @@ OLDDECLARG(krb5_pointer, ivec)
                                 out, 
                                 size, 
                                 (struct mit_des_ks_struct *)key->priv, 
-                                ivec ? ivec : key->key->contents,
+                                ivec ? ivec : (krb5_pointer)key->key->contents,
                                 MIT_DES_DECRYPT));
 }
 
@@ -109,7 +109,7 @@ OLDDECLARG(krb5_pointer, ivec)
                                 out, 
                                 sumsize, 
                                 (struct mit_des_ks_struct *)key->priv, 
-                                ivec ? ivec : key->key->contents,
+                                ivec ? ivec : (krb5_pointer)key->key->contents,
                                 MIT_DES_ENCRYPT));
 }