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, 12 insertions, 8 deletions

diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c
index 3c16f5a4e0..02ccc6dc90 100644
--- a/crypto/evp/e_cbc_3d.c
+++ b/crypto/evp/e_cbc_3d.c
@@ -107,14 +107,16 @@ EVP_CIPHER *EVP_des_ede3_cbc(void)
 static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	     unsigned char *iv, int enc)
 	{
+	des_cblock *deskey = (des_cblock *)key;
+
 	if (iv != NULL)
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 
-	if (key != NULL)
+	if (deskey != NULL)
 		{
-		des_set_key(key,ctx->c.des_ede.ks1);
-		des_set_key(&(key[8]),ctx->c.des_ede.ks2);
+		des_set_key(&deskey[0],ctx->c.des_ede.ks1);
+		des_set_key(&deskey[1],ctx->c.des_ede.ks2);
 		memcpy( (char *)ctx->c.des_ede.ks3,
 			(char *)ctx->c.des_ede.ks1,
 			sizeof(ctx->c.des_ede.ks1));
@@ -124,15 +126,17 @@ static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 static void des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	     unsigned char *iv, int enc)
 	{
+	des_cblock *deskey = (des_cblock *)key;
+
 	if (iv != NULL)
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 
-	if (key != NULL)
+	if (deskey != NULL)
 		{
-		des_set_key(key,ctx->c.des_ede.ks1);
-		des_set_key(&(key[8]),ctx->c.des_ede.ks2);
-		des_set_key(&(key[16]),ctx->c.des_ede.ks3);
+		des_set_key(&deskey[0],ctx->c.des_ede.ks1);
+		des_set_key(&deskey[1],ctx->c.des_ede.ks2);
+		des_set_key(&deskey[2],ctx->c.des_ede.ks3);
 		}
 	}
 
@@ -141,7 +145,7 @@ static void des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	{
 	des_ede3_cbc_encrypt(in,out,inl, ctx->c.des_ede.ks1,
 		ctx->c.des_ede.ks2,ctx->c.des_ede.ks3,
-		&(ctx->iv[0]),
+		(des_cblock *) &(ctx->iv[0]),
 		ctx->encrypt);
 	}
 #endif