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, 9 insertions, 9 deletions

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 11ef8913d4..70b870f4b0 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -67,24 +67,24 @@
 #include "podd.h"
 #include "sk.h"
 
-static int check_parity(const des_cblock key);
+static int check_parity(const_des_cblock *key);
 OPENSSL_GLOBAL int des_check_key=0;
 
-void des_set_odd_parity(des_cblock key)
+void des_set_odd_parity(des_cblock *key)
 	{
 	int i;
 
 	for (i=0; i<DES_KEY_SZ; i++)
-		key[i]=odd_parity[key[i]];
+		(*key)[i]=odd_parity[(*key)[i]];
 	}
 
-static int check_parity(const des_cblock key)
+static int check_parity(const_des_cblock *key)
 	{
 	int i;
 
 	for (i=0; i<DES_KEY_SZ; i++)
 		{
-		if (key[i] != odd_parity[key[i]])
+		if ((*key)[i] != odd_parity[(*key)[i]])
 			return(0);
 		}
 	return(1);
@@ -120,7 +120,7 @@ static des_cblock weak_keys[NUM_WEAK_KEY]={
 	{0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
 	{0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
 
-int des_is_weak_key(const des_cblock key)
+int des_is_weak_key(const_des_cblock *key)
 	{
 	int i;
 
@@ -149,7 +149,7 @@ int des_is_weak_key(const des_cblock key)
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
-int des_set_key(const des_cblock key, des_key_schedule schedule)
+int des_set_key(const_des_cblock *key, des_key_schedule schedule)
 	{
 	static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
 	register DES_LONG c,d,t,s,t2;
@@ -167,7 +167,7 @@ int des_set_key(const des_cblock key, des_key_schedule schedule)
 		}
 
 	k=(DES_LONG *)schedule;
-	in=key;
+	in = &(*key)[0];
 
 	c2l(in,c);
 	c2l(in,d);
@@ -228,7 +228,7 @@ int des_set_key(const des_cblock key, des_key_schedule schedule)
 	return(0);
 	}
 
-int des_key_sched(const des_cblock key, des_key_schedule schedule)
+int des_key_sched(const_des_cblock *key, des_key_schedule schedule)
 	{
 	return(des_set_key(key,schedule));
 	}