protoize

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16102 dc483132-0cff-0310-8789-dd5450dbe970

11 files changed, 32 insertions, 53 deletions

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 0e469642d..409e09b34 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-18  Ken Raeburn  <raeburn@mit.edu>
+
+	* afsstring2key.c, d3_cbc.c, d3_kysched.c, f_cbc.c, f_cksum.c,
+	f_parity.c, f_sched.c, key_sched.c, string2key.c, weak_key.c: Use
+	ANSI C style function definitions.
+
 2004-02-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* f_tables.h (DES_DO_ENCRYPT, DES_DO_DECRYPT): Allocate temporary
diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c
index 264414b76..97ec2d8a1 100644
--- a/src/lib/crypto/des/afsstring2key.c
+++ b/src/lib/crypto/des/afsstring2key.c
@@ -68,10 +68,8 @@ char *afs_crypt (const char *, const char *, char *);
 #define min(a,b) ((a)>(b)?(b):(a))
 
 krb5_error_code
-mit_afs_string_to_key (keyblock, data, salt)
-     krb5_keyblock * keyblock;
-     const krb5_data * data;
-     const krb5_data * salt;
+mit_afs_string_to_key (krb5_keyblock *keyblock, const krb5_data *data,
+		       const krb5_data *salt)
 {
   /* totally different approach from MIT string2key. */
   /* much of the work has already been done by the only caller 
@@ -338,10 +336,9 @@ static const char	S[8][64] = {
 };
  
  
-char *afs_crypt(pw, salt, iobuf)
-     const char *pw;
-     const char *salt;
-     char *iobuf;		/* must be at least 16 bytes */
+char *afs_crypt(const char *pw, const char *salt,
+		/* must be at least 16 bytes */
+		char *iobuf)
 {
 	int i, j, c;
 	int temp;
@@ -405,9 +402,7 @@ char *afs_crypt(pw, salt, iobuf)
  * Set up the key schedule from the key.
  */
  
-static void krb5_afs_crypt_setkey(key, E, KS)
-     char *key;
-     char *E, (*KS)[48];
+static void krb5_afs_crypt_setkey(char *key, char *E, char (*KS)[48])
 {
 	register int i, j, k;
 	int t;
@@ -467,9 +462,7 @@ static void krb5_afs_crypt_setkey(key, E, KS)
  * The payoff: encrypt a block.
  */
  
-static void krb5_afs_encrypt(block, E, KS)
-     char *block;
-     char *E, (*KS)[48];
+static void krb5_afs_encrypt(char *block, char *E, char (*KS)[48])
 {
 	const long edflag = 0;
 	int i, ii;
diff --git a/src/lib/crypto/des/d3_cbc.c b/src/lib/crypto/des/d3_cbc.c
index c49c6eafb..3ff1c1186 100644
--- a/src/lib/crypto/des/d3_cbc.c
+++ b/src/lib/crypto/des/d3_cbc.c
@@ -29,13 +29,11 @@
 
 #undef mit_des3_cbc_encrypt
 int
-mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, enc)
-	const mit_des_cblock *in;
-	mit_des_cblock *out;
-	unsigned long length;
-	const mit_des_key_schedule ks1, ks2, ks3;
-	const mit_des_cblock ivec;
-	int enc;
+mit_des3_cbc_encrypt(const mit_des_cblock *in, mit_des_cblock *out,
+		     unsigned long length, const mit_des_key_schedule ks1,
+		     const mit_des_key_schedule ks2,
+		     const mit_des_key_schedule ks3,
+		     const mit_des_cblock ivec, int enc)
 {
     if (enc)
 	krb5int_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec);
diff --git a/src/lib/crypto/des/d3_kysched.c b/src/lib/crypto/des/d3_kysched.c
index 2bc93a9a2..f18cc2419 100644
--- a/src/lib/crypto/des/d3_kysched.c
+++ b/src/lib/crypto/des/d3_kysched.c
@@ -24,9 +24,7 @@
 #include "des_int.h"
 
 int
-mit_des3_key_sched(k,schedule)
-    mit_des3_cblock k;
-    mit_des3_key_schedule schedule;
+mit_des3_key_sched(mit_des3_cblock k, mit_des3_key_schedule schedule)
 {
     mit_des_make_key_sched(k[0],schedule[0]);
     mit_des_make_key_sched(k[1],schedule[1]);
diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index aa15fefed..3dfb99724 100644
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -40,13 +40,9 @@ const mit_des_cblock mit_des_zeroblock /* = all zero */;
 
 #undef mit_des_cbc_encrypt
 int
-mit_des_cbc_encrypt(in, out, length, schedule, ivec, enc)
-	const mit_des_cblock *in;
-	mit_des_cblock *out;
-	unsigned long length;
-	const mit_des_key_schedule schedule;
-	const mit_des_cblock ivec;
-	int enc;
+mit_des_cbc_encrypt(const mit_des_cblock *in, mit_des_cblock *out,
+		    unsigned long length, const mit_des_key_schedule schedule,
+		    const mit_des_cblock ivec, int enc)
 {
     /*
      * Deal with encryption and decryption separately.
diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c
index 781a1f4fa..0e9ebf3f4 100644
--- a/src/lib/crypto/des/f_cksum.c
+++ b/src/lib/crypto/des/f_cksum.c
@@ -29,12 +29,9 @@
  */
 
 unsigned long
-mit_des_cbc_cksum(in, out, length, schedule, ivec)
-	const krb5_octet *in;
-	krb5_octet *out;
-	unsigned long length;
-	const mit_des_key_schedule schedule;
-	const krb5_octet *ivec;
+mit_des_cbc_cksum(const krb5_octet *in, krb5_octet *out,
+		  unsigned long length, const mit_des_key_schedule schedule,
+		  const krb5_octet *ivec)
 {
 	register unsigned DES_INT32 left, right;
 	const unsigned DES_INT32 *kp;
diff --git a/src/lib/crypto/des/f_parity.c b/src/lib/crypto/des/f_parity.c
index e68bdd629..26cf6039b 100644
--- a/src/lib/crypto/des/f_parity.c
+++ b/src/lib/crypto/des/f_parity.c
@@ -21,8 +21,7 @@
 #define parity_char(x) pstep(pstep(pstep((x),4),2),1)
 
 void
-mit_des_fixup_key_parity(key)
-     register mit_des_cblock key;
+mit_des_fixup_key_parity(mit_des_cblock key)
 {
     int i;
     for (i=0; i<sizeof(mit_des_cblock); i++) 
@@ -40,8 +39,7 @@ mit_des_fixup_key_parity(key)
  *                       correct des parity.
  */
 int
-mit_des_check_key_parity(key)
-     register mit_des_cblock key;
+mit_des_check_key_parity(mit_des_cblock key)
 {
     int i;
     
diff --git a/src/lib/crypto/des/f_sched.c b/src/lib/crypto/des/f_sched.c
index a3b1bf0e4..99d1dc313 100644
--- a/src/lib/crypto/des/f_sched.c
+++ b/src/lib/crypto/des/f_sched.c
@@ -220,9 +220,7 @@ static const unsigned DES_INT32 PC2_D[4][64] = {
  * Permute the key to give us our key schedule.
  */
 int
-mit_des_make_key_sched(key, schedule)
-     mit_des_cblock key;
-     mit_des_key_schedule schedule;
+mit_des_make_key_sched(mit_des_cblock key, mit_des_key_schedule schedule)
 {
 	register unsigned DES_INT32 c, d;
 
diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c
index b28c16fae..26449a94c 100644
--- a/src/lib/crypto/des/key_sched.c
+++ b/src/lib/crypto/des/key_sched.c
@@ -46,9 +46,7 @@
 #include "des_int.h"
 
 int
-mit_des_key_sched(k,schedule)
-    mit_des_cblock k;
-    mit_des_key_schedule schedule;
+mit_des_key_sched(mit_des_cblock k, mit_des_key_schedule schedule)
 {
     mit_des_make_key_sched(k,schedule);
 
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index 6a8eb1906..73e1ae449 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -72,10 +72,8 @@
 /*#define PRINT_TEST_VECTORS*/
 
 krb5_error_code
-mit_des_string_to_key_int (keyblock, data, salt)
-    krb5_keyblock * keyblock;
-    const krb5_data * data;
-    const krb5_data * salt;
+mit_des_string_to_key_int (krb5_keyblock *keyblock, const krb5_data *data,
+			   const krb5_data *salt)
 {
     register krb5_octet *str, *copystr;
     register krb5_octet *key;
diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c
index 4408d8a96..005b16387 100644
--- a/src/lib/crypto/des/weak_key.c
+++ b/src/lib/crypto/des/weak_key.c
@@ -71,8 +71,7 @@ static const mit_des_cblock weak[16] = {
  * Requires: key has correct odd parity.
  */
 int
-mit_des_is_weak_key(key)
-     mit_des_cblock key;
+mit_des_is_weak_key(mit_des_cblock key)
 {
     int i;
     const mit_des_cblock *weak_p = weak;