diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-10-10 03:18:22 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-10-10 03:18:22 +0000 |
| commit | 7613acc70e37ebabd7743da02da4f4ff0d218d5c (patch) | |
| tree | ea7b08ad73cfb7cd8a5ca8e77a9fb646770804f0 /src/lib/crypto/old | |
| parent | ad4d9f8d0f83524931da62aebb592ab53f2218d9 (diff) | |
| download | krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.gz krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.xz krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.zip | |
Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;
don't worry about restoring them when importing new versions of code.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/old')
| -rw-r--r-- | src/lib/crypto/old/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/crypto/old/des_stringtokey.c | 4 | ||||
| -rw-r--r-- | src/lib/crypto/old/old.h | 16 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index 19067e342..af64760ce 100644 --- a/src/lib/crypto/old/ChangeLog +++ b/src/lib/crypto/old/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * des_stringtokey.c, old.h: Make prototypes unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * des_stringtokey.c: Don't explicitly declare pointers FAR any diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c index 55b0c0f44..c27d77ae3 100644 --- a/src/lib/crypto/old/des_stringtokey.c +++ b/src/lib/crypto/old/des_stringtokey.c @@ -30,9 +30,9 @@ /* XXX */ extern krb5_error_code mit_des_string_to_key_int -KRB5_PROTOTYPE ((krb5_keyblock * keyblock, +(krb5_keyblock * keyblock, const krb5_data * data, - const krb5_data * salt)); + const krb5_data * salt); krb5_error_code krb5_des_string_to_key(enc, string, salt, key) diff --git a/src/lib/crypto/old/old.h b/src/lib/crypto/old/old.h index a0523254e..b22b1684d 100644 --- a/src/lib/crypto/old/old.h +++ b/src/lib/crypto/old/old.h @@ -27,25 +27,25 @@ #include "k5-int.h" void krb5_old_encrypt_length -KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, +(const struct krb5_enc_provider *enc, const struct krb5_hash_provider *hash, - size_t input, size_t *length)); + size_t input, size_t *length); krb5_error_code krb5_old_encrypt -KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, +(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_data *output); krb5_error_code krb5_old_decrypt -KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, +(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_data *arg_output); krb5_error_code krb5_des_string_to_key -KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, +(const struct krb5_enc_provider *enc, const krb5_data *string, const krb5_data *salt, - krb5_keyblock *key)); + krb5_keyblock *key); |