Change type of various DES function arguments from des_cblock

(meaning pointer to char) to des_cblock * (meaning pointer to
array with 8 char elements), which allows the compiler to
do more typechecking.  (The changed argument types were of type
des_cblock * back in SSLeay, and a lot of ugly casts were
used then to turn them into pointers to elements; but it can be
done without those casts.)

Introduce new type const_des_cblock -- before, the pointers rather
than the elements pointed to were declared const, and for
some reason gcc did not complain about this (but some other
compilers did).

1 files changed, 6 insertions, 6 deletions

diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index 1f936fa74b..5362a551bf 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -65,7 +65,7 @@
 
 void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 	     long length, des_key_schedule ks1, des_key_schedule ks2,
-	     des_key_schedule ks3, des_cblock ivec, int *num, int enc)
+	     des_key_schedule ks3, des_cblock *ivec, int *num, int enc)
 	{
 	register DES_LONG v0,v1;
 	register long l=length;
@@ -73,7 +73,7 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 	DES_LONG ti[2];
 	unsigned char *iv,c,cc;
 
-	iv=ivec;
+	iv=&(*ivec)[0];
 	if (enc)
 		{
 		while (l--)
@@ -89,10 +89,10 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 				v0=ti[0];
 				v1=ti[1];
 
-				iv=ivec;
+				iv = &(*ivec)[0];
 				l2c(v0,iv);
 				l2c(v1,iv);
-				iv=ivec;
+				iv = &(*ivec)[0];
 				}
 			c= *(in++)^iv[n];
 			*(out++)=c;
@@ -115,10 +115,10 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 				v0=ti[0];
 				v1=ti[1];
 
-				iv=ivec;
+				iv = &(*ivec)[0];
 				l2c(v0,iv);
 				l2c(v1,iv);
-				iv=ivec;
+				iv = &(*ivec)[0];
 				}
 			cc= *(in++);
 			c=iv[n];