Fix ghastly DES declarations, and all consequential warnings.

1 files changed, 25 insertions, 28 deletions

diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 3365c1bcf3..7701580a8d 100644
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -61,8 +61,8 @@
 extern int des_check_key;
 
 void des_string_to_key(str, key)
-char *str;
-des_cblock (*key);
+const char *str;
+des_cblock key;
 	{
 	des_key_schedule ks;
 	int i,length;
@@ -72,38 +72,37 @@ des_cblock (*key);
 	length=strlen(str);
 #ifdef OLD_STR_TO_KEY
 	for (i=0; i<length; i++)
-		(*key)[i%8]^=(str[i]<<1);
+		key[i%8]^=(str[i]<<1);
 #else /* MIT COMPATIBLE */
 	for (i=0; i<length; i++)
 		{
 		j=str[i];
 		if ((i%16) < 8)
-			(*key)[i%8]^=(j<<1);
+			key[i%8]^=(j<<1);
 		else
 			{
 			/* Reverse the bit order 05/05/92 eay */
 			j=((j<<4)&0xf0)|((j>>4)&0x0f);
 			j=((j<<2)&0xcc)|((j>>2)&0x33);
 			j=((j<<1)&0xaa)|((j>>1)&0x55);
-			(*key)[7-(i%8)]^=j;
+			key[7-(i%8)]^=j;
 			}
 		}
 #endif
-	des_set_odd_parity((des_cblock *)key);
+	des_set_odd_parity(key);
 	i=des_check_key;
 	des_check_key=0;
-	des_set_key((des_cblock *)key,ks);
+	des_set_key(key,ks);
 	des_check_key=i;
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key,(long)length,ks,
-		(des_cblock *)key);
+	des_cbc_cksum(str,key,length,ks,key);
 	memset(ks,0,sizeof(ks));
-	des_set_odd_parity((des_cblock *)key);
+	des_set_odd_parity(key);
 	}
 
 void des_string_to_2keys(str, key1, key2)
-char *str;
-des_cblock (*key1);
-des_cblock (*key2);
+const char *str;
+des_cblock key1;
+des_cblock key2;
 	{
 	des_key_schedule ks;
 	int i,length;
@@ -117,7 +116,7 @@ des_cblock (*key2);
 		{
 		for (i=0; i<length; i++)
 			{
-			(*key2)[i]=(*key1)[i]=(str[i]<<1);
+			key2[i]=key1[i]=(str[i]<<1);
 			}
 		}
 	else
@@ -125,9 +124,9 @@ des_cblock (*key2);
 		for (i=0; i<length; i++)
 			{
 			if ((i/8)&1)
-				(*key2)[i%8]^=(str[i]<<1);
+				key2[i%8]^=(str[i]<<1);
 			else
-				(*key1)[i%8]^=(str[i]<<1);
+				key1[i%8]^=(str[i]<<1);
 			}
 		}
 #else /* MIT COMPATIBLE */
@@ -137,9 +136,9 @@ des_cblock (*key2);
 		if ((i%32) < 16)
 			{
 			if ((i%16) < 8)
-				(*key1)[i%8]^=(j<<1);
+				key1[i%8]^=(j<<1);
 			else
-				(*key2)[i%8]^=(j<<1);
+				key2[i%8]^=(j<<1);
 			}
 		else
 			{
@@ -147,23 +146,21 @@ des_cblock (*key2);
 			j=((j<<2)&0xcc)|((j>>2)&0x33);
 			j=((j<<1)&0xaa)|((j>>1)&0x55);
 			if ((i%16) < 8)
-				(*key1)[7-(i%8)]^=j;
+				key1[7-(i%8)]^=j;
 			else
-				(*key2)[7-(i%8)]^=j;
+				key2[7-(i%8)]^=j;
 			}
 		}
 	if (length <= 8) memcpy(key2,key1,8);
 #endif
-	des_set_odd_parity((des_cblock *)key1);
-	des_set_odd_parity((des_cblock *)key2);
+	des_set_odd_parity(key1);
+	des_set_odd_parity(key2);
 	i=des_check_key;
 	des_check_key=0;
-	des_set_key((des_cblock *)key1,ks);
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key1,(long)length,ks,
-		(des_cblock *)key1);
-	des_set_key((des_cblock *)key2,ks);
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key2,(long)length,ks,
-		(des_cblock *)key2);
+	des_set_key(key1,ks);
+	des_cbc_cksum(str,key1,length,ks,key1);
+	des_set_key(key2,ks);
+	des_cbc_cksum(str,key2,length,ks,key2);
 	des_check_key=i;
 	memset(ks,0,sizeof(ks));
 	des_set_odd_parity(key1);