diff options
Diffstat (limited to 'src/lib')
88 files changed, 1074 insertions, 1030 deletions
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index 5379f01..696218b 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * crc.c: Make prototypes unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * crc.c: Don't declare pointers FAR any more. diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c index 9cefe06..b0f7240 100644 --- a/src/lib/crypto/crc32/crc.c +++ b/src/lib/crypto/crc32/crc.c @@ -149,20 +149,20 @@ static u_long const crc_table[256] = { /* Windows needs to these prototypes for crc32_cksumtable_entry below */ static krb5_error_code -crc32_sum_func PROTOTYPE(( +crc32_sum_func ( const krb5_pointer in, const size_t in_length, const krb5_pointer seed, const size_t seed_length, - krb5_checksum *outcksum)); + krb5_checksum *outcksum); static krb5_error_code -crc32_verify_func PROTOTYPE(( +crc32_verify_func ( const krb5_checksum *cksum, const krb5_pointer in, const size_t in_length, const krb5_pointer seed, - const size_t seed_length)); + const size_t seed_length); static krb5_error_code crc32_sum_func(in, in_length, seed, seed_length, outcksum) diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog index 63cbd02..a82f001 100644 --- a/src/lib/crypto/dk/ChangeLog +++ b/src/lib/crypto/dk/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * dk.h: Make prototypes unconditional. + 2001-06-21 Ken Raeburn <raeburn@mit.edu> * derive.c: Include etypes.h. diff --git a/src/lib/crypto/dk/dk.h b/src/lib/crypto/dk/dk.h index 57be71d..8d4c497 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((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_dk_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)); + const krb5_data *input, krb5_data *output); krb5_error_code krb5_dk_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_dk_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); krb5_error_code krb5_derive_key -KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, +(const struct krb5_enc_provider *enc, const krb5_keyblock *inkey, - krb5_keyblock *outkey, const krb5_data *in_constant)); + krb5_keyblock *outkey, const krb5_data *in_constant); krb5_error_code krb5_dk_make_checksum -KRB5_PROTOTYPE((const struct krb5_hash_provider *hash, +(const struct krb5_hash_provider *hash, const krb5_keyblock *key, krb5_keyusage usage, - const krb5_data *input, krb5_data *output)); + const krb5_data *input, krb5_data *output); #ifdef ATHENA_DES3_KLUDGE void krb5_marc_dk_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_marc_dk_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)); + const krb5_data *input, krb5_data *output); krb5_error_code krb5_marc_dk_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_marc_dk_make_checksum -KRB5_PROTOTYPE((const struct krb5_hash_provider *hash, +(const struct krb5_hash_provider *hash, const krb5_keyblock *key, krb5_keyusage usage, - const krb5_data *input, krb5_data *output)); + const krb5_data *input, krb5_data *output); #endif /* ATHENA_DES3_KLUDGE */ diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 47fe113..eaa3689 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * t_mddriver.c: Make prototypes unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * md5.c, rsa-md5.h: Don't explicitly declare pointers FAR any diff --git a/src/lib/crypto/md5/t_mddriver.c b/src/lib/crypto/md5/t_mddriver.c index 237c832..d894aaa 100644 --- a/src/lib/crypto/md5/t_mddriver.c +++ b/src/lib/crypto/md5/t_mddriver.c @@ -37,12 +37,12 @@ documentation and/or software. #define TEST_BLOCK_LEN 1000 #define TEST_BLOCK_COUNT 1000 -static void MDString PROTOTYPE ((char *)); -static void MDTimeTrial PROTOTYPE ((void)); -static void MDTestSuite PROTOTYPE ((void)); -static void MDFile PROTOTYPE ((char *)); -static void MDFilter PROTOTYPE ((void)); -static void MDPrint PROTOTYPE ((unsigned char [16])); +static void MDString (char *); +static void MDTimeTrial (void); +static void MDTestSuite (void); +static void MDFile (char *); +static void MDFilter (void); +static void MDPrint (unsigned char [16]); struct md_test_entry { char *string; diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index 19067e3..af64760 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 55b0c0f..c27d77a 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 a052325..b22b168 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); diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog index bf10d3e..6d145e3 100644 --- a/src/lib/crypto/raw/ChangeLog +++ b/src/lib/crypto/raw/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * raw.h: Make prototypes unconditional. + 2001-03-05 Ken Raeburn <raeburn@mit.edu> * raw.h, raw_decrypt.c, raw_encrypt.c: Use const instead of diff --git a/src/lib/crypto/raw/raw.h b/src/lib/crypto/raw/raw.h index 79c235d..d3f7dd8 100644 --- a/src/lib/crypto/raw/raw.h +++ b/src/lib/crypto/raw/raw.h @@ -27,20 +27,20 @@ #include "k5-int.h" void krb5_raw_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_raw_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_raw_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); diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 92e17dc..275a5c6 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * gssapi.hin, gssapiP_generic.h: Make prototypes unconditional. + * gssapi.hin (PROTOTYPE): Don't define. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> Windows still requires DLL specs for variables. diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin index 80f7c45..9aaf563 100644 --- a/src/lib/gssapi/generic/gssapi.hin +++ b/src/lib/gssapi/generic/gssapi.hin @@ -46,17 +46,6 @@ #define GSS_SIZEOF_SHORT SIZEOF_SHORT /* - * Make sure we have a definition for PROTOTYPE. - */ -#if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(__cplusplus) || defined(_WIN32) || defined(__ultrix) -#define PROTOTYPE(x) x -#else -#define PROTOTYPE(x) () -#endif -#endif - -/* * First, include stddef.h to get size_t defined. */ #if HAVE_STDDEF_H @@ -431,7 +420,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_EXPORT_NAME; /* Function Prototypes */ OM_uint32 KRB5_CALLCONV gss_acquire_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t, /* desired_name */ OM_uint32, /* time_req */ gss_OID_set, /* desired_mechs */ @@ -439,15 +428,15 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ gss_cred_id_t *, /* output_cred_handle */ gss_OID_set *, /* actual_mechs */ OM_uint32 * /* time_rec */ - )); + ); OM_uint32 KRB5_CALLCONV gss_release_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t * /* cred_handle */ - )); + ); OM_uint32 KRB5_CALLCONV gss_init_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* claimant_cred_handle */ gss_ctx_id_t *, /* context_handle */ gss_name_t, /* target_name */ @@ -460,10 +449,10 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ gss_buffer_t, /* output_token */ OM_uint32 *, /* ret_flags */ OM_uint32 * /* time_rec */ - )); + ); OM_uint32 KRB5_CALLCONV gss_accept_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t *, /* context_handle */ gss_cred_id_t, /* acceptor_cred_handle */ gss_buffer_t, /* input_token_buffer */ @@ -474,127 +463,127 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ OM_uint32 *, /* ret_flags */ OM_uint32 *, /* time_rec */ gss_cred_id_t * /* delegated_cred_handle */ - )); + ); OM_uint32 KRB5_CALLCONV gss_process_context_token -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t /* token_buffer */ - )); + ); OM_uint32 KRB5_CALLCONV gss_delete_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t *, /* context_handle */ gss_buffer_t /* output_token */ - )); + ); OM_uint32 KRB5_CALLCONV gss_context_time -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ OM_uint32 * /* time_rec */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_get_mic -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_qop_t, /* qop_req */ gss_buffer_t, /* message_buffer */ gss_buffer_t /* message_token */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_verify_mic -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* message_buffer */ gss_buffer_t, /* message_token */ gss_qop_t * /* qop_state */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_wrap -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ gss_qop_t, /* qop_req */ gss_buffer_t, /* input_message_buffer */ int *, /* conf_state */ gss_buffer_t /* output_message_buffer */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_unwrap -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* input_message_buffer */ gss_buffer_t, /* output_message_buffer */ int *, /* conf_state */ gss_qop_t * /* qop_state */ - )); + ); OM_uint32 KRB5_CALLCONV gss_display_status -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ OM_uint32, /* status_value */ int, /* status_type */ gss_OID, /* mech_type (used to be const) */ OM_uint32 *, /* message_context */ gss_buffer_t /* status_string */ - )); + ); OM_uint32 KRB5_CALLCONV gss_indicate_mechs -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID_set * /* mech_set */ - )); + ); OM_uint32 KRB5_CALLCONV gss_compare_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t, /* name1 */ gss_name_t, /* name2 */ int * /* name_equal */ - )); + ); OM_uint32 KRB5_CALLCONV gss_display_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t, /* input_name */ gss_buffer_t, /* output_name_buffer */ gss_OID * /* output_name_type */ - )); + ); OM_uint32 KRB5_CALLCONV gss_import_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t, /* input_name_buffer */ gss_OID, /* input_name_type(used to be const) */ gss_name_t * /* output_name */ - )); + ); OM_uint32 KRB5_CALLCONV gss_release_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t * /* input_name */ - )); + ); OM_uint32 KRB5_CALLCONV gss_release_buffer -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t /* buffer */ - )); + ); OM_uint32 KRB5_CALLCONV gss_release_oid_set -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID_set * /* set */ - )); + ); OM_uint32 KRB5_CALLCONV gss_inquire_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ gss_name_t *, /* name */ OM_uint32 *, /* lifetime */ gss_cred_usage_t *, /* cred_usage */ gss_OID_set * /* mechanisms */ - )); + ); /* Last argument new for V2 */ OM_uint32 KRB5_CALLCONV gss_inquire_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_name_t *, /* src_name */ gss_name_t *, /* targ_name */ @@ -603,37 +592,37 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ OM_uint32 *, /* ctx_flags */ int *, /* locally_initiated */ int * /* open */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_wrap_size_limit -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ gss_qop_t, /* qop_req */ OM_uint32, /* req_output_size */ OM_uint32 * /* max_input_size */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_import_name_object -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ void *, /* input_name */ gss_OID, /* input_name_type */ gss_name_t * /* output_name */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_export_name_object -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t, /* input_name */ gss_OID, /* desired_name_type */ void ** /* output_name */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_add_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* input_cred_handle */ gss_name_t, /* desired_name */ gss_OID, /* desired_mech */ @@ -644,80 +633,80 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ gss_OID_set *, /* actual_mechs */ OM_uint32 *, /* initiator_time_rec */ OM_uint32 * /* acceptor_time_rec */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ gss_OID, /* mech_type */ gss_name_t *, /* name */ OM_uint32 *, /* initiator_lifetime */ OM_uint32 *, /* acceptor_lifetime */ gss_cred_usage_t * /* cred_usage */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_export_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t *, /* context_handle */ gss_buffer_t /* interprocess_token */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_import_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t, /* interprocess_token */ gss_ctx_id_t * /* context_handle */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_release_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID * /* oid */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID_set * /* oid_set */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_add_oid_set_member -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* member_oid */ gss_OID_set * /* oid_set */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_test_oid_set_member -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* member */ gss_OID_set, /* set */ int * /* present */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_str_to_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t, /* oid_str */ gss_OID * /* oid */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_oid_to_str -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* oid */ gss_buffer_t /* oid_str */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* mechanism */ gss_OID_set * /* name_types */ - )); + ); /* * The following routines are obsolete variants of gss_get_mic, gss_wrap, @@ -727,61 +716,61 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ * V1 applications to link against GSSAPI V2 implementations. */ OM_uint32 KRB5_CALLCONV gss_sign -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* qop_req */ gss_buffer_t, /* message_buffer */ gss_buffer_t /* message_token */ - )); + ); OM_uint32 KRB5_CALLCONV gss_verify -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* message_buffer */ gss_buffer_t, /* token_buffer */ int * /* qop_state */ - )); + ); OM_uint32 KRB5_CALLCONV gss_seal -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ int, /* qop_req */ gss_buffer_t, /* input_message_buffer */ int *, /* conf_state */ gss_buffer_t /* output_message_buffer */ - )); + ); OM_uint32 KRB5_CALLCONV gss_unseal -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* input_message_buffer */ gss_buffer_t, /* output_message_buffer */ int *, /* conf_state */ int * /* qop_state */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_export_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ gss_buffer_t /* exported_name */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_duplicate_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ gss_name_t * /* dest_name */ - )); + ); /* New for V2 */ OM_uint32 KRB5_CALLCONV gss_canonicalize_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ const gss_OID, /* mech_type */ gss_name_t * /* output_name */ - )); + ); #ifdef __cplusplus } diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h index 076509a..d6962f1 100644 --- a/src/lib/gssapi/generic/gssapiP_generic.h +++ b/src/lib/gssapi/generic/gssapiP_generic.h @@ -99,51 +99,51 @@ typedef struct _g_set *g_set; -int g_set_init PROTOTYPE((g_set *s)); -int g_set_destroy PROTOTYPE((g_set *s)); -int g_set_entry_add PROTOTYPE((g_set *s, void *key, void *value)); -int g_set_entry_delete PROTOTYPE((g_set *s, void *key)); -int g_set_entry_get PROTOTYPE((g_set *s, void *key, void **value)); +int g_set_init (g_set *s); +int g_set_destroy (g_set *s); +int g_set_entry_add (g_set *s, void *key, void *value); +int g_set_entry_delete (g_set *s, void *key); +int g_set_entry_get (g_set *s, void *key, void **value); -int g_save_name PROTOTYPE((void **vdb, gss_name_t *name)); -int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_save_name (void **vdb, gss_name_t *name); +int g_save_cred_id (void **vdb, gss_cred_id_t *cred); +int g_save_ctx_id (void **vdb, gss_ctx_id_t *ctx); -int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name)); -int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_validate_name (void **vdb, gss_name_t *name); +int g_validate_cred_id (void **vdb, gss_cred_id_t *cred); +int g_validate_ctx_id (void **vdb, gss_ctx_id_t *ctx); -int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name)); -int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_delete_name (void **vdb, gss_name_t *name); +int g_delete_cred_id (void **vdb, gss_cred_id_t *cred); +int g_delete_ctx_id (void **vdb, gss_ctx_id_t *ctx); -int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer)); +int g_make_string_buffer (const char *str, gss_buffer_t buffer); -int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out)); +int g_copy_OID_set (const gss_OID_set_desc * const in, gss_OID_set *out); -int g_token_size PROTOTYPE((gss_OID mech, unsigned int body_size)); +int g_token_size (gss_OID mech, unsigned int body_size); -void g_make_token_header PROTOTYPE((gss_OID mech, int body_size, - unsigned char **buf, int tok_type)); +void g_make_token_header (gss_OID mech, int body_size, + unsigned char **buf, int tok_type); -gss_int32 g_verify_token_header PROTOTYPE((gss_OID mech, int *body_size, - unsigned char **buf, int tok_type, int toksize)); +gss_int32 g_verify_token_header (gss_OID mech, int *body_size, + unsigned char **buf, int tok_type, int toksize); -OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_major_status (OM_uint32 *minor_status, OM_uint32 status_value, OM_uint32 *message_context, - gss_buffer_t status_string)); + gss_buffer_t status_string); -OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_com_err_status (OM_uint32 *minor_status, OM_uint32 status_value, - gss_buffer_t status_string)); + gss_buffer_t status_string); -gss_int32 g_order_init PROTOTYPE((void **queue, OM_uint32 seqnum, - int do_replay, int do_sequence)); +gss_int32 g_order_init (void **queue, OM_uint32 seqnum, + int do_replay, int do_sequence); -gss_int32 g_order_check PROTOTYPE((void **queue, OM_uint32 seqnum)); +gss_int32 g_order_check (void **queue, OM_uint32 seqnum); -void g_order_free PROTOTYPE((void **queue)); +void g_order_free (void **queue); gss_uint32 g_queue_size(void *vqueue, size_t *sizep); gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf, @@ -151,59 +151,59 @@ gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf, gss_uint32 g_queue_internalize(void **vqueue, unsigned char **buf, size_t *lenremain); -char *g_strdup PROTOTYPE((char *str)); +char *g_strdup (char *str); /** declarations of internal name mechanism functions **/ OM_uint32 generic_gss_release_buffer -PROTOTYPE((OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_buffer_t /* buffer */ - )); + ); OM_uint32 generic_gss_release_oid_set -PROTOTYPE((OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_OID_set* /* set */ - )); + ); OM_uint32 generic_gss_release_oid -PROTOTYPE((OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_OID* /* set */ - )); + ); OM_uint32 generic_gss_copy_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* oid */ gss_OID * /* new_oid */ - )); + ); OM_uint32 generic_gss_create_empty_oid_set -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID_set * /* oid_set */ - )); + ); OM_uint32 generic_gss_add_oid_set_member -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* member_oid */ gss_OID_set * /* oid_set */ - )); + ); OM_uint32 generic_gss_test_oid_set_member -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* member */ gss_OID_set, /* set */ int * /* present */ - )); + ); OM_uint32 generic_gss_oid_to_str -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* oid */ gss_buffer_t /* oid_str */ - )); + ); OM_uint32 generic_gss_str_to_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t, /* oid_str */ gss_OID * /* oid */ - )); + ); #endif /* _GSSAPIP_GENERIC_H_ */ diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 040dce3..e40b3fc 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * gssapiP_krb5.h, gssapi_krb5.h, k5mech.c: Make prototypes + unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * accept_sec_context.c, gssapiP_krb5.h, import_sec_context.c, diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index 16ba01f..634b9e6 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -210,53 +210,53 @@ struct kg2_option { /** helper functions **/ OM_uint32 kg_get_defcred - PROTOTYPE((OM_uint32 *minor_status, - gss_cred_id_t *cred)); + (OM_uint32 *minor_status, + gss_cred_id_t *cred); -OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status)); +OM_uint32 kg_release_defcred (OM_uint32 *minor_status); krb5_error_code kg_checksum_channel_bindings - PROTOTYPE((krb5_context context, gss_channel_bindings_t cb, + (krb5_context context, gss_channel_bindings_t cb, krb5_checksum *cksum, - int bigend)); + int bigend); -krb5_error_code kg_make_seq_num PROTOTYPE((krb5_context context, +krb5_error_code kg_make_seq_num (krb5_context context, krb5_keyblock *key, int direction, krb5_int32 seqnum, unsigned char *cksum, - unsigned char *buf)); + unsigned char *buf); -krb5_error_code kg_get_seq_num PROTOTYPE((krb5_context context, +krb5_error_code kg_get_seq_num (krb5_context context, krb5_keyblock *key, unsigned char *cksum, unsigned char *buf, int *direction, - krb5_int32 *seqnum)); + krb5_int32 *seqnum); -krb5_error_code kg_make_seed PROTOTYPE((krb5_context context, +krb5_error_code kg_make_seed (krb5_context context, krb5_keyblock *key, - unsigned char *seed)); + unsigned char *seed); -int kg_confounder_size PROTOTYPE((krb5_context context, krb5_keyblock *key)); +int kg_confounder_size (krb5_context context, krb5_keyblock *key); -krb5_error_code kg_make_confounder PROTOTYPE((krb5_context context, - krb5_keyblock *key, unsigned char *buf)); +krb5_error_code kg_make_confounder (krb5_context context, + krb5_keyblock *key, unsigned char *buf); -int kg_encrypt_size PROTOTYPE((krb5_context context, - krb5_keyblock *key, int n)); +int kg_encrypt_size (krb5_context context, + krb5_keyblock *key, int n); -krb5_error_code kg_encrypt PROTOTYPE((krb5_context context, +krb5_error_code kg_encrypt (krb5_context context, krb5_keyblock *key, int usage, krb5_pointer iv, krb5_pointer in, krb5_pointer out, - int length)); + int length); -krb5_error_code kg_decrypt PROTOTYPE((krb5_context context, +krb5_error_code kg_decrypt (krb5_context context, krb5_keyblock *key, int usage, krb5_pointer iv, krb5_pointer in, krb5_pointer out, - int length)); + int length); -OM_uint32 kg_seal PROTOTYPE((krb5_context context, +OM_uint32 kg_seal (krb5_context context, OM_uint32 *minor_status, gss_ctx_id_t context_handle, int conf_req_flag, @@ -264,44 +264,44 @@ OM_uint32 kg_seal PROTOTYPE((krb5_context context, gss_buffer_t input_message_buffer, int *conf_state, gss_buffer_t output_message_buffer, - int toktype)); + int toktype); -OM_uint32 kg_unseal PROTOTYPE((krb5_context context, +OM_uint32 kg_unseal (krb5_context context, OM_uint32 *minor_status, gss_ctx_id_t context_handle, gss_buffer_t input_token_buffer, gss_buffer_t message_buffer, int *conf_state, int *qop_state, - int toktype)); + int toktype); -OM_uint32 kg_seal_size PROTOTYPE((krb5_context context, +OM_uint32 kg_seal_size (krb5_context context, OM_uint32 *minor_status, gss_ctx_id_t context_handle, int conf_req_flag, gss_qop_t qop_req, OM_uint32 output_size, - OM_uint32 *input_size)); + OM_uint32 *input_size); -krb5_error_code kg_ctx_size PROTOTYPE((krb5_context kcontext, +krb5_error_code kg_ctx_size (krb5_context kcontext, krb5_pointer arg, - size_t *sizep)); + size_t *sizep); -krb5_error_code kg_ctx_externalize PROTOTYPE((krb5_context kcontext, +krb5_error_code kg_ctx_externalize (krb5_context kcontext, krb5_pointer arg, krb5_octet **buffer, - size_t *lenremain)); + size_t *lenremain); -krb5_error_code kg_ctx_internalize PROTOTYPE((krb5_context kcontext, +krb5_error_code kg_ctx_internalize (krb5_context kcontext, krb5_pointer *argp, krb5_octet **buffer, - size_t *lenremain)); + size_t *lenremain); -OM_uint32 kg_get_context PROTOTYPE((OM_uint32 *minor_status, - krb5_context *context)); +OM_uint32 kg_get_context (OM_uint32 *minor_status, + krb5_context *context); OM_uint32 -kg2_parse_token PROTOTYPE((OM_uint32 *minor_status, +kg2_parse_token (OM_uint32 *minor_status, unsigned char *ptr, int length, krb5_ui_4 *flags, @@ -310,17 +310,17 @@ kg2_parse_token PROTOTYPE((OM_uint32 *minor_status, int noptions, struct kg2_option *options, /* INOUT */ krb5_data *kmsg, - krb5_data *mic)); + krb5_data *mic); -void kg2_intersect_ctypes PROTOTYPE((int *nc1, +void kg2_intersect_ctypes (int *nc1, krb5_cksumtype *c1, int nc2, - const krb5_cksumtype *c2)); + const krb5_cksumtype *c2); /** declarations of internal name mechanism functions **/ OM_uint32 krb5_gss_acquire_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_name_t, /* desired_name */ OM_uint32, /* time_req */ gss_OID_set, /* desired_mechs */ @@ -328,15 +328,15 @@ PROTOTYPE( (OM_uint32*, /* minor_status */ gss_cred_id_t*, /* output_cred_handle */ gss_OID_set*, /* actual_mechs */ OM_uint32* /* time_rec */ - )); + ); OM_uint32 krb5_gss_release_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_cred_id_t* /* cred_handle */ - )); + ); OM_uint32 krb5_gss_init_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_cred_id_t, /* claimant_cred_handle */ gss_ctx_id_t*, /* context_handle */ gss_name_t, /* target_name */ @@ -350,10 +350,10 @@ PROTOTYPE( (OM_uint32*, /* minor_status */ gss_buffer_t, /* output_token */ OM_uint32*, /* ret_flags */ OM_uint32* /* time_rec */ - )); + ); OM_uint32 krb5_gss_accept_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ gss_cred_id_t, /* verifier_cred_handle */ gss_buffer_t, /* input_token_buffer */ @@ -365,112 +365,112 @@ PROTOTYPE( (OM_uint32*, /* minor_status */ OM_uint32*, /* ret_flags */ OM_uint32*, /* time_rec */ gss_cred_id_t* /* delegated_cred_handle */ - )); + ); OM_uint32 krb5_gss_process_context_token -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t /* token_buffer */ - )); + ); OM_uint32 krb5_gss_delete_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ gss_buffer_t /* output_token */ - )); + ); OM_uint32 krb5_gss_context_time -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ OM_uint32* /* time_rec */ - )); + ); OM_uint32 krb5_gss_sign -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* qop_req */ gss_buffer_t, /* message_buffer */ gss_buffer_t /* message_token */ - )); + ); OM_uint32 krb5_gss_verify -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* message_buffer */ gss_buffer_t, /* token_buffer */ int* /* qop_state */ - )); + ); OM_uint32 krb5_gss_seal -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ int, /* qop_req */ gss_buffer_t, /* input_message_buffer */ int*, /* conf_state */ gss_buffer_t /* output_message_buffer */ - )); + ); OM_uint32 krb5_gss_unseal -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* input_message_buffer */ gss_buffer_t, /* output_message_buffer */ int*, /* conf_state */ int* /* qop_state */ - )); + ); OM_uint32 krb5_gss_display_status -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ OM_uint32, /* status_value */ int, /* status_type */ gss_OID, /* mech_type */ OM_uint32*, /* message_context */ gss_buffer_t /* status_string */ - )); + ); OM_uint32 krb5_gss_indicate_mechs -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_OID_set* /* mech_set */ - )); + ); OM_uint32 krb5_gss_compare_name -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_name_t, /* name1 */ gss_name_t, /* name2 */ int* /* name_equal */ - )); + ); OM_uint32 krb5_gss_display_name -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_name_t, /* input_name */ gss_buffer_t, /* output_name_buffer */ gss_OID* /* output_name_type */ - )); + ); OM_uint32 krb5_gss_import_name -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_buffer_t, /* input_name_buffer */ gss_OID, /* input_name_type */ gss_name_t* /* output_name */ - )); + ); OM_uint32 krb5_gss_release_name -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_name_t* /* input_name */ - )); + ); OM_uint32 krb5_gss_inquire_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ gss_name_t *, /* name */ OM_uint32 *, /* lifetime */ gss_cred_usage_t*,/* cred_usage */ gss_OID_set * /* mechanisms */ - )); + ); OM_uint32 krb5_gss_inquire_context -PROTOTYPE( (OM_uint32*, /* minor_status */ +(OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_name_t*, /* initiator_name */ gss_name_t*, /* acceptor_name */ @@ -479,69 +479,69 @@ PROTOTYPE( (OM_uint32*, /* minor_status */ OM_uint32*, /* ret_flags */ int*, /* locally_initiated */ int* /* open */ - )); + ); /* New V2 entry points */ OM_uint32 krb5_gss_get_mic -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_qop_t, /* qop_req */ gss_buffer_t, /* message_buffer */ gss_buffer_t /* message_token */ - )); + ); OM_uint32 krb5_gss_verify_mic -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* message_buffer */ gss_buffer_t, /* message_token */ gss_qop_t * /* qop_state */ - )); + ); OM_uint32 krb5_gss_wrap -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ gss_qop_t, /* qop_req */ gss_buffer_t, /* input_message_buffer */ int *, /* conf_state */ gss_buffer_t /* output_message_buffer */ - )); + ); OM_uint32 krb5_gss_unwrap -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t, /* input_message_buffer */ gss_buffer_t, /* output_message_buffer */ int *, /* conf_state */ gss_qop_t * /* qop_state */ - )); + ); OM_uint32 krb5_gss_wrap_size_limit -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ int, /* conf_req_flag */ gss_qop_t, /* qop_req */ OM_uint32, /* req_output_size */ OM_uint32 * /* max_input_size */ - )); + ); OM_uint32 krb5_gss_import_name_object -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ void *, /* input_name */ gss_OID, /* input_name_type */ gss_name_t * /* output_name */ - )); + ); OM_uint32 krb5_gss_export_name_object -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_name_t, /* input_name */ gss_OID, /* desired_name_type */ void * * /* output_name */ - )); + ); OM_uint32 krb5_gss_add_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* input_cred_handle */ gss_name_t, /* desired_name */ gss_OID, /* desired_mech */ @@ -552,72 +552,72 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ gss_OID_set *, /* actual_mechs */ OM_uint32 *, /* initiator_time_rec */ OM_uint32 * /* acceptor_time_rec */ - )); + ); OM_uint32 krb5_gss_inquire_cred_by_mech -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ gss_OID, /* mech_type */ gss_name_t *, /* name */ OM_uint32 *, /* initiator_lifetime */ OM_uint32 *, /* acceptor_lifetime */ gss_cred_usage_t * /* cred_usage */ - )); + ); OM_uint32 krb5_gss_export_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_ctx_id_t *, /* context_handle */ gss_buffer_t /* interprocess_token */ - )); + ); OM_uint32 krb5_gss_import_sec_context -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_buffer_t, /* interprocess_token */ gss_ctx_id_t * /* context_handle */ - )); + ); OM_uint32 krb5_gss_release_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID * /* oid */ - )); + ); OM_uint32 krb5_gss_internal_release_oid -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID * /* oid */ - )); + ); OM_uint32 krb5_gss_inquire_names_for_mech -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_OID, /* mechanism */ gss_OID_set * /* name_types */ - )); + ); OM_uint32 krb5_gss_canonicalize_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ const gss_OID, /* mech_type */ gss_name_t * /* output_name */ - )); + ); OM_uint32 krb5_gss_export_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ gss_buffer_t /* exported_name */ - )); + ); OM_uint32 krb5_gss_duplicate_name -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ const gss_name_t, /* input_name */ gss_name_t * /* dest_name */ - )); + ); OM_uint32 krb5_gss_validate_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ +(OM_uint32 *, /* minor_status */ gss_cred_id_t /* cred */ - )); + ); gss_OID krb5_gss_convert_static_mech_oid -PROTOTYPE( (gss_OID oid - )); +(gss_OID oid + ); #endif /* _GSSAPIP_KRB5_H_ */ diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h index 7557150..ea59946 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.h +++ b/src/lib/gssapi/krb5/gssapi_krb5.h @@ -52,18 +52,18 @@ extern const gss_OID_desc krb5_gss_oid_array[]; #define gss_krb5_nt_string_uid_name gss_nt_string_uid_name OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags - PROTOTYPE((OM_uint32 *minor_status, + (OM_uint32 *minor_status, gss_ctx_id_t context_handle, - krb5_flags *ticket_flags)); + krb5_flags *ticket_flags); OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache - PROTOTYPE((OM_uint32 *minor_status, + (OM_uint32 *minor_status, gss_cred_id_t cred_handle, - krb5_ccache out_ccache)); + krb5_ccache out_ccache); OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name - PROTOTYPE((OM_uint32 *minor_status, const char *name, - const char **out_name)); + (OM_uint32 *minor_status, const char *name, + const char **out_name); #ifdef __cplusplus } diff --git a/src/lib/gssapi/krb5/k5mech.c b/src/lib/gssapi/krb5/k5mech.c index 11a8ea4..5385cba 100644 --- a/src/lib/gssapi/krb5/k5mech.c +++ b/src/lib/gssapi/krb5/k5mech.c @@ -23,22 +23,22 @@ /* ident "@(#)krb5_gssd_extern_srvr.conf 1.10 95/08/01 SMI" */ OM_uint32 krb5_gss_internal_release_oid - PROTOTYPE((void *, /* context */ + (void *, /* context */ OM_uint32 *, /* minor_status */ gss_OID * /* OID */ - )); + ); extern OM_uint32 krb5_gss_get_context - PROTOTYPE((void** - )); + (void** + ); extern int krb5_pname_to_uid - PROTOTYPE((void *, /* context */ + (void *, /* context */ char *, /* principal name */ gss_OID, /* name_type */ gss_OID, /* mech_type */ uid_t * /* uid (OUT) */ - )); + ); /* * This is the declaration of the mechs_array table for Kerberos V5. diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog index 2d1da93..9d94d8f 100644 --- a/src/lib/gssapi/mechglue/ChangeLog +++ b/src/lib/gssapi/mechglue/ChangeLog @@ -1,5 +1,6 @@ 2001-10-09 Ken Raeburn <raeburn@mit.edu> + * mechglue.h: Make prototypes unconditional. * mglueP.h: Make all prototypes unconditional. (NPROTOTYPE): Macro deleted. diff --git a/src/lib/gssapi/mechglue/mechglue.h b/src/lib/gssapi/mechglue/mechglue.h index 43347a4..af57d25 100644 --- a/src/lib/gssapi/mechglue/mechglue.h +++ b/src/lib/gssapi/mechglue/mechglue.h @@ -39,7 +39,7 @@ /* GSSAPI Extension functions -- these functions aren't */ /* in the GSSAPI, but they are provided in this library */ -int gssd_pname_to_uid PROTOTYPE((char *, gss_OID, gss_OID, uid_t *)); -void gss_initialize PROTOTYPE((void)); +int gssd_pname_to_uid (char *, gss_OID, gss_OID, uid_t *); +void gss_initialize (void); #endif /* _GSS_MECHGLUE_H */ diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index fd26aa6..57b9b10 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * server_acl.h: Make prototypes unconditional. + 2001-07-31 Ezra Peisach <epeisach@mit.edu> * svr_principal.c (check_pw_reuse): Change argument for diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h index 226a4d9..2645b68 100644 --- a/src/lib/kadm5/srv/server_acl.h +++ b/src/lib/kadm5/srv/server_acl.h @@ -83,21 +83,21 @@ typedef struct _restriction { } restriction_t; krb5_error_code acl_init - KRB5_PROTOTYPE((krb5_context, + (krb5_context, int, - char *)); + char *); void acl_finish - KRB5_PROTOTYPE((krb5_context, - int)); + (krb5_context, + int); krb5_boolean acl_check - KRB5_PROTOTYPE((krb5_context, + (krb5_context, gss_name_t, krb5_int32, krb5_principal, - restriction_t **)); + restriction_t **); krb5_error_code acl_impose_restrictions - KRB5_PROTOTYPE((krb5_context, + (krb5_context, kadm5_principal_ent_rec *, long *, - restriction_t *)); + restriction_t *); #endif /* SERVER_ACL_H__ */ diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 2b52681..62f5313 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * kdb_db2.c, kdb_db2.h, kdb_dbm.c, keytab.c, t_kdb.c: Make + prototypes unconditional. + 2001-07-26 Ezra Peisach <epeisach@mit.edu> * kdb_xdr.c (krb5_dbe_update_mod_princ_data, diff --git a/src/lib/kdb/kdb_db2.c b/src/lib/kdb/kdb_db2.c index c471996..9c6e4fc 100644 --- a/src/lib/kdb/kdb_db2.c +++ b/src/lib/kdb/kdb_db2.c @@ -70,13 +70,13 @@ #include "kdb_db2.h" static char *gen_dbsuffix - PROTOTYPE((char *, char * )); + (char *, char * ); static krb5_error_code krb5_db2_db_start_update - PROTOTYPE((krb5_context)); + (krb5_context); static krb5_error_code krb5_db2_db_end_update - PROTOTYPE((krb5_context)); + (krb5_context); static krb5_error_code krb5_db2_db_set_hashfirst - PROTOTYPE((krb5_context, int)); + (krb5_context, int); static char default_db_name[] = DEFAULT_KDB_FILE; @@ -1121,7 +1121,7 @@ cleanup: krb5_error_code krb5_db2_db_iterate (context, func, func_arg) krb5_context context; - krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *)); + krb5_error_code (*func) (krb5_pointer, krb5_db_entry *); krb5_pointer func_arg; { krb5_db2_context *db_ctx; diff --git a/src/lib/kdb/kdb_db2.h b/src/lib/kdb/kdb_db2.h index fd35c81..2d4d8e9 100644 --- a/src/lib/kdb/kdb_db2.h +++ b/src/lib/kdb/kdb_db2.h @@ -69,56 +69,56 @@ typedef struct _krb5_db2_context { #define KDB2_LOCK_EXT ".ok" krb5_error_code krb5_db2_db_set_name - KRB5_PROTOTYPE((krb5_context, - char * )); + (krb5_context, + char * ); krb5_error_code krb5_db2_db_init - KRB5_PROTOTYPE((krb5_context)); + (krb5_context); krb5_error_code krb5_db2_db_fini - KRB5_PROTOTYPE((krb5_context)); + (krb5_context); krb5_error_code krb5_db2_db_get_age - KRB5_PROTOTYPE((krb5_context, + (krb5_context, char *, - time_t * )); + time_t * ); krb5_error_code krb5_db2_db_create - KRB5_PROTOTYPE((krb5_context, + (krb5_context, char *, - krb5_int32)); + krb5_int32); krb5_error_code krb5_db2_db_destroy - KRB5_PROTOTYPE((krb5_context, - char * )); + (krb5_context, + char * ); krb5_error_code krb5_db2_db_rename - KRB5_PROTOTYPE((krb5_context, + (krb5_context, char *, - char * )); + char * ); krb5_error_code krb5_db2_db_get_principal - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_const_principal, krb5_db_entry *, int *, - krb5_boolean * )); + krb5_boolean * ); void krb5_db2_db_free_principal - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_db_entry *, - int )); + int ); krb5_error_code krb5_db2_db_put_principal - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_db_entry *, - int * )); + int * ); krb5_error_code krb5_db2_db_iterate - KRB5_PROTOTYPE((krb5_context, - krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer, - krb5_db_entry *)), - krb5_pointer )); + (krb5_context, + krb5_error_code (*) (krb5_pointer, + krb5_db_entry *), + krb5_pointer ); krb5_error_code krb5_db2_db_set_nonblocking - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_boolean, - krb5_boolean * )); + krb5_boolean * ); krb5_boolean krb5_db2_db_set_lockmode - KRB5_PROTOTYPE((krb5_context, - krb5_boolean )); + (krb5_context, + krb5_boolean ); krb5_error_code krb5_db2_db_open_database - KRB5_PROTOTYPE((krb5_context)); + (krb5_context); krb5_error_code krb5_db2_db_close_database - KRB5_PROTOTYPE((krb5_context)); + (krb5_context); #endif /* KRB5_KDB_DB2_H */ diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c index 003ba3e..4769ba9 100644 --- a/src/lib/kdb/kdb_dbm.c +++ b/src/lib/kdb/kdb_dbm.c @@ -54,11 +54,11 @@ extern char *progname; static char default_db_name[] = DEFAULT_KDB_FILE; static char *gen_dbsuffix - PROTOTYPE((char *, char * )); + (char *, char * ); static krb5_error_code krb5_dbm_db_start_update - PROTOTYPE((krb5_context)); + (krb5_context); static krb5_error_code krb5_dbm_db_end_update - PROTOTYPE((krb5_context)); + (krb5_context); /* * This module contains all of the code which directly interfaces to @@ -1132,7 +1132,7 @@ cleanup: krb5_error_code krb5_dbm_db_iterate (context, func, func_arg) krb5_context context; - krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *)); + krb5_error_code (*func) (krb5_pointer, krb5_db_entry *); krb5_pointer func_arg; { datum key, contents; diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c index 1e5025c..222e2d9 100644 --- a/src/lib/kdb/keytab.c +++ b/src/lib/kdb/keytab.c @@ -28,10 +28,10 @@ #include "k5-int.h" #include "kdb_kt.h" -krb5_error_code krb5_ktkdb_close KRB5_PROTOTYPE((krb5_context, krb5_keytab)); +krb5_error_code krb5_ktkdb_close (krb5_context, krb5_keytab); -krb5_error_code krb5_ktkdb_get_entry KRB5_PROTOTYPE((krb5_context, krb5_keytab, krb5_const_principal, - krb5_kvno, krb5_enctype, krb5_keytab_entry *)); +krb5_error_code krb5_ktkdb_get_entry (krb5_context, krb5_keytab, krb5_const_principal, + krb5_kvno, krb5_enctype, krb5_keytab_entry *); krb5_kt_ops krb5_kt_kdb_ops = { 0, diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c index 10e6163..b49e09d 100644 --- a/src/lib/kdb/t_kdb.c +++ b/src/lib/kdb/t_kdb.c @@ -84,16 +84,16 @@ krb5_principal *recorded_principals = (krb5_principal *) NULL; char **recorded_names = (char **) NULL; #ifdef BERK_DB_DBM -extern DBM *db_dbm_open PROTOTYPE((char *, int, int)); -extern void db_dbm_close PROTOTYPE((DBM *)); -extern datum db_dbm_fetch PROTOTYPE((DBM *, datum)); -extern datum db_dbm_firstkey PROTOTYPE((DBM *)); -extern datum db_dbm_nextkey PROTOTYPE((DBM *)); -extern int db_dbm_delete PROTOTYPE((DBM *, datum)); -extern int db_dbm_store PROTOTYPE((DBM *, datum, datum, int)); -extern int db_dbm_error PROTOTYPE((DBM *)); -extern int db_dbm_clearerr PROTOTYPE((DBM *)); -extern int db_dbm_dirfno PROTOTYPE((DBM *)); +extern DBM *db_dbm_open (char *, int, int); +extern void db_dbm_close (DBM *); +extern datum db_dbm_fetch (DBM *, datum); +extern datum db_dbm_firstkey (DBM *); +extern datum db_dbm_nextkey (DBM *); +extern int db_dbm_delete (DBM *, datum); +extern int db_dbm_store (DBM *, datum, datum, int); +extern int db_dbm_error (DBM *); +extern int db_dbm_clearerr (DBM *); +extern int db_dbm_dirfno (DBM *); static kdb5_dispatch_table berkeley_dispatch = { "Berkeley Hashed Database", @@ -121,10 +121,10 @@ static kdb5_dispatch_table berkeley_dispatch = { * (e.g. NetBSD-1.0) */ #ifdef MISSING_ERROR_PROTO -int dbm_error PROTOTYPE((DBM *)); +int dbm_error (DBM *); #endif #ifdef MISSING_CLEARERR_PROTO -int dbm_clearerr PROTOTYPE((DBM *)); +int dbm_clearerr (DBM *); #endif static kdb5_dispatch_table dbm_dispatch = { diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 84106b5..881f09f 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * cr_tkt.c, decomp_tkt.c, g_in_tkt.c, tf_util.c: Make prototypes + unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * dest_tkt.c, err_txt.c, g_admhst.c, g_cred.c, g_krbhst.c, diff --git a/src/lib/krb4/cr_tkt.c b/src/lib/krb4/cr_tkt.c index b688f84..74c4529 100644 --- a/src/lib/krb4/cr_tkt.c +++ b/src/lib/krb4/cr_tkt.c @@ -31,11 +31,11 @@ #include <string.h> static int -krb_cr_tkt_int PROTOTYPE((KTEXT tkt, unsigned int flags_in, char *pname, +krb_cr_tkt_int (KTEXT tkt, unsigned int flags_in, char *pname, char *pinstance, char *prealm, long paddress, char *session, int life, long time_sec, char *sname, char *sinstance, C_Block key, - krb5_keyblock *k5key)); + krb5_keyblock *k5key); /* * Create ticket takes as arguments information that should be in a diff --git a/src/lib/krb4/decomp_tkt.c b/src/lib/krb4/decomp_tkt.c index 84419d5..2508afa 100644 --- a/src/lib/krb4/decomp_tkt.c +++ b/src/lib/krb4/decomp_tkt.c @@ -35,12 +35,12 @@ extern int krb_debug; #endif -static int dcmp_tkt_int PROTOTYPE((KTEXT tkt, unsigned char *flags, +static int dcmp_tkt_int (KTEXT tkt, unsigned char *flags, char *pname, char *pinstance, char *prealm, unsigned KRB4_32 *paddress, C_Block session, int *life, unsigned KRB4_32 *time_sec, char *sname, char *sinstance, C_Block key, - Key_schedule key_s, krb5_keyblock *k5key)); + Key_schedule key_s, krb5_keyblock *k5key); /* * This routine takes a ticket and pointers to the variables that * should be filled in based on the information in the ticket. It diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c index 32f51c1..16b1966 100644 --- a/src/lib/krb4/g_in_tkt.c +++ b/src/lib/krb4/g_in_tkt.c @@ -36,12 +36,12 @@ in <krb-sed.h>, but the code below is too opaque if you can't also see them here. */ #ifndef KEY_PROC_TYPE_DEFINED -typedef int (*key_proc_type) PROTOTYPE ((char *, char *, char *, - char *, C_Block)); +typedef int (*key_proc_type) (char *, char *, char *, + char *, C_Block); #endif #ifndef DECRYPT_TKT_TYPE_DEFINED -typedef int (*decrypt_tkt_type) PROTOTYPE ((char *, char *, char *, char *, - key_proc_type, KTEXT *)); +typedef int (*decrypt_tkt_type) (char *, char *, char *, char *, + key_proc_type, KTEXT *); #endif static int diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c index 333961b..85f88d6 100644 --- a/src/lib/krb4/tf_util.c +++ b/src/lib/krb4/tf_util.c @@ -112,7 +112,7 @@ static int curpos; /* Position in tfbfr */ static int lastpos; /* End of tfbfr */ static char tfbfr[BUFSIZ]; /* Buffer for ticket data */ -static int tf_gets PROTOTYPE((char *, int)), tf_read PROTOTYPE((char *, int)); +static int tf_gets (char *, int), tf_read (char *, int); /* * This file contains routines for manipulating the ticket cache file. diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 7da653e..9a70a2d 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,9 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * asn1_decode.c, asn1_decode.h, asn1_encode.h, asn1_get.h, + asn1_k_decode.h, asn1_k_encode.h, asn1_make.h, asn1_misc.h, + asn1buf.h: Make prototypes unconditional. + 2001-07-24 Ezra Peisach <epeisach@mit.edu> * asn1_k_encode.c: (asn1_encode_predicted_sam_response): Use diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index 74d4530..e46df32 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -53,7 +53,7 @@ if(class != UNIVERSAL || construction != PRIMITIVE || tagnum != type)\ #define cleanup()\ return 0 -time_t gmt_mktime PROTOTYPE((struct tm *)); +time_t gmt_mktime (struct tm *); asn1_error_code asn1_decode_integer(buf, val) asn1buf * buf; diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 597d239..bddad88 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -59,30 +59,30 @@ Returns asn1 errors. */ asn1_error_code asn1_decode_integer - PROTOTYPE((asn1buf *buf, long *val)); + (asn1buf *buf, long *val); asn1_error_code asn1_decode_unsigned_integer - PROTOTYPE((asn1buf *buf, unsigned long *val)); + (asn1buf *buf, unsigned long *val); asn1_error_code asn1_decode_null - PROTOTYPE((asn1buf *buf)); + (asn1buf *buf); asn1_error_code asn1_decode_octetstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, asn1_octet **val)); + (asn1buf *buf, unsigned int *retlen, asn1_octet **val); asn1_error_code asn1_decode_generalstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val)); + (asn1buf *buf, unsigned int *retlen, char **val); asn1_error_code asn1_decode_charstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val)); + (asn1buf *buf, unsigned int *retlen, char **val); /* Note: A charstring is a special hack to account for the fact that krb5 structures store some OCTET STRING values in krb5_octet arrays and others in krb5_data structures - PROTOTYPE((which use char arrays). + (which use char arrays). From the ASN.1 point of view, the two string types are the same, only the receptacles differ. */ asn1_error_code asn1_decode_printablestring - PROTOTYPE((asn1buf *buf, int *retlen, char **val)); + (asn1buf *buf, int *retlen, char **val); asn1_error_code asn1_decode_ia5string - PROTOTYPE((asn1buf *buf, int *retlen, char **val)); + (asn1buf *buf, int *retlen, char **val); asn1_error_code asn1_decode_generaltime - PROTOTYPE((asn1buf *buf, time_t *val)); + (asn1buf *buf, time_t *val); #endif diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index 06ba6f3..e5ae4bb 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -50,7 +50,7 @@ */ asn1_error_code asn1_encode_integer - PROTOTYPE((asn1buf *buf, const long val, unsigned int *retlen)); + (asn1buf *buf, const long val, unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -59,8 +59,8 @@ asn1_error_code asn1_encode_integer to expand the buffer. */ asn1_error_code asn1_encode_unsigned_integer - PROTOTYPE((asn1buf *buf, const unsigned long val, - unsigned int *retlen)); + (asn1buf *buf, const unsigned long val, + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -69,9 +69,9 @@ asn1_error_code asn1_encode_unsigned_integer to expand the buffer. */ asn1_error_code asn1_encode_octetstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const asn1_octet *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -80,9 +80,9 @@ asn1_error_code asn1_encode_octetstring to expand the buffer. */ asn1_error_code asn1_encode_charstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -91,7 +91,7 @@ asn1_error_code asn1_encode_charstring to expand the buffer. */ asn1_error_code asn1_encode_null - PROTOTYPE((asn1buf *buf, int *retlen)); + (asn1buf *buf, int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of NULL into *buf and returns @@ -100,9 +100,9 @@ asn1_error_code asn1_encode_null to expand the buffer. */ asn1_error_code asn1_encode_printablestring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - int *retlen)); + int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -111,9 +111,9 @@ asn1_error_code asn1_encode_printablestring to expand the buffer. */ asn1_error_code asn1_encode_ia5string - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - int *retlen)); + int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -122,7 +122,7 @@ asn1_error_code asn1_encode_ia5string to expand the buffer. */ asn1_error_code asn1_encode_generaltime - PROTOTYPE((asn1buf *buf, const time_t val, unsigned int *retlen)); + (asn1buf *buf, const time_t val, unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -132,9 +132,9 @@ asn1_error_code asn1_encode_generaltime Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */ asn1_error_code asn1_encode_generalstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, val has a length of len characters modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h index 4503470..873abc0 100644 --- a/src/lib/krb5/asn.1/asn1_get.h +++ b/src/lib/krb5/asn.1/asn1_get.h @@ -34,17 +34,17 @@ #include "asn1buf.h" asn1_error_code asn1_get_tag_indef - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, asn1_tagnum *tagnum, - unsigned int *retlen, int *indef)); + unsigned int *retlen, int *indef); asn1_error_code asn1_get_tag - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, asn1_tagnum *tagnum, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated effects Decodes the tag in *buf. If class != NULL, returns the class in *class. Similarly, the construction, @@ -55,7 +55,7 @@ asn1_error_code asn1_get_tag Returns ASN1_OVERRUN if *buf is exhausted during the parse. */ asn1_error_code asn1_get_sequence - PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef)); + (asn1buf *buf, unsigned int *retlen, int *indef); /* requires *buf is allocated effects Decodes a tag from *buf and returns ASN1_BAD_ID if it doesn't have a sequence ID. If retlen != NULL, the @@ -65,10 +65,10 @@ asn1_error_code asn1_get_sequence /* Private Procedures */ asn1_error_code asn1_get_id - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, - asn1_tagnum *tagnum)); + asn1_tagnum *tagnum); /* requires *buf is allocated effects Decodes the group of identifier octets at *buf's current position. If class != NULL, returns the class @@ -77,7 +77,7 @@ asn1_error_code asn1_get_id Returns ASN1_OVERRUN if *buf is exhausted. */ asn1_error_code asn1_get_length - PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef)); + (asn1buf *buf, unsigned int *retlen, int *indef); /* requires *buf is allocated effects Decodes the group of length octets at *buf's current position. If retlen != NULL, the diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index 04861a4..22b2d2b 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -68,112 +68,112 @@ /* scalars */ asn1_error_code asn1_decode_int - PROTOTYPE((asn1buf *buf, int *val)); + (asn1buf *buf, int *val); asn1_error_code asn1_decode_int32 - PROTOTYPE((asn1buf *buf, krb5_int32 *val)); + (asn1buf *buf, krb5_int32 *val); asn1_error_code asn1_decode_kvno - PROTOTYPE((asn1buf *buf, krb5_kvno *val)); + (asn1buf *buf, krb5_kvno *val); asn1_error_code asn1_decode_enctype - PROTOTYPE((asn1buf *buf, krb5_enctype *val)); + (asn1buf *buf, krb5_enctype *val); asn1_error_code asn1_decode_msgtype - PROTOTYPE((asn1buf *buf, krb5_msgtype *val)); + (asn1buf *buf, krb5_msgtype *val); asn1_error_code asn1_decode_cksumtype - PROTOTYPE((asn1buf *buf, krb5_cksumtype *val)); + (asn1buf *buf, krb5_cksumtype *val); asn1_error_code asn1_decode_octet - PROTOTYPE((asn1buf *buf, krb5_octet *val)); + (asn1buf *buf, krb5_octet *val); asn1_error_code asn1_decode_addrtype - PROTOTYPE((asn1buf *buf, krb5_addrtype *val)); + (asn1buf *buf, krb5_addrtype *val); asn1_error_code asn1_decode_authdatatype - PROTOTYPE((asn1buf *buf, krb5_authdatatype *val)); + (asn1buf *buf, krb5_authdatatype *val); asn1_error_code asn1_decode_ui_2 - PROTOTYPE((asn1buf *buf, krb5_ui_2 *val)); + (asn1buf *buf, krb5_ui_2 *val); asn1_error_code asn1_decode_ui_4 - PROTOTYPE((asn1buf *buf, krb5_ui_4 *val)); + (asn1buf *buf, krb5_ui_4 *val); asn1_error_code asn1_decode_kerberos_time - PROTOTYPE((asn1buf *buf, krb5_timestamp *val)); + (asn1buf *buf, krb5_timestamp *val); asn1_error_code asn1_decode_sam_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); /* structures */ asn1_error_code asn1_decode_realm - PROTOTYPE((asn1buf *buf, krb5_principal *val)); + (asn1buf *buf, krb5_principal *val); asn1_error_code asn1_decode_principal_name - PROTOTYPE((asn1buf *buf, krb5_principal *val)); + (asn1buf *buf, krb5_principal *val); asn1_error_code asn1_decode_checksum - PROTOTYPE((asn1buf *buf, krb5_checksum *val)); + (asn1buf *buf, krb5_checksum *val); asn1_error_code asn1_decode_encryption_key - PROTOTYPE((asn1buf *buf, krb5_keyblock *val)); + (asn1buf *buf, krb5_keyblock *val); asn1_error_code asn1_decode_encrypted_data - PROTOTYPE((asn1buf *buf, krb5_enc_data *val)); + (asn1buf *buf, krb5_enc_data *val); asn1_error_code asn1_decode_ticket_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_transited_encoding - PROTOTYPE((asn1buf *buf, krb5_transited *val)); + (asn1buf *buf, krb5_transited *val); asn1_error_code asn1_decode_enc_kdc_rep_part - PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val)); + (asn1buf *buf, krb5_enc_kdc_rep_part *val); asn1_error_code asn1_decode_krb5_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_ap_options - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_kdc_options - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_ticket - PROTOTYPE((asn1buf *buf, krb5_ticket *val)); + (asn1buf *buf, krb5_ticket *val); asn1_error_code asn1_decode_kdc_req - PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); + (asn1buf *buf, krb5_kdc_req *val); asn1_error_code asn1_decode_kdc_req_body - PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); + (asn1buf *buf, krb5_kdc_req *val); asn1_error_code asn1_decode_krb_safe_body - PROTOTYPE((asn1buf *buf, krb5_safe *val)); + (asn1buf *buf, krb5_safe *val); asn1_error_code asn1_decode_host_address - PROTOTYPE((asn1buf *buf, krb5_address *val)); + (asn1buf *buf, krb5_address *val); asn1_error_code asn1_decode_kdc_rep - PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val)); + (asn1buf *buf, krb5_kdc_rep *val); asn1_error_code asn1_decode_last_req_entry - PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val)); + (asn1buf *buf, krb5_last_req_entry *val); asn1_error_code asn1_decode_authdata_elt - PROTOTYPE((asn1buf *buf, krb5_authdata *val)); + (asn1buf *buf, krb5_authdata *val); asn1_error_code asn1_decode_krb_cred_info - PROTOTYPE((asn1buf *buf, krb5_cred_info *val)); + (asn1buf *buf, krb5_cred_info *val); asn1_error_code asn1_decode_pa_data - PROTOTYPE((asn1buf *buf, krb5_pa_data *val)); + (asn1buf *buf, krb5_pa_data *val); asn1_error_code asn1_decode_passwdsequence - PROTOTYPE((asn1buf *buf, passwd_phrase_element *val)); + (asn1buf *buf, passwd_phrase_element *val); asn1_error_code asn1_decode_etype_info_entry - PROTOTYPE((asn1buf *buf, krb5_etype_info_entry *val)); + (asn1buf *buf, krb5_etype_info_entry *val); asn1_error_code asn1_decode_sam_challenge - PROTOTYPE((asn1buf *buf, krb5_sam_challenge *val)); + (asn1buf *buf, krb5_sam_challenge *val); asn1_error_code asn1_decode_enc_sam_key - PROTOTYPE((asn1buf *buf, krb5_sam_key *val)); + (asn1buf *buf, krb5_sam_key *val); asn1_error_code asn1_decode_enc_sam_response_enc - PROTOTYPE((asn1buf *buf, krb5_enc_sam_response_enc *val)); + (asn1buf *buf, krb5_enc_sam_response_enc *val); asn1_error_code asn1_decode_sam_response - PROTOTYPE((asn1buf *buf, krb5_sam_response *val)); + (asn1buf *buf, krb5_sam_response *val); asn1_error_code asn1_decode_predicted_sam_response - PROTOTYPE((asn1buf *buf, krb5_predicted_sam_response *val)); + (asn1buf *buf, krb5_predicted_sam_response *val); /* arrays */ asn1_error_code asn1_decode_authorization_data - PROTOTYPE((asn1buf *buf, krb5_authdata ***val)); + (asn1buf *buf, krb5_authdata ***val); asn1_error_code asn1_decode_host_addresses - PROTOTYPE((asn1buf *buf, krb5_address ***val)); + (asn1buf *buf, krb5_address ***val); asn1_error_code asn1_decode_sequence_of_ticket - PROTOTYPE((asn1buf *buf, krb5_ticket ***val)); + (asn1buf *buf, krb5_ticket ***val); asn1_error_code asn1_decode_sequence_of_krb_cred_info - PROTOTYPE((asn1buf *buf, krb5_cred_info ***val)); + (asn1buf *buf, krb5_cred_info ***val); asn1_error_code asn1_decode_sequence_of_pa_data - PROTOTYPE((asn1buf *buf, krb5_pa_data ***val)); + (asn1buf *buf, krb5_pa_data ***val); asn1_error_code asn1_decode_last_req - PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val)); + (asn1buf *buf, krb5_last_req_entry ***val); asn1_error_code asn1_decode_sequence_of_enctype - PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val)); + (asn1buf *buf, int *num, krb5_enctype **val); asn1_error_code asn1_decode_sequence_of_passwdsequence - PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val)); + (asn1buf *buf, passwd_phrase_element ***val); asn1_error_code asn1_decode_etype_info - PROTOTYPE((asn1buf *buf, krb5_etype_info_entry ***val)); + (asn1buf *buf, krb5_etype_info_entry ***val); #endif diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h index 6a83ecb..6d36335 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.h +++ b/src/lib/krb5/asn.1/asn1_k_encode.h @@ -105,147 +105,147 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf, Returns ENOMEM if memory runs out. */ -asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_ui_4 (asn1buf *buf, const krb5_ui_4 val, - unsigned int *retlen)); + unsigned int *retlen); -asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_msgtype (asn1buf *buf, const /*krb5_msgtype*/int val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_realm - PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen)); + (asn1buf *buf, const krb5_principal val, unsigned int *retlen); asn1_error_code asn1_encode_principal_name - PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen)); + (asn1buf *buf, const krb5_principal val, unsigned int *retlen); asn1_error_code asn1_encode_encrypted_data - PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen); asn1_error_code asn1_encode_krb5_flags - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_ap_options - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_ticket_flags - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_kdc_options - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_authorization_data - PROTOTYPE((asn1buf *buf, const krb5_authdata **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_authdata **val, unsigned int *retlen); asn1_error_code asn1_encode_krb5_authdata_elt - PROTOTYPE((asn1buf *buf, const krb5_authdata *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_authdata *val, unsigned int *retlen); asn1_error_code asn1_encode_kdc_rep - PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val, - unsigned int *retlen)); + (int msg_type, asn1buf *buf, const krb5_kdc_rep *val, + unsigned int *retlen); asn1_error_code asn1_encode_enc_kdc_rep_part - PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_kdc_rep_part *val, + unsigned int *retlen); asn1_error_code asn1_encode_ticket - PROTOTYPE((asn1buf *buf, const krb5_ticket *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_ticket *val, unsigned int *retlen); asn1_error_code asn1_encode_encryption_key - PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen); asn1_error_code asn1_encode_kerberos_time - PROTOTYPE((asn1buf *buf, const krb5_timestamp val, unsigned int *retlen)); + (asn1buf *buf, const krb5_timestamp val, unsigned int *retlen); asn1_error_code asn1_encode_checksum - PROTOTYPE((asn1buf *buf, const krb5_checksum *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_checksum *val, unsigned int *retlen); asn1_error_code asn1_encode_host_address - PROTOTYPE((asn1buf *buf, const krb5_address *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_address *val, unsigned int *retlen); asn1_error_code asn1_encode_host_addresses - PROTOTYPE((asn1buf *buf, const krb5_address **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_address **val, unsigned int *retlen); asn1_error_code asn1_encode_transited_encoding - PROTOTYPE((asn1buf *buf, const krb5_transited *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_transited *val, unsigned int *retlen); asn1_error_code asn1_encode_last_req - PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_last_req_entry **val, + unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_pa_data - PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_ticket - PROTOTYPE((asn1buf *buf, const krb5_ticket **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_ticket **val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_enctype - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const int len, const krb5_enctype *val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_kdc_req - PROTOTYPE((int msg_type, + (int msg_type, asn1buf *buf, const krb5_kdc_req *val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_kdc_req_body - PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen); asn1_error_code asn1_encode_krb_safe_body - PROTOTYPE((asn1buf *buf, const krb5_safe *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_safe *val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_krb_cred_info - PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen); asn1_error_code asn1_encode_krb_cred_info - PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen); asn1_error_code asn1_encode_last_req_entry - PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_last_req_entry *val, + unsigned int *retlen); asn1_error_code asn1_encode_pa_data - PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen); asn1_error_code asn1_encode_alt_method - PROTOTYPE((asn1buf *buf, const krb5_alt_method *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_alt_method *val, + unsigned int *retlen); asn1_error_code asn1_encode_etype_info_entry - PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_etype_info_entry *val, + unsigned int *retlen); asn1_error_code asn1_encode_etype_info - PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry **val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_etype_info_entry **val, + unsigned int *retlen); asn1_error_code asn1_encode_passwdsequence - PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen)); + (asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_passwdsequence - PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val, - unsigned int *retlen)); + (asn1buf *buf, const passwd_phrase_element **val, + unsigned int *retlen); asn1_error_code asn1_encode_sam_flags - PROTOTYPE((asn1buf * buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf * buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_sam_challenge - PROTOTYPE((asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen); asn1_error_code asn1_encode_sam_key - PROTOTYPE((asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen); asn1_error_code asn1_encode_enc_sam_response_enc - PROTOTYPE((asn1buf *buf, const krb5_enc_sam_response_enc *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_sam_response_enc *val, + unsigned int *retlen); asn1_error_code asn1_encode_sam_response - PROTOTYPE((asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen); asn1_error_code asn1_encode_predicted_sam_response - PROTOTYPE((asn1buf *buf, const krb5_predicted_sam_response *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_predicted_sam_response *val, + unsigned int *retlen); #endif diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index 51562f2..3fe2fca 100644 --- a/src/lib/krb5/asn.1/asn1_make.h +++ b/src/lib/krb5/asn.1/asn1_make.h @@ -47,11 +47,11 @@ */ asn1_error_code asn1_make_etag - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const asn1_class class, const asn1_tagnum tagnum, const unsigned int in_len, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen @@ -61,11 +61,11 @@ asn1_error_code asn1_make_etag Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_tag - PROTOTYPE((asn1buf *buf, const asn1_class class, + (asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, const unsigned int in_len, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen @@ -78,7 +78,7 @@ asn1_error_code asn1_make_tag the implementation. */ asn1_error_code asn1_make_sequence - PROTOTYPE((asn1buf *buf, const unsigned int seq_len, unsigned int *len)); + (asn1buf *buf, const unsigned int seq_len, unsigned int *len); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf modifies *buf, *retlen @@ -87,8 +87,8 @@ asn1_error_code asn1_make_sequence Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_set - PROTOTYPE((asn1buf *buf, const unsigned int set_len, - unsigned int *retlen)); + (asn1buf *buf, const unsigned int set_len, + unsigned int *retlen); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf modifies *buf, *retlen @@ -97,12 +97,11 @@ asn1_error_code asn1_make_set Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_string - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *string, - int *retlen)); + int *retlen); /* requires *buf is allocated, len is the length of *string - effects Inserts the encoding of *string - PROTOTYPE((a series of octets) in *buf. + effects Inserts the encoding of *string (a series of octets) in *buf. Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ @@ -112,26 +111,24 @@ asn1_error_code asn1_make_string /* "helper" procedure for asn1_make_tag */ asn1_error_code asn1_make_length - PROTOTYPE((asn1buf *buf, const unsigned int in_len, - unsigned int *retlen)); + (asn1buf *buf, const unsigned int in_len, + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen - effects inserts length octet - PROTOTYPE((s) for in_len into *buf */ + effects inserts length octet(s) for in_len into *buf */ /* "helper" procedure for asn1_make_tag */ asn1_error_code asn1_make_id - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, class and tagnum are appropriate for the ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen - effects Inserts id octet - PROTOTYPE((s) of class class and tag number tagnum + effects Inserts id octet(s) of class class and tag number tagnum into *buf */ #endif diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h index 14a5b2a..31b30da 100644 --- a/src/lib/krb5/asn.1/asn1_misc.h +++ b/src/lib/krb5/asn.1/asn1_misc.h @@ -31,7 +31,7 @@ #include "krbasn1.h" asn1_error_code asn1_krb5_realm_copy - PROTOTYPE((krb5_principal target, krb5_principal source)); + (krb5_principal target, krb5_principal source); /* requires target, source, and source->realm are allocated effects Copies source->realm into target->realm. Returns ENOMEM if memory is exhausted. */ diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h index 9d4d245..f0f8ad2 100644 --- a/src/lib/krb5/asn.1/asn1buf.h +++ b/src/lib/krb5/asn.1/asn1buf.h @@ -13,17 +13,17 @@ typedef struct code_buffer_rep { /**************** Private Procedures ****************/ int asn1buf_size - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf has been created and not destroyed effects Returns the total size - PROTOTYPE((in octets) of buf's octet buffer. */ + (in octets) of buf's octet buffer. */ #define asn1buf_size(buf) \ (((buf) == NULL || (buf)->base == NULL) \ ? 0 \ : ((buf)->bound - (buf)->base + 1)) int asn1buf_free - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf is allocated effects Returns the number of unused, allocated octets in *buf. */ #define asn1buf_free(buf) \ @@ -33,7 +33,7 @@ int asn1buf_free asn1_error_code asn1buf_ensure_space - PROTOTYPE((asn1buf *buf, const unsigned int amount)); + (asn1buf *buf, const unsigned int amount); /* requires *buf is allocated modifies *buf effects If buf has less than amount octets of free space, then it is @@ -46,14 +46,14 @@ asn1_error_code asn1buf_ensure_space asn1_error_code asn1buf_expand - PROTOTYPE((asn1buf *buf, unsigned int inc)); + (asn1buf *buf, unsigned int inc); /* requires *buf is allocated modifies *buf effects Expands *buf by allocating space for inc more octets. Returns ENOMEM if memory is exhausted. */ int asn1buf_len - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf is allocated effects Returns the length of the encoding in *buf. */ #define asn1buf_len(buf) ((buf)->next - (buf)->base) @@ -98,12 +98,12 @@ int asn1buf_len */ asn1_error_code asn1buf_create - PROTOTYPE((asn1buf **buf)); + (asn1buf **buf); /* effects Creates a new encoding buffer pointed to by *buf. Returns ENOMEM if the buffer can't be created. */ asn1_error_code asn1buf_wrap_data - PROTOTYPE((asn1buf *buf, const krb5_data *code)); + (asn1buf *buf, const krb5_data *code); /* requires *buf has already been allocated effects Turns *buf into a "wrapper" for *code. i.e. *buf is set up such that its bottom is the beginning of *code, and its top @@ -111,9 +111,9 @@ asn1_error_code asn1buf_wrap_data Returns ASN1_MISSING_FIELD if code is empty. */ asn1_error_code asn1buf_imbed - PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, + (asn1buf *subbuf, const asn1buf *buf, const unsigned int length, - const int indef)); + const int indef); /* requires *subbuf and *buf are allocated effects *subbuf becomes a sub-buffer of *buf. *subbuf begins at *buf's current position and is length octets long. @@ -122,27 +122,27 @@ asn1_error_code asn1buf_imbed position starts at the beginning of *subbuf. */ asn1_error_code asn1buf_sync - PROTOTYPE((asn1buf *buf, asn1buf *subbuf, const asn1_class class, + (asn1buf *buf, asn1buf *subbuf, const asn1_class class, const asn1_tagnum lasttag, const unsigned int length, const int indef, - const int seqindef)); + const int seqindef); /* requires *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed. lasttag is the last tagnumber read. effects Synchronizes *buf's current position to match that of *subbuf. */ asn1_error_code asn1buf_skiptail - PROTOTYPE((asn1buf *buf, const unsigned int length, - const int indef)); + (asn1buf *buf, const unsigned int length, + const int indef); /* requires *buf is a subbuffer used in a decoding of a constructed indefinite sequence. effects skips trailing fields. */ asn1_error_code asn1buf_destroy - PROTOTYPE((asn1buf **buf)); + (asn1buf **buf); /* effects Deallocates **buf, sets *buf to NULL. */ asn1_error_code asn1buf_insert_octet - PROTOTYPE((asn1buf *buf, const int o)); + (asn1buf *buf, const int o); /* requires *buf is allocated effects Inserts o into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM memory is exhausted. */ @@ -162,7 +162,7 @@ extern __inline__ asn1_error_code asn1buf_insert_octet(buf, o) #endif asn1_error_code asn1buf_insert_octetstring - PROTOTYPE((asn1buf *buf, const unsigned int len, const asn1_octet *s)); + (asn1buf *buf, const unsigned int len, const asn1_octet *s); /* requires *buf is allocated modifies *buf effects Inserts the contents of s (an octet array of length len) @@ -170,7 +170,7 @@ asn1_error_code asn1buf_insert_octetstring Returns ENOMEM if memory is exhausted. */ asn1_error_code asn1buf_insert_charstring - PROTOTYPE((asn1buf *buf, const unsigned int len, const char *s)); + (asn1buf *buf, const unsigned int len, const char *s); /* requires *buf is allocated modifies *buf effects Inserts the contents of s (a character array of length len) @@ -178,7 +178,7 @@ asn1_error_code asn1buf_insert_charstring Returns ENOMEM if memory is exhausted. */ asn1_error_code asn1buf_remove_octet - PROTOTYPE((asn1buf *buf, asn1_octet *o)); + (asn1buf *buf, asn1_octet *o); /* requires *buf is allocated effects Returns *buf's current octet in *o and advances to the next octet. @@ -189,7 +189,7 @@ asn1_error_code asn1buf_remove_octet : ((*(o) = (asn1_octet)(*(((buf)->next)++))),0)) asn1_error_code asn1buf_remove_octetstring - PROTOTYPE((asn1buf *buf, const unsigned int len, asn1_octet **s)); + (asn1buf *buf, const unsigned int len, asn1_octet **s); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. Returns ASN1_OVERRUN if there are fewer than len unread octets @@ -197,8 +197,8 @@ asn1_error_code asn1buf_remove_octetstring Returns ENOMEM if *s could not be allocated. */ asn1_error_code asn1buf_remove_charstring - PROTOTYPE((asn1buf *buf, const unsigned int len, - char **s)); + (asn1buf *buf, const unsigned int len, + char **s); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. Returns ASN1_OVERRUN if there are fewer than len unread octets @@ -206,26 +206,26 @@ asn1_error_code asn1buf_remove_charstring Returns ENOMEM if *s could not be allocated. */ asn1_error_code asn1buf_unparse - PROTOTYPE((const asn1buf *buf, char **s)); + (const asn1buf *buf, char **s); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a character in *s. */ asn1_error_code asn1buf_hex_unparse - PROTOTYPE((const asn1buf *buf, char **s)); + (const asn1buf *buf, char **s); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a 2-digit hexadecimal number in *s. */ asn1_error_code asn12krb5_buf - PROTOTYPE((const asn1buf *buf, krb5_data **code)); + (const asn1buf *buf, krb5_data **code); /* modifies *code effects Instantiates **code with the krb5_data representation of **buf. */ int asn1buf_remains - PROTOTYPE((asn1buf *buf, int indef)); + (asn1buf *buf, int indef); /* requires *buf is a buffer containing an asn.1 structure or array modifies *buf effects Returns the number of unprocessed octets remaining in *buf. */ diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 227af04..8c7f508 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * cc_file.c, cc_memory.c, cc_stdio.c, ser_cc.c: Make prototypes + unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support. diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index 2334307..68e1395 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -93,122 +93,122 @@ fcc_nseq.c and fcc_read don't check return values a lot. #endif krb5_error_code KRB5_CALLCONV krb5_fcc_close - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_destroy - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_fcc_get_name - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_fcc_initialize - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_fcc_next_cred - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_fcc_read - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf, - unsigned int len)); + unsigned int len); krb5_error_code krb5_fcc_read_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code krb5_fcc_read_keyblock - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); + (krb5_context, krb5_ccache id , krb5_keyblock *keyblock ); krb5_error_code krb5_fcc_read_data - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); + (krb5_context, krb5_ccache id , krb5_data *data ); krb5_error_code krb5_fcc_read_int32 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i )); + (krb5_context, krb5_ccache id , krb5_int32 *i ); krb5_error_code krb5_fcc_read_ui_2 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i )); + (krb5_context, krb5_ccache id , krb5_ui_2 *i ); krb5_error_code krb5_fcc_read_octet - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i )); + (krb5_context, krb5_ccache id , krb5_octet *i ); krb5_error_code krb5_fcc_read_times - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); + (krb5_context, krb5_ccache id , krb5_ticket_times *t ); krb5_error_code krb5_fcc_read_addrs - KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***)); + (krb5_context, krb5_ccache, krb5_address ***); krb5_error_code krb5_fcc_read_addr - KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address *)); + (krb5_context, krb5_ccache, krb5_address *); krb5_error_code krb5_fcc_read_authdata - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***)); + (krb5_context, krb5_ccache , krb5_authdata ***); krb5_error_code krb5_fcc_read_authdatum - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); + (krb5_context, krb5_ccache , krb5_authdata *); krb5_error_code KRB5_CALLCONV krb5_fcc_resolve - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_fcc_retrieve - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_fcc_start_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_fcc_store - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code krb5_fcc_skip_header - KRB5_PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_fcc_skip_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); extern krb5_cc_ops krb5_cc_file_ops; krb5_error_code krb5_change_cache - KRB5_PROTOTYPE((void)); + (void); krb5_error_code krb5_fcc_write - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len )); + (krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len ); krb5_error_code krb5_fcc_store_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code krb5_fcc_store_keyblock - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); + (krb5_context, krb5_ccache id , krb5_keyblock *keyblock ); krb5_error_code krb5_fcc_store_data - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); + (krb5_context, krb5_ccache id , krb5_data *data ); krb5_error_code krb5_fcc_store_int32 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_ui_4 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_4 i )); + (krb5_context, krb5_ccache id , krb5_ui_4 i ); krb5_error_code krb5_fcc_store_ui_2 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_octet - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_times - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); + (krb5_context, krb5_ccache id , krb5_ticket_times *t ); krb5_error_code krb5_fcc_store_addrs - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** )); + (krb5_context, krb5_ccache , krb5_address ** ); krb5_error_code krb5_fcc_store_addr - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address * )); + (krb5_context, krb5_ccache , krb5_address * ); krb5_error_code krb5_fcc_store_authdata - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **)); + (krb5_context, krb5_ccache , krb5_authdata **); krb5_error_code krb5_fcc_store_authdatum - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); + (krb5_context, krb5_ccache , krb5_authdata *); krb5_error_code krb5_fcc_interpret - KRB5_PROTOTYPE((krb5_context, int )); + (krb5_context, int ); krb5_error_code krb5_fcc_close_file - KRB5_PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_fcc_open_file - KRB5_PROTOTYPE((krb5_context, krb5_ccache, int)); + (krb5_context, krb5_ccache, int); #define KRB5_OK 0 diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index 9979a3b..76748cd 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -35,53 +35,53 @@ #include <errno.h> krb5_error_code KRB5_CALLCONV krb5_mcc_close - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_destroy - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get - PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new - PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_mcc_get_name - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal - PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_mcc_initialize - PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_resolve - PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get - PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_mcc_store - PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags - PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); extern krb5_cc_ops krb5_mcc_ops; -krb5_error_code krb5_change_cache PROTOTYPE(()); +krb5_error_code krb5_change_cache (); #define KRB5_OK 0 @@ -111,7 +111,7 @@ static krb5_mcc_data *mcc_head = 0; * system errors * permission errors */ -void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id)); +void krb5_mcc_free (krb5_context context, krb5_ccache id); krb5_error_code KRB5_CALLCONV krb5_mcc_initialize(context, id, princ) diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c index 4b82919..9a2a991 100644 --- a/src/lib/krb5/ccache/cc_stdio.c +++ b/src/lib/krb5/ccache/cc_stdio.c @@ -83,192 +83,192 @@ end-of-file versus other errors. #include "k5-int.h" krb5_error_code KRB5_CALLCONV krb5_scc_close - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_destroy - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_end_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_cc_cursor *cursor )); + krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_scc_generate_new - PROTOTYPE((krb5_context, - krb5_ccache *id )); + (krb5_context, + krb5_ccache *id ); const char * KRB5_CALLCONV krb5_scc_get_name - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_get_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal *princ )); + krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_scc_initialize - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal princ )); + krb5_principal princ ); krb5_error_code krb5_scc_close_file - PROTOTYPE((krb5_context, - krb5_ccache)); + (krb5_context, + krb5_ccache); krb5_error_code krb5_scc_open_file - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - int)); + int); krb5_error_code KRB5_CALLCONV krb5_scc_next_cred - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_scc_read - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf, - unsigned int len)); + unsigned int len); krb5_error_code krb5_scc_read_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal *princ )); + krb5_principal *princ ); krb5_error_code krb5_scc_read_keyblock - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_keyblock *keyblock )); + krb5_keyblock *keyblock ); krb5_error_code krb5_scc_read_data - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_data *data )); + krb5_data *data ); krb5_error_code krb5_scc_read_int32 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 *i )); + krb5_int32 *i ); krb5_error_code krb5_scc_read_ui_2 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ui_2 *i )); + krb5_ui_2 *i ); krb5_error_code krb5_scc_read_octet - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_octet *i )); + krb5_octet *i ); krb5_error_code krb5_scc_read_times - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ticket_times *t )); + krb5_ticket_times *t ); krb5_error_code krb5_scc_read_addrs - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_address ***)); + krb5_address ***); krb5_error_code krb5_scc_read_addr - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_address *)); + krb5_address *); krb5_error_code krb5_scc_read_authdata - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata***)); + krb5_authdata***); krb5_error_code krb5_scc_read_authdatum - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata*)); + krb5_authdata*); krb5_error_code KRB5_CALLCONV krb5_scc_resolve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache *id , - const char *residual )); + const char *residual ); krb5_error_code KRB5_CALLCONV krb5_scc_retrieve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_scc_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_cc_cursor *cursor )); + krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_scc_store - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_scc_skip_header - PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_scc_skip_principal - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_set_flags - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_flags flags )); + krb5_flags flags ); extern krb5_cc_ops krb5_scc_ops; krb5_error_code krb5_scc_write - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf , - unsigned int len )); + unsigned int len ); krb5_error_code krb5_scc_store_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal princ )); + krb5_principal princ ); krb5_error_code krb5_scc_store_keyblock - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_keyblock *keyblock )); + krb5_keyblock *keyblock ); krb5_error_code krb5_scc_store_data - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_data *data )); + krb5_data *data ); krb5_error_code krb5_scc_store_int32 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_ui_4 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ui_4 i )); + krb5_ui_4 i ); krb5_error_code krb5_scc_store_ui_2 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_octet - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_times - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ticket_times *t )); + krb5_ticket_times *t ); krb5_error_code krb5_scc_store_addrs - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache , - krb5_address ** )); + krb5_address ** ); krb5_error_code krb5_scc_store_addr - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache , - krb5_address * )); + krb5_address * ); krb5_error_code krb5_scc_store_authdata - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata **)); + krb5_authdata **); krb5_error_code krb5_scc_store_authdatum - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata *)); + krb5_authdata *); krb5_error_code krb5_scc_interpret - PROTOTYPE((krb5_context, - int )); + (krb5_context, + int ); #include <stdio.h> diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index 973583a..732b8eb 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * stdcc.h: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h index e2d1131..705cdf5 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.h +++ b/src/lib/krb5/ccache/ccapi/stdcc.h @@ -26,50 +26,50 @@ typedef struct _stdccCacheData { /* function protoypes */ krb5_error_code KRB5_CALLCONV krb5_stdcc_close - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_destroy - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_end_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_stdcc_generate_new - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_stdcc_get_name - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_get_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_stdcc_initialize - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_stdcc_next_cred - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_resolve - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_stdcc_retrieve - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_start_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_stdcc_store - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_set_flags - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); krb5_error_code KRB5_CALLCONV krb5_stdcc_remove - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds)); + (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds); diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c index 0380992..23eefe4 100644 --- a/src/lib/krb5/ccache/ser_cc.c +++ b/src/lib/krb5/ccache/ser_cc.c @@ -37,11 +37,11 @@ * krb5_ccache_internalize(); */ static krb5_error_code krb5_ccache_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_ccache_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_ccache_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index ad3cbb7..9567938 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktbase.c: Make prototypes unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c, diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index e23c9b1..199cf0c 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktfile.h, ser_ktf.c: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * ser_ktf.c: Drop _MSDOS support. diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h index 6481bc2..2f17b9f 100644 --- a/src/lib/krb5/keytab/file/ktfile.h +++ b/src/lib/krb5/keytab/file/ktfile.h @@ -66,103 +66,103 @@ extern struct _krb5_kt_ops krb5_ktf_ops; extern struct _krb5_kt_ops krb5_ktf_writable_ops; krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, char *, - unsigned int)); + unsigned int); krb5_error_code KRB5_CALLCONV krb5_ktfile_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_const_principal, krb5_kvno, krb5_enctype, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); /* routines to be included on extended version (write routines) */ krb5_error_code KRB5_CALLCONV krb5_ktfile_add - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktfile_remove - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_openr - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_openw - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_write_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_delete_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_int32)); + krb5_int32); krb5_error_code krb5_ktfileint_internal_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_int32 *)); + krb5_int32 *); krb5_error_code krb5_ktfileint_size_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab_entry *, - krb5_int32 *)); + krb5_int32 *); krb5_error_code krb5_ktfileint_find_slot - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_int32 *, - krb5_int32 *)); + krb5_int32 *); #endif /* KRB5_KTFILE__ */ diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c index ca54f93..4655e8c 100644 --- a/src/lib/krb5/keytab/file/ser_ktf.c +++ b/src/lib/krb5/keytab/file/ser_ktf.c @@ -40,11 +40,11 @@ static const char ktfile_def_name[] = "."; * krb5_ktf_keytab_internalize(); */ static krb5_error_code krb5_ktf_keytab_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_ktf_keytab_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_ktf_keytab_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index b808ec4..5f03e61 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -126,11 +126,11 @@ krb5_kt_resolve (context, name, ktid) * krb5_keytab_internalize(); */ static krb5_error_code krb5_keytab_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_keytab_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_keytab_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog index 8c43586..aab09dc 100644 --- a/src/lib/krb5/keytab/srvtab/ChangeLog +++ b/src/lib/krb5/keytab/srvtab/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktsrvtab.h: Make prototypes unconditional. + 2000-10-17 Ezra Peisach <epeisach@mit.edu> * kts_g_name.c, ktsrvtab.h (krb5_ktsrvtab_get_name): Uses unsigned diff --git a/src/lib/krb5/keytab/srvtab/ktsrvtab.h b/src/lib/krb5/keytab/srvtab/ktsrvtab.h index c7e0695..9f6764d 100644 --- a/src/lib/krb5/keytab/srvtab/ktsrvtab.h +++ b/src/lib/krb5/keytab/srvtab/ktsrvtab.h @@ -63,55 +63,55 @@ typedef struct _krb5_ktsrvtab_data { extern struct _krb5_kt_ops krb5_kts_ops; krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, char *, - unsigned int)); + unsigned int); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_const_principal, krb5_kvno, krb5_enctype, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code krb5_ktsrvint_open - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktsrvint_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktsrvint_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); #endif /* KRB5_KTSRVTAB__ */ diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 65d9b6e..ee68a87 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,11 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * get_in_tkt.c, in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c, + int-proto.h, mk_req_ext.c, pr_to_salt.c, rd_req_dec.c, ser_actx.c, + ser_adata.c, ser_addr.c, ser_auth.c, ser_cksum.c, ser_ctx.c, + ser_eblk.c, ser_key.c, ser_princ.c, t_kerb.c: Make prototypes + unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * init_ctx.c, preauth.c: Drop _MSDOS support. diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 0a8f690..d6e469d 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -64,20 +64,20 @@ /* some typedef's for the function args to make things look a bit cleaner */ -typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_key_proc) (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); -typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_decrypt_proc) (krb5_context, const krb5_keyblock *, krb5_const_pointer, - krb5_kdc_rep * )); + krb5_kdc_rep * ); -static krb5_error_code make_preauth_list PROTOTYPE((krb5_context, +static krb5_error_code make_preauth_list (krb5_context, krb5_preauthtype *, - int, krb5_pa_data ***)); + int, krb5_pa_data ***); /* * This function sends a request to the KDC, and gets back a response; * the response is parsed into ret_err_reply or ret_as_reply if the diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index cb9c41e..9991c97 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -41,11 +41,11 @@ struct keytab_keyproc_arg { * from system area. */ static krb5_error_code keytab_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code keytab_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index b494f11..775a85f 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -35,11 +35,11 @@ extern char *krb5_default_pwd_prompt1; * key-producing procedure for use by krb5_get_in_tkt_with_password. */ static krb5_error_code pwd_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code pwd_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 0ca1e7e..245a032 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -41,11 +41,11 @@ struct skey_keyproc_arg { * from system area. */ static krb5_error_code skey_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code skey_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index d2df9f8..75ffa55 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -32,21 +32,21 @@ #define KRB5_INT_FUNC_PROTO__ krb5_error_code krb5_tgtname - PROTOTYPE((krb5_context context, + (krb5_context context, const krb5_data *, const krb5_data *, - krb5_principal *)); + krb5_principal *); krb5_error_code krb5_libdefault_boolean - KRB5_PROTOTYPE((krb5_context, const krb5_data *, const char *, - int *)); + (krb5_context, const krb5_data *, const char *, + int *); -krb5_error_code krb5_ser_authdata_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_address_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_authenticator_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_checksum_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_keyblock_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_principal_init KRB5_PROTOTYPE((krb5_context)); +krb5_error_code krb5_ser_authdata_init (krb5_context); +krb5_error_code krb5_ser_address_init (krb5_context); +krb5_error_code krb5_ser_authenticator_init (krb5_context); +krb5_error_code krb5_ser_checksum_init (krb5_context); +krb5_error_code krb5_ser_keyblock_init (krb5_context); +krb5_error_code krb5_ser_principal_init (krb5_context); #endif /* KRB5_INT_FUNC_PROTO__ */ diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 8b7b5bb..7725746 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -65,10 +65,10 @@ */ static krb5_error_code -krb5_generate_authenticator PROTOTYPE((krb5_context, +krb5_generate_authenticator (krb5_context, krb5_authenticator *, krb5_principal, krb5_checksum *, krb5_keyblock *, - krb5_int32, krb5_authdata ** )); + krb5_int32, krb5_authdata ** ); krb5_error_code KRB5_CALLCONV krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 9efe1b7..00d4f9f 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -30,7 +30,7 @@ #include "k5-int.h" static krb5_error_code krb5_principal2salt_internal - PROTOTYPE((krb5_context, krb5_const_principal, krb5_data *ret, int)); + (krb5_context, krb5_const_principal, krb5_data *ret, int); /* * Convert a krb5_principal into the default salt for that principal. diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 31c02dd..0eed509 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -60,8 +60,8 @@ */ static krb5_error_code decrypt_authenticator - PROTOTYPE((krb5_context, const krb5_ap_req *, krb5_authenticator **, - int)); + (krb5_context, const krb5_ap_req *, krb5_authenticator **, + int); #define in_clock_skew(date) (labs((date)-currenttime) < context->clockskew) diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c index aa634cc..ec82aaa 100644 --- a/src/lib/krb5/krb/ser_actx.c +++ b/src/lib/krb5/krb/ser_actx.c @@ -47,11 +47,11 @@ * krb5_auth_context_internalize(); */ static krb5_error_code krb5_auth_context_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_auth_context_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_auth_context_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Other metadata serialization initializers. diff --git a/src/lib/krb5/krb/ser_adata.c b/src/lib/krb5/krb/ser_adata.c index 1293a9b..0f27e89 100644 --- a/src/lib/krb5/krb/ser_adata.c +++ b/src/lib/krb5/krb/ser_adata.c @@ -38,11 +38,11 @@ * krb5_authdata_internalize(); */ static krb5_error_code krb5_authdata_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_authdata_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_authdata_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_authdata_ser_entry = { diff --git a/src/lib/krb5/krb/ser_addr.c b/src/lib/krb5/krb/ser_addr.c index 196ecb2..0988960 100644 --- a/src/lib/krb5/krb/ser_addr.c +++ b/src/lib/krb5/krb/ser_addr.c @@ -38,11 +38,11 @@ * krb5_address_internalize(); */ static krb5_error_code krb5_address_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_address_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_address_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_address_ser_entry = { diff --git a/src/lib/krb5/krb/ser_auth.c b/src/lib/krb5/krb/ser_auth.c index 5c21ebd..983ce8b 100644 --- a/src/lib/krb5/krb/ser_auth.c +++ b/src/lib/krb5/krb/ser_auth.c @@ -38,11 +38,11 @@ * krb5_authenticator_internalize(); */ static krb5_error_code krb5_authenticator_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_authenticator_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_authenticator_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_authenticator_ser_entry = { diff --git a/src/lib/krb5/krb/ser_cksum.c b/src/lib/krb5/krb/ser_cksum.c index ac97574..101c853 100644 --- a/src/lib/krb5/krb/ser_cksum.c +++ b/src/lib/krb5/krb/ser_cksum.c @@ -38,11 +38,11 @@ * krb5_checksum_internalize(); */ static krb5_error_code krb5_checksum_esize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_checksum_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_checksum_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_checksum_ser_entry = { diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c index c957a81..5c6647e 100644 --- a/src/lib/krb5/krb/ser_ctx.c +++ b/src/lib/krb5/krb/ser_ctx.c @@ -51,23 +51,23 @@ * krb5_ser_context_init(); */ static krb5_error_code krb5_context_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_context_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_context_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); static krb5_error_code krb5_oscontext_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_oscontext_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_oscontext_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); krb5_error_code profile_ser_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); krb5_error_code profile_ser_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); krb5_error_code profile_ser_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_context_ser_entry = { diff --git a/src/lib/krb5/krb/ser_eblk.c b/src/lib/krb5/krb/ser_eblk.c index bd4b4c5..aed806c 100644 --- a/src/lib/krb5/krb/ser_eblk.c +++ b/src/lib/krb5/krb/ser_eblk.c @@ -39,11 +39,11 @@ * krb5_encrypt_block_internalize(); */ static krb5_error_code krb5_encrypt_block_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_encrypt_block_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_encrypt_block_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_encrypt_block_ser_entry = { diff --git a/src/lib/krb5/krb/ser_key.c b/src/lib/krb5/krb/ser_key.c index 9ea7b1c..a7ef5d0 100644 --- a/src/lib/krb5/krb/ser_key.c +++ b/src/lib/krb5/krb/ser_key.c @@ -38,11 +38,11 @@ * krb5_keyblock_internalize(); */ static krb5_error_code krb5_keyblock_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_keyblock_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_keyblock_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_keyblock_ser_entry = { diff --git a/src/lib/krb5/krb/ser_princ.c b/src/lib/krb5/krb/ser_princ.c index 4435f6e..148c3d5 100644 --- a/src/lib/krb5/krb/ser_princ.c +++ b/src/lib/krb5/krb/ser_princ.c @@ -38,11 +38,11 @@ * krb5_principal_internalize(); */ static krb5_error_code krb5_principal_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_principal_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_principal_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_principal_ser_entry = { diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c index 89242d9..485f584 100644 --- a/src/lib/krb5/krb/t_kerb.c +++ b/src/lib/krb5/krb/t_kerb.c @@ -16,12 +16,12 @@ #include "com_err.h" -void test_string_to_timestamp KRB5_PROTOTYPE((krb5_context, char *)); -void test_425_conv_principal KRB5_PROTOTYPE((krb5_context, char *, char*, char *)); -void test_524_conv_principal KRB5_PROTOTYPE((krb5_context, char *)); -void test_parse_name KRB5_PROTOTYPE((krb5_context, const char *)); -void test_set_realm KRB5_PROTOTYPE((krb5_context, const char *, const char *)); -void usage KRB5_PROTOTYPE((char *)); +void test_string_to_timestamp (krb5_context, char *); +void test_425_conv_principal (krb5_context, char *, char*, char *); +void test_524_conv_principal (krb5_context, char *); +void test_parse_name (krb5_context, const char *); +void test_set_realm (krb5_context, const char *, const char *); +void usage (char *); void test_string_to_timestamp(ctx, ktime) krb5_context ctx; diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index b5c0e13..a39c1f1 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * os-proto.h: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * an_to_ln.c, c_ustime.c, ccdefname.c, init_os_ctx.c, ktdefname.c, diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index 7be2c3f..48910b5 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -32,22 +32,22 @@ #ifdef SOCK_DGRAM /* XXX hack... */ krb5_error_code krb5_locate_kdc - PROTOTYPE((krb5_context, const krb5_data *, struct addrlist *, int)); + (krb5_context, const krb5_data *, struct addrlist *, int); #endif #ifdef HAVE_NETINET_IN_H krb5_error_code krb5_unpack_full_ipaddr - PROTOTYPE((krb5_context, + (krb5_context, const krb5_address *, krb5_int32 *, - krb5_int16 *)); + krb5_int16 *); krb5_error_code krb5_make_full_ipaddr - PROTOTYPE((krb5_context, + (krb5_context, krb5_int32, int, /* unsigned short promotes to signed int */ - krb5_address **)); + krb5_address **); #endif /* HAVE_NETINET_IN_H */ @@ -57,9 +57,9 @@ krb5_error_code krb5_try_realm_txt_rr(const char *, const char *, /* Obsolete interface - leave prototype here until code removed */ krb5_error_code krb5_secure_config_files(krb5_context ctx); -int _krb5_use_dns_realm KRB5_PROTOTYPE((krb5_context)); -int _krb5_use_dns_kdc KRB5_PROTOTYPE((krb5_context)); -int _krb5_conf_boolean KRB5_PROTOTYPE((const char *)); +int _krb5_use_dns_realm (krb5_context); +int _krb5_use_dns_kdc (krb5_context); +int _krb5_conf_boolean (const char *); extern unsigned int krb5_max_skdc_timeout; extern unsigned int krb5_skdc_timeout_shift; diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 23c28a3..b57895d 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * rc_dfl.h, rc_io.h, ser_rc.c: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * rc_io.c: Drop _MSDOS support. diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index aaa5e82..51c62ef 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -16,41 +16,41 @@ extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */ krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_deltat)); + krb5_deltat); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_donot_replay *)); + krb5_donot_replay *); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_deltat *)); + krb5_deltat *); char * KRB5_CALLCONV krb5_rc_dfl_get_name - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - char *)); + char *); krb5_error_code krb5_rc_dfl_close_no_free - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); void krb5_rc_free_entry - PROTOTYPE((krb5_context, - krb5_donot_replay **)); + (krb5_context, + krb5_donot_replay **); #endif diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h index 8a1c241..77eb34f 100644 --- a/src/lib/krb5/rcache/rc_io.h +++ b/src/lib/krb5/rcache/rc_io.h @@ -28,43 +28,43 @@ krb5_rc_iostuff; /* first argument is always iostuff for result file */ krb5_error_code krb5_rc_io_creat - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - char **)); + char **); krb5_error_code krb5_rc_io_open - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - char *)); + char *); krb5_error_code krb5_rc_io_move - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - krb5_rc_iostuff *)); + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_write - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, krb5_pointer, - unsigned int)); + unsigned int); krb5_error_code krb5_rc_io_read - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, krb5_pointer, - unsigned int)); + unsigned int); krb5_error_code krb5_rc_io_close - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_destroy - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_mark - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_unmark - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_sync - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); long krb5_rc_io_size - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); #endif diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c index 2df993f..a4ed0f8 100644 --- a/src/lib/krb5/rcache/ser_rc.c +++ b/src/lib/krb5/rcache/ser_rc.c @@ -37,11 +37,11 @@ * krb5_rcache_internalize(); */ static krb5_error_code krb5_rcache_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_rcache_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_rcache_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index f829ce7..ca3f0a4 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,9 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * auth_gssapi.h, auth_gssapi_misc.c, getrpcent.c, + svc_auth_gssapi.c, xdr.h: Make prototypes unconditional. Don't + define PROTOTYPE. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * auth_gssapi.h, getrpcent.c, xdr.h: Drop _MSDOS support. diff --git a/src/lib/rpc/auth_gssapi.h b/src/lib/rpc/auth_gssapi.h index 3f5c030..b3d4dc4 100644 --- a/src/lib/rpc/auth_gssapi.h +++ b/src/lib/rpc/auth_gssapi.h @@ -23,17 +23,6 @@ #undef minor #endif -/* - * Make sure we have a definition for PROTOTYPE. - */ -#if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) -#define PROTOTYPE(x) x -#else -#define PROTOTYPE(x) () -#endif -#endif - typedef struct _auth_gssapi_name { char *name; gss_OID type; @@ -59,23 +48,23 @@ typedef struct _auth_gssapi_init_res { } auth_gssapi_init_res; typedef void (*auth_gssapi_log_badauth_func) - PROTOTYPE((OM_uint32 major, + (OM_uint32 major, OM_uint32 minor, struct sockaddr_in *raddr, - caddr_t data)); + caddr_t data); typedef void (*auth_gssapi_log_badverf_func) - PROTOTYPE((gss_name_t client, + (gss_name_t client, gss_name_t server, struct svc_req *rqst, struct rpc_msg *msg, - caddr_t data)); + caddr_t data); typedef void (*auth_gssapi_log_miscerr_func) - PROTOTYPE((struct svc_req *rqst, + (struct svc_req *rqst, struct rpc_msg *msg, char *error, - caddr_t data)); + caddr_t data); bool_t xdr_gss_buf(XDR *, gss_buffer_t); bool_t xdr_authgssapi_creds(XDR *, auth_gssapi_creds *); @@ -83,18 +72,18 @@ bool_t xdr_authgssapi_init_arg(XDR *, auth_gssapi_init_arg *); bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *); bool_t auth_gssapi_wrap_data -PROTOTYPE((OM_uint32 *major, OM_uint32 *minor, +(OM_uint32 *major, OM_uint32 *minor, gss_ctx_id_t context, rpc_u_int32 seq_num, XDR *out_xdrs, bool_t (*xdr_func)(), caddr_t - xdr_ptr)); + xdr_ptr); bool_t auth_gssapi_unwrap_data -PROTOTYPE((OM_uint32 *major, OM_uint32 *minor, +(OM_uint32 *major, OM_uint32 *minor, gss_ctx_id_t context, rpc_u_int32 seq_num, XDR *in_xdrs, bool_t (*xdr_func)(), caddr_t - xdr_ptr)); + xdr_ptr); AUTH *auth_gssapi_create -PROTOTYPE((CLIENT *clnt, +(CLIENT *clnt, OM_uint32 *major_status, OM_uint32 *minor_status, gss_cred_id_t claimant_cred_handle, @@ -104,35 +93,35 @@ PROTOTYPE((CLIENT *clnt, OM_uint32 time_req, gss_OID *actual_mech_type, OM_uint32 *ret_flags, - OM_uint32 *time_rec)); + OM_uint32 *time_rec); AUTH *auth_gssapi_create_default -PROTOTYPE((CLIENT *clnt, char *service_name)); +(CLIENT *clnt, char *service_name); void auth_gssapi_display_status -PROTOTYPE((char *msg, OM_uint32 major, - OM_uint32 minor)); +(char *msg, OM_uint32 major, + OM_uint32 minor); bool_t auth_gssapi_seal_seq -PROTOTYPE((gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf)); +(gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf); bool_t auth_gssapi_unseal_seq -PROTOTYPE((gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num)); +(gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num); bool_t _svcauth_gssapi_set_names -PROTOTYPE((auth_gssapi_name *names, int num)); +(auth_gssapi_name *names, int num); void _svcauth_gssapi_unset_names -PROTOTYPE((void)); +(void); void _svcauth_gssapi_set_log_badauth_func -PROTOTYPE((auth_gssapi_log_badauth_func func, - caddr_t data)); +(auth_gssapi_log_badauth_func func, + caddr_t data); void _svcauth_gssapi_set_log_badverf_func -PROTOTYPE((auth_gssapi_log_badverf_func func, - caddr_t data)); +(auth_gssapi_log_badverf_func func, + caddr_t data); void _svcauth_gssapi_set_log_miscerr_func -PROTOTYPE((auth_gssapi_log_miscerr_func func, - caddr_t data)); +(auth_gssapi_log_miscerr_func func, + caddr_t data); #define GSS_COPY_BUFFER(dest, src) { \ (dest).length = (src).length; \ diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c index f111013..00420aa 100644 --- a/src/lib/rpc/auth_gssapi_misc.c +++ b/src/lib/rpc/auth_gssapi_misc.c @@ -26,7 +26,7 @@ int misc_debug_gssapi = DEBUG_GSSAPI; #endif static void auth_gssapi_display_status_1 - PROTOTYPE((char *, OM_uint32, int, int)); + (char *, OM_uint32, int, int); bool_t xdr_gss_buf(xdrs, buf) XDR *xdrs; diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c index 1b22b53..08ad02d 100644 --- a/src/lib/rpc/getrpcent.c +++ b/src/lib/rpc/getrpcent.c @@ -43,21 +43,8 @@ static char sccsid[] = "@(#)getrpcent.c 1.9 87/08/11 Copyr 1984 Sun Micro"; #include <string.h> #include <sys/socket.h> -/* - * Make sure we have a definition for PROTOTYPE. - */ -#if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) -#define PROTOTYPE(x) x -#else -#define PROTOTYPE(x) () -#endif -#endif - -SETRPCENT_TYPE setrpcent -PROTOTYPE((int)); -ENDRPCENT_TYPE endrpcent -PROTOTYPE((void)); +SETRPCENT_TYPE setrpcent (int); +ENDRPCENT_TYPE endrpcent (void); /* * Internet version. diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c index af52e8e..5473815 100644 --- a/src/lib/rpc/svc_auth_gssapi.c +++ b/src/lib/rpc/svc_auth_gssapi.c @@ -77,14 +77,13 @@ static bool_t svc_auth_gssapi_wrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t); static bool_t svc_auth_gssapi_unwrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t); static svc_auth_gssapi_data *create_client(void); static svc_auth_gssapi_data *get_client - PROTOTYPE((gss_buffer_t client_handle)); + (gss_buffer_t client_handle); static void destroy_client - PROTOTYPE((svc_auth_gssapi_data *client_data)); + (svc_auth_gssapi_data *client_data); static void clean_client(void), cleanup(void); static void client_expire - PROTOTYPE((svc_auth_gssapi_data *client_data, rpc_u_int32 exp)); -static void dump_db -PROTOTYPE((char *msg)); + (svc_auth_gssapi_data *client_data, rpc_u_int32 exp); +static void dump_db (char *msg); struct svc_auth_ops svc_auth_gssapi_ops = { svc_auth_gssapi_wrap, diff --git a/src/lib/rpc/xdr.h b/src/lib/rpc/xdr.h index b94984d..9181fc7 100644 --- a/src/lib/rpc/xdr.h +++ b/src/lib/rpc/xdr.h @@ -42,17 +42,6 @@ #include <stdio.h> /* - * Make sure we have a definition for PROTOTYPE. - */ -#if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) -#define PROTOTYPE(x) x -#else -#define PROTOTYPE(x) () -#endif -#endif - -/* * XDR provides a conventional way for converting between C data * types and an external bit-string representation. Library supplied * routines provide for the conversion on built-in C data types. These @@ -277,47 +266,47 @@ struct xdr_discrim { extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int -PROTOTYPE((XDR *, int *)); +(XDR *, int *); extern bool_t xdr_u_int -PROTOTYPE((XDR *, unsigned int *)); +(XDR *, unsigned int *); extern bool_t xdr_long -PROTOTYPE((XDR *, long *)); +(XDR *, long *); extern bool_t xdr_u_long -PROTOTYPE((XDR *, unsigned long *)); +(XDR *, unsigned long *); extern bool_t xdr_short -PROTOTYPE((XDR *, short *)); +(XDR *, short *); extern bool_t xdr_u_short -PROTOTYPE((XDR *, unsigned short *)); +(XDR *, unsigned short *); extern bool_t xdr_bool -PROTOTYPE((XDR *, bool_t *)); +(XDR *, bool_t *); extern bool_t xdr_enum -PROTOTYPE((XDR *, enum_t *)); +(XDR *, enum_t *); extern bool_t xdr_array -PROTOTYPE((XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t)); +(XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t); extern bool_t xdr_bytes -PROTOTYPE((XDR *, char **, unsigned int *, unsigned int)); +(XDR *, char **, unsigned int *, unsigned int); extern bool_t xdr_opaque -PROTOTYPE((XDR *, caddr_t, unsigned int)); +(XDR *, caddr_t, unsigned int); extern bool_t xdr_string -PROTOTYPE((XDR *, char **, unsigned int)); +(XDR *, char **, unsigned int); extern bool_t xdr_union -PROTOTYPE((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t)); +(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t); extern bool_t xdr_char -PROTOTYPE((XDR *, char *)); +(XDR *, char *); extern bool_t xdr_u_char -PROTOTYPE((XDR *, unsigned char *)); +(XDR *, unsigned char *); extern bool_t xdr_vector -PROTOTYPE((XDR *, char *, unsigned int, unsigned int, xdrproc_t)); +(XDR *, char *, unsigned int, unsigned int, xdrproc_t); extern bool_t xdr_float -PROTOTYPE((XDR *, float *)); +(XDR *, float *); extern bool_t xdr_double -PROTOTYPE((XDR *, double *)); +(XDR *, double *); extern bool_t xdr_reference -PROTOTYPE((XDR *, caddr_t *, unsigned int, xdrproc_t)); +(XDR *, caddr_t *, unsigned int, xdrproc_t); extern bool_t xdr_pointer -PROTOTYPE((XDR *, char **, unsigned int, xdrproc_t)); +(XDR *, char **, unsigned int, xdrproc_t); extern bool_t xdr_wrapstring -PROTOTYPE((XDR *, char **)); +(XDR *, char **); /* * Common opaque bytes objects used by many rpc protocols; @@ -334,12 +323,12 @@ struct netobj { }; typedef struct netobj netobj; extern bool_t xdr_netobj -PROTOTYPE((XDR *, struct netobj *)); +(XDR *, struct netobj *); extern bool_t xdr_int32 -PROTOTYPE((XDR *, rpc_int32 *)); +(XDR *, rpc_int32 *); extern bool_t xdr_u_int32 -PROTOTYPE((XDR *, rpc_u_int32 *)); +(XDR *, rpc_u_int32 *); /* * These are the public routines for the various implementations of @@ -356,37 +345,37 @@ PROTOTYPE((XDR *, rpc_u_int32 *)); #define xdralloc_getdata gssrpc_xdralloc_getdata /* XDR allocating memory buffer */ -extern void xdralloc_create PROTOTYPE((XDR *xdrs, enum xdr_op op)); +extern void xdralloc_create (XDR *xdrs, enum xdr_op op); /* destroy xdralloc, save buf */ -extern void xdralloc_release PROTOTYPE((XDR *xdrs)); +extern void xdralloc_release (XDR *xdrs); /* get buffer from xdralloc */ -extern caddr_t xdralloc_getdata PROTOTYPE((XDR *xdrs)); +extern caddr_t xdralloc_getdata (XDR *xdrs); /* XDR using memory buffers */ -extern void xdrmem_create PROTOTYPE((XDR *xdrs, caddr_t addr, - unsigned int size, enum xdr_op xop)); +extern void xdrmem_create (XDR *xdrs, caddr_t addr, + unsigned int size, enum xdr_op xop); /* XDR using stdio library */ -extern void xdrstdio_create PROTOTYPE((XDR *xdrs, FILE *file, - enum xdr_op op)); +extern void xdrstdio_create (XDR *xdrs, FILE *file, + enum xdr_op op); /* XDR pseudo records for tcp */ -extern void xdrrec_create PROTOTYPE((XDR *xdrs, unsigned int sendsize, +extern void xdrrec_create (XDR *xdrs, unsigned int sendsize, unsigned int recvsize, caddr_t tcp_handle, int (*readit) (caddr_t, caddr_t, int), - int (*writeit) (caddr_t, caddr_t, int))); + int (*writeit) (caddr_t, caddr_t, int)); /* make end of xdr record */ -extern bool_t xdrrec_endofrecord PROTOTYPE((XDR *xdrs, bool_t sendnow)); +extern bool_t xdrrec_endofrecord (XDR *xdrs, bool_t sendnow); /* move to beginning of next record */ -extern bool_t xdrrec_skiprecord PROTOTYPE((XDR *xdrs)); +extern bool_t xdrrec_skiprecord (XDR *xdrs); /* true if no more input */ -extern bool_t xdrrec_eof PROTOTYPE((XDR *xdrs)); +extern bool_t xdrrec_eof (XDR *xdrs); /* free memory buffers for xdr */ -extern void gssrpc_xdr_free PROTOTYPE((xdrproc_t proc, void *__objp)); +extern void gssrpc_xdr_free (xdrproc_t proc, void *__objp); #endif /* !__XDR_HEADER__ */ |