krb5_const -> const

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

7 files changed, 74 insertions, 69 deletions

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index ac67ff9..7e9c190 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* checksum.c, derive.c, dk.h, dk_decrypt.c, dk_encrypt.c,
+	stringtokey.c: Use const instead of krb5_const.
+
 2001-01-23  Ken Raeburn  <raeburn@mit.edu>
 
 	* stringtokey.c (kerberos): Now const.
diff --git a/src/lib/crypto/dk/checksum.c b/src/lib/crypto/dk/checksum.c
index 535ea7c..ab1d00a 100644
--- a/src/lib/crypto/dk/checksum.c
+++ b/src/lib/crypto/dk/checksum.c
@@ -32,10 +32,10 @@
 
 krb5_error_code
 krb5_dk_make_checksum(hash, key, usage, input, output)
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *input;
+     const krb5_data *input;
      krb5_data *output;
 {
     int i;
@@ -106,10 +106,10 @@ cleanup:
 #ifdef ATHENA_DES3_KLUDGE
 krb5_error_code
 krb5_marc_dk_make_checksum(hash, key, usage, input, output)
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *input;
+     const krb5_data *input;
      krb5_data *output;
 {
     int i;
diff --git a/src/lib/crypto/dk/derive.c b/src/lib/crypto/dk/derive.c
index dbd4a2a..8129ae8 100644
--- a/src/lib/crypto/dk/derive.c
+++ b/src/lib/crypto/dk/derive.c
@@ -29,10 +29,10 @@
 
 krb5_error_code
 krb5_derive_key(enc, inkey, outkey, in_constant)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const krb5_keyblock *inkey;
+     const struct krb5_enc_provider *enc;
+     const krb5_keyblock *inkey;
      krb5_keyblock *outkey;
-     krb5_const krb5_data *in_constant;
+     const krb5_data *in_constant;
 {
     size_t blocksize, keybytes, keylength, n;
     unsigned char *inblockdata, *outblockdata, *rawkey;
diff --git a/src/lib/crypto/dk/dk.h b/src/lib/crypto/dk/dk.h
index 996fed1..57be71d 100644
--- a/src/lib/crypto/dk/dk.h
+++ b/src/lib/crypto/dk/dk.h
@@ -27,61 +27,61 @@
 #include "k5-int.h"
 
 void krb5_dk_encrypt_length
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
+KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+		const struct krb5_hash_provider *hash,
 		size_t input, size_t *length));
 
 krb5_error_code krb5_dk_encrypt
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *ivec,
-		krb5_const krb5_data *input, krb5_data *output));
+KRB5_PROTOTYPE((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_error_code krb5_dk_decrypt
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *ivec, krb5_const krb5_data *input,
+KRB5_PROTOTYPE((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 *arg_output));
 
 krb5_error_code krb5_dk_string_to_key
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc, 
-		krb5_const krb5_data *string, krb5_const krb5_data *salt,
+KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, 
+		const krb5_data *string, const krb5_data *salt,
 		krb5_keyblock *key));
 
 krb5_error_code krb5_derive_key
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const krb5_keyblock *inkey,
-		krb5_keyblock *outkey, krb5_const krb5_data *in_constant));
+KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+		const krb5_keyblock *inkey,
+		krb5_keyblock *outkey, const krb5_data *in_constant));
 
 krb5_error_code krb5_dk_make_checksum
-KRB5_PROTOTYPE((krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *input, krb5_data *output));
+KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+		const krb5_keyblock *key, krb5_keyusage usage,
+		const krb5_data *input, krb5_data *output));
 
 #ifdef ATHENA_DES3_KLUDGE
 void krb5_marc_dk_encrypt_length
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
+KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+		const struct krb5_hash_provider *hash,
 		size_t input, size_t *length));
 
 krb5_error_code krb5_marc_dk_encrypt
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *ivec,
-		krb5_const krb5_data *input, krb5_data *output));
+KRB5_PROTOTYPE((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_error_code krb5_marc_dk_decrypt
-KRB5_PROTOTYPE((krb5_const struct krb5_enc_provider *enc,
-		krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *ivec, krb5_const krb5_data *input,
+KRB5_PROTOTYPE((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 *arg_output));
 
 krb5_error_code krb5_marc_dk_make_checksum
-KRB5_PROTOTYPE((krb5_const struct krb5_hash_provider *hash,
-		krb5_const krb5_keyblock *key, krb5_keyusage usage,
-		krb5_const krb5_data *input, krb5_data *output));
+KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+		const krb5_keyblock *key, krb5_keyusage usage,
+		const krb5_data *input, krb5_data *output));
 #endif /* ATHENA_DES3_KLUDGE */
diff --git a/src/lib/crypto/dk/dk_decrypt.c b/src/lib/crypto/dk/dk_decrypt.c
index d6e7c0d..cd43c09 100644
--- a/src/lib/crypto/dk/dk_decrypt.c
+++ b/src/lib/crypto/dk/dk_decrypt.c
@@ -31,12 +31,12 @@
 
 krb5_error_code
 krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *ivec;
-     krb5_const krb5_data *input;
+     const krb5_data *ivec;
+     const krb5_data *input;
      krb5_data *output;
 {
     krb5_error_code ret;
@@ -161,12 +161,12 @@ cleanup:
 #ifdef ATHENA_DES3_KLUDGE
 krb5_error_code
 krb5_marc_dk_decrypt(enc, hash, key, usage, ivec, input, output)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *ivec;
-     krb5_const krb5_data *input;
+     const krb5_data *ivec;
+     const krb5_data *input;
      krb5_data *output;
 {
     krb5_error_code ret;
diff --git a/src/lib/crypto/dk/dk_encrypt.c b/src/lib/crypto/dk/dk_encrypt.c
index 2bc2b6b..eb9fe5f 100644
--- a/src/lib/crypto/dk/dk_encrypt.c
+++ b/src/lib/crypto/dk/dk_encrypt.c
@@ -38,8 +38,8 @@
 
 void
 krb5_dk_encrypt_length(enc, hash, inputlen, length)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
      size_t inputlen;
      size_t *length;
 {
@@ -53,12 +53,12 @@ krb5_dk_encrypt_length(enc, hash, inputlen, length)
 
 krb5_error_code
 krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *ivec;
-     krb5_const krb5_data *input;
+     const krb5_data *ivec;
+     const krb5_data *input;
      krb5_data *output;
 {
     size_t blocksize, keybytes, keylength, plainlen, enclen;
@@ -180,8 +180,8 @@ cleanup:
 #ifdef ATHENA_DES3_KLUDGE
 void
 krb5_marc_dk_encrypt_length(enc, hash, inputlen, length)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
      size_t inputlen;
      size_t *length;
 {
@@ -195,12 +195,12 @@ krb5_marc_dk_encrypt_length(enc, hash, inputlen, length)
 
 krb5_error_code
 krb5_marc_dk_encrypt(enc, hash, key, usage, ivec, input, output)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const struct krb5_hash_provider *hash;
-     krb5_const krb5_keyblock *key;
+     const struct krb5_enc_provider *enc;
+     const struct krb5_hash_provider *hash;
+     const krb5_keyblock *key;
      krb5_keyusage usage;
-     krb5_const krb5_data *ivec;
-     krb5_const krb5_data *input;
+     const krb5_data *ivec;
+     const krb5_data *input;
      krb5_data *output;
 {
     size_t blocksize, keybytes, keylength, plainlen, enclen;
diff --git a/src/lib/crypto/dk/stringtokey.c b/src/lib/crypto/dk/stringtokey.c
index 549a2e1..1bbbe57 100644
--- a/src/lib/crypto/dk/stringtokey.c
+++ b/src/lib/crypto/dk/stringtokey.c
@@ -31,9 +31,9 @@ static const unsigned char kerberos[] = "kerberos";
 
 krb5_error_code
 krb5_dk_string_to_key(enc, string, salt, key)
-     krb5_const struct krb5_enc_provider *enc;
-     krb5_const krb5_data *string;
-     krb5_const krb5_data *salt;
+     const struct krb5_enc_provider *enc;
+     const krb5_data *string;
+     const krb5_data *salt;
      krb5_keyblock *key;
 {
     krb5_error_code ret;