protoize

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

5 files changed, 49 insertions, 75 deletions

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 98adf7537..af7d148da 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-18  Ken Raeburn  <raeburn@mit.edu>
+
+	* checksum.c, derive.c, dk_decrypt.c, dk_encrypt.c: Use ANSI C
+	style function definitions.
+
 2004-02-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* dk_decrypt.c (krb5_dk_decrypt_maybe_trunc_hmac): New argument
diff --git a/src/lib/crypto/dk/checksum.c b/src/lib/crypto/dk/checksum.c
index ffdb4e7ce..4cd540d39 100644
--- a/src/lib/crypto/dk/checksum.c
+++ b/src/lib/crypto/dk/checksum.c
@@ -31,12 +31,9 @@
 #define K5CLENGTH 5 /* 32 bit net byte order integer + one byte seed */
 
 krb5_error_code
-krb5_dk_make_checksum(hash, key, usage, input, output)
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *input;
-     krb5_data *output;
+krb5_dk_make_checksum(const struct krb5_hash_provider *hash,
+		      const krb5_keyblock *key, krb5_keyusage usage,
+		      const krb5_data *input, krb5_data *output)
 {
     int i;
     const struct krb5_enc_provider *enc;
@@ -106,12 +103,9 @@ cleanup:
 
 #ifdef ATHENA_DES3_KLUDGE
 krb5_error_code
-krb5_marc_dk_make_checksum(hash, key, usage, input, output)
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *input;
-     krb5_data *output;
+krb5_marc_dk_make_checksum(const struct krb5_hash_provider *hash,
+			   const krb5_keyblock *key, krb5_keyusage usage,
+			   const krb5_data *input, krb5_data *output)
 {
     int i;
     struct krb5_enc_provider *enc;
diff --git a/src/lib/crypto/dk/derive.c b/src/lib/crypto/dk/derive.c
index 6c8ff0bdc..6c55c5e52 100644
--- a/src/lib/crypto/dk/derive.c
+++ b/src/lib/crypto/dk/derive.c
@@ -28,11 +28,9 @@
 #include "dk.h"
 
 krb5_error_code
-krb5_derive_key(enc, inkey, outkey, in_constant)
-     const struct krb5_enc_provider *enc;
-     const krb5_keyblock *inkey;
-     krb5_keyblock *outkey;
-     const krb5_data *in_constant;
+krb5_derive_key(const struct krb5_enc_provider *enc,
+		const krb5_keyblock *inkey, krb5_keyblock *outkey,
+		const krb5_data *in_constant)
 {
     size_t blocksize, keybytes, keylength, n;
     unsigned char *inblockdata, *outblockdata, *rawkey;
@@ -115,11 +113,9 @@ krb5_derive_key(enc, inkey, outkey, in_constant)
 
 
 krb5_error_code
-krb5_derive_random(enc, inkey, outrnd, in_constant)
-     const struct krb5_enc_provider *enc;
-     const krb5_keyblock *inkey;
-     krb5_data *outrnd;
-     const krb5_data *in_constant;
+krb5_derive_random(const struct krb5_enc_provider *enc,
+		   const krb5_keyblock *inkey, krb5_data *outrnd,
+		   const krb5_data *in_constant)
 {
     size_t blocksize, keybytes, keylength, n;
     unsigned char *inblockdata, *outblockdata, *rawkey;
diff --git a/src/lib/crypto/dk/dk_decrypt.c b/src/lib/crypto/dk/dk_decrypt.c
index 823eefa27..bebd2665e 100644
--- a/src/lib/crypto/dk/dk_decrypt.c
+++ b/src/lib/crypto/dk/dk_decrypt.c
@@ -41,45 +41,34 @@ krb5_dk_decrypt_maybe_trunc_hmac(const struct krb5_enc_provider *enc,
 				 int ivec_mode);
 
 krb5_error_code
-krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
+krb5_dk_decrypt(const struct krb5_enc_provider *enc,
+		const struct krb5_hash_provider *hash,
+		const krb5_keyblock *key, krb5_keyusage usage,
+		const krb5_data *ivec, const krb5_data *input,
+		krb5_data *output)
 {
     return krb5_dk_decrypt_maybe_trunc_hmac(enc, hash, key, usage,
 					    ivec, input, output, 0, 0);
 }
 
 krb5_error_code
-krb5int_aes_dk_decrypt(enc, hash, key, usage, ivec, input, output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
+krb5int_aes_dk_decrypt(const struct krb5_enc_provider *enc,
+		       const struct krb5_hash_provider *hash,
+		       const krb5_keyblock *key, krb5_keyusage usage,
+		       const krb5_data *ivec, const krb5_data *input,
+		       krb5_data *output)
 {
     return krb5_dk_decrypt_maybe_trunc_hmac(enc, hash, key, usage,
 					    ivec, input, output, 96 / 8, 1);
 }
 
 static krb5_error_code
-krb5_dk_decrypt_maybe_trunc_hmac(enc, hash, key, usage, ivec, input, output,
-				 hmacsize, ivec_mode)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
-     size_t hmacsize;
-     int ivec_mode;
+krb5_dk_decrypt_maybe_trunc_hmac(const struct krb5_enc_provider *enc,
+				 const struct krb5_hash_provider *hash,
+				 const krb5_keyblock *key, krb5_keyusage usage,
+				 const krb5_data *ivec, const krb5_data *input,
+				 krb5_data *output, size_t hmacsize,
+				 int ivec_mode)
 {
     krb5_error_code ret;
     size_t hashsize, blocksize, keybytes, keylength, enclen, plainlen;
diff --git a/src/lib/crypto/dk/dk_encrypt.c b/src/lib/crypto/dk/dk_encrypt.c
index cf6b826a4..08d26856c 100644
--- a/src/lib/crypto/dk/dk_encrypt.c
+++ b/src/lib/crypto/dk/dk_encrypt.c
@@ -37,11 +37,9 @@
    include these bits of info. */
 
 void
-krb5_dk_encrypt_length(enc, hash, inputlen, length)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     size_t inputlen;
-     size_t *length;
+krb5_dk_encrypt_length(const struct krb5_enc_provider *enc,
+		       const struct krb5_hash_provider *hash,
+		       size_t inputlen, size_t *length)
 {
     size_t blocksize, hashsize;
 
@@ -51,14 +49,11 @@ krb5_dk_encrypt_length(enc, hash, inputlen, length)
 }
 
 krb5_error_code
-krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
+krb5_dk_encrypt(const struct krb5_enc_provider *enc,
+		const struct krb5_hash_provider *hash,
+		const krb5_keyblock *key, krb5_keyusage usage,
+		const krb5_data *ivec, const krb5_data *input,
+		krb5_data *output)
 {
     size_t blocksize, keybytes, keylength, plainlen, enclen;
     krb5_error_code ret;
@@ -180,11 +175,9 @@ cleanup:
 /* Not necessarily "AES", per se, but "a CBC+CTS mode block cipher
    with a 96-bit truncated HMAC".  */
 void
-krb5int_aes_encrypt_length(enc, hash, inputlen, length)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     size_t inputlen;
-     size_t *length;
+krb5int_aes_encrypt_length(const struct krb5_enc_provider *enc,
+			   const struct krb5_hash_provider *hash,
+			   size_t inputlen, size_t *length)
 {
     size_t blocksize, hashsize;
 
@@ -221,14 +214,11 @@ trunc_hmac (const struct krb5_hash_provider *hash,
 }
 
 krb5_error_code
-krb5int_aes_dk_encrypt(enc, hash, key, usage, ivec, input, output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
+krb5int_aes_dk_encrypt(const struct krb5_enc_provider *enc,
+		       const struct krb5_hash_provider *hash,
+		       const krb5_keyblock *key, krb5_keyusage usage,
+		       const krb5_data *ivec, const krb5_data *input,
+		       krb5_data *output)
 {
     size_t blocksize, keybytes, keylength, plainlen, enclen;
     krb5_error_code ret;