Fix ghastly DES declarations, and all consequential warnings.

5 files changed, 22 insertions, 29 deletions

diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c
index 5761bf186a..907e2e94b0 100644
--- a/crypto/evp/e_cbc_3d.c
+++ b/crypto/evp/e_cbc_3d.c
@@ -122,8 +122,8 @@ int enc;
 
 	if (key != NULL)
 		{
-		des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-		des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+		des_set_key(key,ctx->c.des_ede.ks1);
+		des_set_key(&(key[8]),ctx->c.des_ede.ks2);
 		memcpy( (char *)ctx->c.des_ede.ks3,
 			(char *)ctx->c.des_ede.ks1,
 			sizeof(ctx->c.des_ede.ks1));
@@ -142,9 +142,9 @@ int enc;
 
 	if (key != NULL)
 		{
-		des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-		des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
-		des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+		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);
 		}
 	}
 
@@ -154,10 +154,8 @@ unsigned char *out;
 unsigned char *in;
 unsigned int inl;
 	{
-	des_ede3_cbc_encrypt(
-		(des_cblock *)in,(des_cblock *)out,
-		(long)inl, ctx->c.des_ede.ks1,
+	des_ede3_cbc_encrypt(in,out,inl, ctx->c.des_ede.ks1,
 		ctx->c.des_ede.ks2,ctx->c.des_ede.ks3,
-		(des_cblock *)&(ctx->iv[0]),
+		&(ctx->iv[0]),
 		ctx->encrypt);
 	}
diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c
index 9ae4558f51..554815ec8a 100644
--- a/crypto/evp/e_cfb_d.c
+++ b/crypto/evp/e_cfb_d.c
@@ -101,7 +101,7 @@ int enc;
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		des_set_key((des_cblock *)key,ctx->c.des_ks);
+		des_set_key(key,ctx->c.des_ks);
 	}
 
 static void des_cfb_cipher(ctx,out,in,inl)
@@ -113,6 +113,6 @@ unsigned int inl;
 	des_cfb64_encrypt(
 		in,out,
 		(long)inl, ctx->c.des_ks,
-		(des_cblock *)&(ctx->iv[0]),
+		&(ctx->iv[0]),
 		&ctx->num,ctx->encrypt);
 	}
diff --git a/crypto/evp/e_ecb_3d.c b/crypto/evp/e_ecb_3d.c
index 908fc0760a..13d7611bb3 100644
--- a/crypto/evp/e_ecb_3d.c
+++ b/crypto/evp/e_ecb_3d.c
@@ -117,8 +117,8 @@ int enc;
 	{
 	if (key != NULL)
 		{
-		des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-		des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+		des_set_key(key,ctx->c.des_ede.ks1);
+		des_set_key(&(key[8]),ctx->c.des_ede.ks2);
 		memcpy( (char *)ctx->c.des_ede.ks3,
 			(char *)ctx->c.des_ede.ks1,
 			sizeof(ctx->c.des_ede.ks1));
@@ -133,9 +133,9 @@ int enc;
 	{
 	if (key != NULL)
 		{
-		des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-		des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
-		des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+		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);
 		}
 	}
 
@@ -151,8 +151,7 @@ unsigned int inl;
 	inl-=8;
 	for (i=0; i<=inl; i+=8)
 		{
-		des_ecb3_encrypt(
-			(des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
+		des_ecb3_encrypt(&(in[i]),&(out[i]),
 			ctx->c.des_ede.ks1,
 			ctx->c.des_ede.ks2,
 			ctx->c.des_ede.ks3,
diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c
index 7a409d6459..de3aff5ce2 100644
--- a/crypto/evp/e_ecb_d.c
+++ b/crypto/evp/e_ecb_d.c
@@ -96,7 +96,7 @@ unsigned char *iv;
 int enc;
 	{
 	if (key != NULL)
-		des_set_key((des_cblock *)key,ctx->c.des_ks);
+		des_set_key(key,ctx->c.des_ks);
 	}
 
 static void des_ecb_cipher(ctx,out,in,inl)
@@ -111,8 +111,6 @@ unsigned int inl;
 	inl-=8;
 	for (i=0; i<=inl; i+=8)
 		{
-		des_ecb_encrypt(
-			(des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
-			ctx->c.des_ks,ctx->encrypt);
+		des_ecb_encrypt(&(in[i]),&(out[i]),ctx->c.des_ks,ctx->encrypt);
 		}
 	}
diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index 0d7fda0c47..b0bae80970 100644
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -100,7 +100,7 @@ int enc;
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
 		{
-		des_set_key((des_cblock *)key,ctx->c.desx_cbc.ks);
+		des_set_key(key,ctx->c.desx_cbc.ks);
 		memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8);
 		memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8);
 		}
@@ -112,11 +112,9 @@ unsigned char *out;
 unsigned char *in;
 unsigned int inl;
 	{
-	des_xcbc_encrypt(
-		(des_cblock *)in,(des_cblock *)out,
-		(long)inl, ctx->c.desx_cbc.ks,
-		(des_cblock *)&(ctx->iv[0]),
-		(des_cblock *)&(ctx->c.desx_cbc.inw[0]),
-		(des_cblock *)&(ctx->c.desx_cbc.outw[0]),
+	des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks,
+		&(ctx->iv[0]),
+		&(ctx->c.desx_cbc.inw[0]),
+		&(ctx->c.desx_cbc.outw[0]),
 		ctx->encrypt);
 	}