From: Ken Raeburn Date: Sat, 23 Feb 2002 03:31:09 +0000 (+0000) Subject: * krb5.hin, k5-int.h: Use const instead of krb5_const. X-Git-Tag: krb5-1.3-alpha1~867 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fe966e53e3254abcd43075ab958192b786eec4a;p=krb5.git * krb5.hin, k5-int.h: Use const instead of krb5_const. * krb5.hin (krb5_const): Deleted definition. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14163 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 0c4860645..9e5d7a358 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2002-02-22 Ken Raeburn + + * krb5.hin, k5-int.h: Use const instead of krb5_const. + * krb5.hin (krb5_const): Deleted definition. + 2002-02-20 Ken Raeburn * foreachaddr.c: New file, contents taken from code shared between diff --git a/src/include/k5-int.h b/src/include/k5-int.h index a4d964e1d..bc9b2e013 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -522,20 +522,20 @@ struct krb5_enc_provider { void (*keysize) (size_t *keybytes, size_t *keylength); /* cipher-state == 0 fresh state thrown away at end */ - krb5_error_code (*encrypt) (krb5_const krb5_keyblock *key, - krb5_const krb5_data *cipher_state, - krb5_const krb5_data *input, + krb5_error_code (*encrypt) (const krb5_keyblock *key, + const krb5_data *cipher_state, + const krb5_data *input, krb5_data *output); - krb5_error_code (*decrypt) (krb5_const krb5_keyblock *key, - krb5_const krb5_data *ivec, - krb5_const krb5_data *input, + krb5_error_code (*decrypt) (const krb5_keyblock *key, + const krb5_data *ivec, + const krb5_data *input, krb5_data *output); - krb5_error_code (*make_key) (krb5_const krb5_data *randombits, + krb5_error_code (*make_key) (const krb5_data *randombits, krb5_keyblock *key); - krb5_error_code (*init_state) (krb5_const krb5_keyblock *key, + krb5_error_code (*init_state) (const krb5_keyblock *key, krb5_keyusage keyusage, krb5_data *out_state); krb5_error_code (*free_state) (krb5_data *state); @@ -547,39 +547,39 @@ struct krb5_hash_provider { void (*block_size) (size_t *output); /* this takes multiple inputs to avoid lots of copying. */ - krb5_error_code (*hash) (unsigned int icount, krb5_const krb5_data *input, + krb5_error_code (*hash) (unsigned int icount, const krb5_data *input, krb5_data *output); }; struct krb5_keyhash_provider { void (*hash_size) (size_t *output); - krb5_error_code (*hash) (krb5_const krb5_keyblock *key, + krb5_error_code (*hash) (const krb5_keyblock *key, krb5_keyusage keyusage, - krb5_const krb5_data *ivec, - krb5_const krb5_data *input, + const krb5_data *ivec, + const krb5_data *input, krb5_data *output); - krb5_error_code (*verify) (krb5_const krb5_keyblock *key, + krb5_error_code (*verify) (const krb5_keyblock *key, krb5_keyusage keyusage, - krb5_const krb5_data *ivec, - krb5_const krb5_data *input, - krb5_const krb5_data *hash, + const krb5_data *ivec, + const krb5_data *input, + const krb5_data *hash, krb5_boolean *valid); }; -typedef void (*krb5_encrypt_length_func) (krb5_const struct krb5_enc_provider *enc, - krb5_const struct krb5_hash_provider *hash, +typedef void (*krb5_encrypt_length_func) (const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, size_t inputlen, size_t *length); -typedef krb5_error_code (*krb5_crypt_func) (krb5_const struct krb5_enc_provider *enc, - krb5_const struct krb5_hash_provider *hash, - krb5_const krb5_keyblock *key, krb5_keyusage keyusage, - krb5_const krb5_data *ivec, - krb5_const krb5_data *input, krb5_data *output); +typedef krb5_error_code (*krb5_crypt_func) (const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + const krb5_keyblock *key, krb5_keyusage keyusage, + const krb5_data *ivec, + const krb5_data *input, krb5_data *output); -typedef krb5_error_code (*krb5_str2key_func) (krb5_const struct krb5_enc_provider *enc, krb5_const krb5_data *string, - krb5_const krb5_data *salt, krb5_keyblock *key); +typedef krb5_error_code (*krb5_str2key_func) (const struct krb5_enc_provider *enc, const krb5_data *string, + const krb5_data *salt, krb5_keyblock *key); struct krb5_keytypes { krb5_enctype etype; @@ -620,20 +620,20 @@ struct krb5_cksumtypes { */ void krb5_nfold -(unsigned int inbits, krb5_const unsigned char *in, +(unsigned int inbits, const unsigned char *in, unsigned int outbits, unsigned char *out); krb5_error_code krb5_hmac -(krb5_const struct krb5_hash_provider *hash, - krb5_const krb5_keyblock *key, unsigned int icount, - krb5_const krb5_data *input, krb5_data *output); +(const struct krb5_hash_provider *hash, + const krb5_keyblock *key, unsigned int icount, + const krb5_data *input, krb5_data *output); /* A definition of init_state for DES based encryption systems. * sets up an 8-byte IV of all zeros */ krb5_error_code krb5int_des_init_state -(krb5_const krb5_keyblock *key, krb5_keyusage keyusage, krb5_data *new_state); +(const krb5_keyblock *key, krb5_keyusage keyusage, krb5_data *new_state); /* * normally to free a cipher_state you can just memset the length to zero and @@ -659,27 +659,27 @@ typedef struct _krb5_cryptosystem_entry { krb5_magic magic; krb5_error_code (*encrypt_func) ( krb5_const_pointer /* in */, krb5_pointer /* out */, - krb5_const size_t, + const size_t, krb5_encrypt_block *, krb5_pointer); krb5_error_code (*decrypt_func) ( krb5_const_pointer /* in */, krb5_pointer /* out */, - krb5_const size_t, + const size_t, krb5_encrypt_block *, krb5_pointer); krb5_error_code (*process_key) ( krb5_encrypt_block *, - krb5_const krb5_keyblock *); + const krb5_keyblock *); krb5_error_code (*finish_key) ( krb5_encrypt_block *); - krb5_error_code (*string_to_key) (krb5_const krb5_encrypt_block *, + krb5_error_code (*string_to_key) (const krb5_encrypt_block *, krb5_keyblock *, - krb5_const krb5_data *, - krb5_const krb5_data *); - krb5_error_code (*init_random_key) ( krb5_const krb5_encrypt_block *, - krb5_const krb5_keyblock *, + const krb5_data *, + const krb5_data *); + krb5_error_code (*init_random_key) ( const krb5_encrypt_block *, + const krb5_keyblock *, krb5_pointer *); - krb5_error_code (*finish_random_key) ( krb5_const krb5_encrypt_block *, + krb5_error_code (*finish_random_key) ( const krb5_encrypt_block *, krb5_pointer *); - krb5_error_code (*random_key) ( krb5_const krb5_encrypt_block *, + krb5_error_code (*random_key) ( const krb5_encrypt_block *, krb5_pointer, krb5_keyblock **); int block_length; @@ -700,19 +700,19 @@ typedef struct _krb5_cs_table_entry { /* could be used in a table to find a sumtype */ typedef krb5_error_code (*SUM_FUNC) ( - krb5_const krb5_pointer /* in */, - krb5_const size_t /* in_length */, - krb5_const krb5_pointer /* key/seed */, - krb5_const size_t /* key/seed size */, + const krb5_pointer /* in */, + const size_t /* in_length */, + const krb5_pointer /* key/seed */, + const size_t /* key/seed size */, krb5_checksum * /* out_cksum */); typedef krb5_error_code (*SUM_VERF_FUNC) ( - krb5_const krb5_checksum * /* out_cksum */, - krb5_const krb5_pointer /* in */, - krb5_const size_t /* in_length */, - krb5_const krb5_pointer /* key/seed */, - krb5_const size_t /* key/seed size */); + const krb5_checksum * /* out_cksum */, + const krb5_pointer /* in */, + const size_t /* in_length */, + const krb5_pointer /* key/seed */, + const size_t /* key/seed size */); typedef struct _krb5_checksum_entry { krb5_magic magic; @@ -737,8 +737,8 @@ time_t gmt_mktime (struct tm *); /* this helper fct is in libkrb5, but it makes sense declared here. */ krb5_error_code krb5_encrypt_helper -(krb5_context context, krb5_const krb5_keyblock *key, - krb5_keyusage keyusage, krb5_const krb5_data *plain, +(krb5_context context, const krb5_keyblock *key, + krb5_keyusage keyusage, const krb5_data *plain, krb5_enc_data *cipher); /* @@ -832,7 +832,7 @@ typedef krb5_error_code (*krb5_preauth_obtain_proc) krb5_etype_info, krb5_keyblock *, krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, + const krb5_enctype, krb5_data *, krb5_const_pointer, krb5_keyblock **), @@ -847,13 +847,13 @@ typedef krb5_error_code (*krb5_preauth_process_proc) krb5_kdc_req *, krb5_kdc_rep *, krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, + const krb5_enctype, krb5_data *, krb5_const_pointer, krb5_keyblock **), krb5_const_pointer, krb5_error_code ( * )(krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * ), krb5_keyblock **, @@ -873,7 +873,7 @@ krb5_error_code krb5_obtain_padata (krb5_context, krb5_pa_data **, krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, + const krb5_enctype, krb5_data *, krb5_const_pointer, krb5_keyblock **), @@ -886,13 +886,13 @@ krb5_error_code krb5_process_padata krb5_kdc_req *, krb5_kdc_rep *, krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, + const krb5_enctype, krb5_data *, krb5_const_pointer, krb5_keyblock **), krb5_const_pointer, krb5_error_code ( * )(krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * ), krb5_keyblock **, @@ -1395,16 +1395,16 @@ krb5_error_code decode_krb5_predicted_sam_response */ krb5_error_code krb5_encrypt_tkt_part (krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_ticket * ); krb5_error_code krb5_encode_kdc_rep (krb5_context, - krb5_const krb5_msgtype, - krb5_const krb5_enc_kdc_rep_part *, + const krb5_msgtype, + const krb5_enc_kdc_rep_part *, int using_subkey, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_kdc_rep *, krb5_data ** ); @@ -1557,9 +1557,9 @@ typedef struct _krb5int_access { const struct krb5_hash_provider *md5_hash_provider; const struct krb5_enc_provider *arcfour_enc_provider; krb5_error_code (* krb5_hmac) - (krb5_const struct krb5_hash_provider *hash, - krb5_const krb5_keyblock *key, unsigned int icount, - krb5_const krb5_data *input, krb5_data *output); + (const struct krb5_hash_provider *hash, + const krb5_keyblock *key, unsigned int icount, + const krb5_data *input, krb5_data *output); } krb5int_access; #define KRB5INT_ACCESS_VERSION \ @@ -1652,7 +1652,7 @@ typedef struct _krb5_kt_ops { /* routines always present */ krb5_error_code (KRB5_CALLCONV *resolve) (krb5_context, - krb5_const char *, + const char *, krb5_keytab *); krb5_error_code (KRB5_CALLCONV *get_name) (krb5_context, diff --git a/src/include/krb5.hin b/src/include/krb5.hin index e94eaad91..0f2028720 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -201,10 +201,8 @@ typedef struct _krb5_data { #define SALT_TYPE_AFS_LENGTH VALID_UINT_BITS #define SALT_TYPE_NO_LENGTH VALID_UINT_BITS -#define krb5_const const - typedef void * krb5_pointer; -typedef void krb5_const * krb5_const_pointer; +typedef void const * krb5_const_pointer; typedef struct krb5_principal_data { krb5_magic magic; @@ -234,7 +232,7 @@ typedef krb5_principal_data * krb5_principal; #define KRB5_NT_UID 5 /* constant version thereof: */ -typedef krb5_const krb5_principal_data *krb5_const_principal; +typedef const krb5_principal_data *krb5_const_principal; #define krb5_princ_realm(context, princ) (&(princ)->realm) #define krb5_princ_set_realm(context, princ,value) ((princ)->realm = *(value)) @@ -391,15 +389,15 @@ enum { krb5_error_code KRB5_CALLCONV krb5_c_encrypt - (krb5_context context, krb5_const krb5_keyblock *key, - krb5_keyusage usage, krb5_const krb5_data *cipher_state, - krb5_const krb5_data *input, krb5_enc_data *output); + (krb5_context context, const krb5_keyblock *key, + krb5_keyusage usage, const krb5_data *cipher_state, + const krb5_data *input, krb5_enc_data *output); krb5_error_code KRB5_CALLCONV krb5_c_decrypt - (krb5_context context, krb5_const krb5_keyblock *key, - krb5_keyusage usage, krb5_const krb5_data *cipher_state, - krb5_const krb5_enc_data *input, krb5_data *output); + (krb5_context context, const krb5_keyblock *key, + krb5_keyusage usage, const krb5_data *cipher_state, + const krb5_enc_data *input, krb5_data *output); krb5_error_code KRB5_CALLCONV krb5_c_encrypt_length @@ -414,12 +412,12 @@ krb5_error_code KRB5_CALLCONV krb5_error_code KRB5_CALLCONV krb5_c_init_state (krb5_context context, -krb5_const krb5_keyblock *key, krb5_keyusage usage, +const krb5_keyblock *key, krb5_keyusage usage, krb5_data *new_state); krb5_error_code KRB5_CALLCONV krb5_c_free_state -(krb5_context context, krb5_const krb5_keyblock *key, krb5_data *state); +(krb5_context context, const krb5_keyblock *key, krb5_data *state); krb5_error_code KRB5_CALLCONV krb5_c_make_random_key @@ -459,7 +457,7 @@ krb5_c_random_os_entropy krb5_error_code KRB5_CALLCONV krb5_c_string_to_key (krb5_context context, krb5_enctype enctype, - krb5_const krb5_data *string, krb5_const krb5_data *salt, + const krb5_data *string, const krb5_data *salt, krb5_keyblock *key); krb5_error_code KRB5_CALLCONV @@ -470,15 +468,15 @@ krb5_error_code KRB5_CALLCONV krb5_error_code KRB5_CALLCONV krb5_c_make_checksum (krb5_context context, krb5_cksumtype cksumtype, - krb5_const krb5_keyblock *key, krb5_keyusage usage, - krb5_const krb5_data *input, krb5_checksum *cksum); + const krb5_keyblock *key, krb5_keyusage usage, + const krb5_data *input, krb5_checksum *cksum); krb5_error_code KRB5_CALLCONV krb5_c_verify_checksum (krb5_context context, - krb5_const krb5_keyblock *key, krb5_keyusage usage, - krb5_const krb5_data *data, - krb5_const krb5_checksum *cksum, + const krb5_keyblock *key, krb5_keyusage usage, + const krb5_data *data, + const krb5_checksum *cksum, krb5_boolean *valid); krb5_error_code KRB5_CALLCONV @@ -536,52 +534,52 @@ krb5_boolean KRB5_CALLCONV is_keyed_cksum */ krb5_error_code KRB5_CALLCONV krb5_encrypt (krb5_context context, - krb5_const krb5_pointer inptr, + const krb5_pointer inptr, krb5_pointer outptr, - krb5_const size_t size, + const size_t size, krb5_encrypt_block * eblock, krb5_pointer ivec); krb5_error_code KRB5_CALLCONV krb5_decrypt (krb5_context context, - krb5_const krb5_pointer inptr, + const krb5_pointer inptr, krb5_pointer outptr, - krb5_const size_t size, + const size_t size, krb5_encrypt_block * eblock, krb5_pointer ivec); krb5_error_code KRB5_CALLCONV krb5_process_key (krb5_context context, krb5_encrypt_block * eblock, - krb5_const krb5_keyblock * key); + const krb5_keyblock * key); krb5_error_code KRB5_CALLCONV krb5_finish_key (krb5_context context, krb5_encrypt_block * eblock); krb5_error_code KRB5_CALLCONV krb5_string_to_key (krb5_context context, - krb5_const krb5_encrypt_block * eblock, + const krb5_encrypt_block * eblock, krb5_keyblock * keyblock, - krb5_const krb5_data * data, - krb5_const krb5_data * salt); + const krb5_data * data, + const krb5_data * salt); krb5_error_code KRB5_CALLCONV krb5_init_random_key (krb5_context context, - krb5_const krb5_encrypt_block * eblock, - krb5_const krb5_keyblock * keyblock, + const krb5_encrypt_block * eblock, + const krb5_keyblock * keyblock, krb5_pointer * ptr); krb5_error_code KRB5_CALLCONV krb5_finish_random_key (krb5_context context, - krb5_const krb5_encrypt_block * eblock, + const krb5_encrypt_block * eblock, krb5_pointer * ptr); krb5_error_code KRB5_CALLCONV krb5_random_key (krb5_context context, - krb5_const krb5_encrypt_block * eblock, + const krb5_encrypt_block * eblock, krb5_pointer ptr, krb5_keyblock ** keyblock); krb5_enctype KRB5_CALLCONV krb5_eblock_enctype (krb5_context context, - krb5_const krb5_encrypt_block * eblock); + const krb5_encrypt_block * eblock); krb5_error_code KRB5_CALLCONV krb5_use_enctype (krb5_context context, krb5_encrypt_block * eblock, - krb5_const krb5_enctype enctype); + const krb5_enctype enctype); size_t KRB5_CALLCONV krb5_encrypt_size (size_t length, krb5_enctype crypto); @@ -590,16 +588,16 @@ size_t KRB5_CALLCONV krb5_checksum_size krb5_cksumtype ctype); krb5_error_code KRB5_CALLCONV krb5_calculate_checksum (krb5_context context, - krb5_const krb5_cksumtype ctype, - krb5_const krb5_pointer in, krb5_const size_t in_length, - krb5_const krb5_pointer seed, krb5_const size_t seed_length, + const krb5_cksumtype ctype, + const krb5_pointer in, const size_t in_length, + const krb5_pointer seed, const size_t seed_length, krb5_checksum * outcksum); krb5_error_code KRB5_CALLCONV krb5_verify_checksum (krb5_context context, krb5_cksumtype ctype, - krb5_const krb5_checksum * cksum, - krb5_const krb5_pointer in, krb5_const size_t in_length, - krb5_const krb5_pointer seed, krb5_const size_t seed_length); + const krb5_checksum * cksum, + const krb5_pointer in, const size_t in_length, + const krb5_pointer seed, const size_t seed_length); krb5_error_code KRB5_CALLCONV krb5_random_confounder (size_t, krb5_pointer); @@ -1319,18 +1317,18 @@ void KRB5_CALLCONV krb5_free_context krb5_error_code krb5_set_default_in_tkt_ktypes (krb5_context, - krb5_const krb5_enctype *); + const krb5_enctype *); krb5_error_code krb5_get_default_in_tkt_ktypes (krb5_context, krb5_enctype **); krb5_error_code krb5_set_default_tgs_ktypes (krb5_context, - krb5_const krb5_enctype *); + const krb5_enctype *); krb5_error_code KRB5_CALLCONV krb5_set_default_tgs_enctypes (krb5_context, - krb5_const krb5_enctype *); + const krb5_enctype *); krb5_error_code KRB5_CALLCONV krb5_get_tgs_ktypes (krb5_context, krb5_const_principal, @@ -1347,12 +1345,12 @@ krb5_boolean krb5_is_permitted_enctype /* libkrb.spec */ krb5_error_code krb5_kdc_rep_decrypt_proc (krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * ); krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part (krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_ticket * ); krb5_error_code krb5_get_cred_from_kdc (krb5_context, @@ -1384,33 +1382,33 @@ void KRB5_CALLCONV krb5_free_tgt_creds krb5_error_code KRB5_CALLCONV krb5_get_credentials (krb5_context, - krb5_const krb5_flags, + const krb5_flags, krb5_ccache, krb5_creds *, krb5_creds **); krb5_error_code KRB5_CALLCONV krb5_get_credentials_validate (krb5_context, - krb5_const krb5_flags, + const krb5_flags, krb5_ccache, krb5_creds *, krb5_creds **); krb5_error_code KRB5_CALLCONV krb5_get_credentials_renew (krb5_context, - krb5_const krb5_flags, + const krb5_flags, krb5_ccache, krb5_creds *, krb5_creds **); krb5_error_code krb5_get_cred_via_tkt (krb5_context, krb5_creds *, - krb5_const krb5_flags, - krb5_address * krb5_const *, + const krb5_flags, + krb5_address * const *, krb5_creds *, krb5_creds **); krb5_error_code KRB5_CALLCONV krb5_mk_req (krb5_context, krb5_auth_context *, - krb5_const krb5_flags, + const krb5_flags, char *, char *, krb5_data *, @@ -1419,7 +1417,7 @@ krb5_error_code KRB5_CALLCONV krb5_mk_req krb5_error_code KRB5_CALLCONV krb5_mk_req_extended (krb5_context, krb5_auth_context *, - krb5_const krb5_flags, + const krb5_flags, krb5_data *, krb5_creds *, krb5_data * ); @@ -1430,31 +1428,31 @@ krb5_error_code KRB5_CALLCONV krb5_mk_rep krb5_error_code KRB5_CALLCONV krb5_rd_rep (krb5_context, krb5_auth_context, - krb5_const krb5_data *, + const krb5_data *, krb5_ap_rep_enc_part **); krb5_error_code KRB5_CALLCONV krb5_mk_error (krb5_context, - krb5_const krb5_error *, + const krb5_error *, krb5_data * ); krb5_error_code KRB5_CALLCONV krb5_rd_error (krb5_context, - krb5_const krb5_data *, + const krb5_data *, krb5_error ** ); krb5_error_code KRB5_CALLCONV krb5_rd_safe (krb5_context, krb5_auth_context, - krb5_const krb5_data *, + const krb5_data *, krb5_data *, krb5_replay_data *); krb5_error_code KRB5_CALLCONV krb5_rd_priv (krb5_context, krb5_auth_context, - krb5_const krb5_data *, + const krb5_data *, krb5_data *, krb5_replay_data *); krb5_error_code KRB5_CALLCONV krb5_parse_name (krb5_context, - krb5_const char *, + const char *, krb5_principal * ); krb5_error_code KRB5_CALLCONV krb5_unparse_name (krb5_context, @@ -1471,16 +1469,16 @@ krb5_error_code KRB5_CALLCONV krb5_set_principal_realm krb5_boolean krb5_address_search (krb5_context, - krb5_const krb5_address *, - krb5_address * krb5_const *); + const krb5_address *, + krb5_address * const *); krb5_boolean krb5_address_compare (krb5_context, - krb5_const krb5_address *, - krb5_const krb5_address *); + const krb5_address *, + const krb5_address *); int krb5_address_order (krb5_context, - krb5_const krb5_address *, - krb5_const krb5_address *); + const krb5_address *, + const krb5_address *); krb5_boolean krb5_realm_compare (krb5_context, krb5_const_principal, @@ -1491,19 +1489,19 @@ krb5_boolean KRB5_CALLCONV krb5_principal_compare krb5_const_principal); krb5_error_code KRB5_CALLCONV krb5_copy_keyblock (krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_keyblock **); krb5_error_code KRB5_CALLCONV krb5_copy_keyblock_contents (krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_keyblock *); krb5_error_code KRB5_CALLCONV krb5_copy_creds (krb5_context, - krb5_const krb5_creds *, + const krb5_creds *, krb5_creds **); krb5_error_code KRB5_CALLCONV krb5_copy_data (krb5_context, - krb5_const krb5_data *, + const krb5_data *, krb5_data **); krb5_error_code KRB5_CALLCONV krb5_copy_principal (krb5_context, @@ -1515,23 +1513,23 @@ krb5_error_code KRB5_CALLCONV krb5_copy_addr krb5_address **); krb5_error_code KRB5_CALLCONV krb5_copy_addresses (krb5_context, - krb5_address * krb5_const *, + krb5_address * const *, krb5_address ***); krb5_error_code KRB5_CALLCONV krb5_copy_ticket (krb5_context, - krb5_const krb5_ticket *, + const krb5_ticket *, krb5_ticket **); krb5_error_code KRB5_CALLCONV krb5_copy_authdata (krb5_context, - krb5_authdata * krb5_const *, + krb5_authdata * const *, krb5_authdata ***); krb5_error_code KRB5_CALLCONV krb5_copy_authenticator (krb5_context, - krb5_const krb5_authenticator *, + const krb5_authenticator *, krb5_authenticator **); krb5_error_code KRB5_CALLCONV krb5_copy_checksum (krb5_context, - krb5_const krb5_checksum *, + const krb5_checksum *, krb5_checksum **); void krb5_init_ets (krb5_context); @@ -1539,32 +1537,32 @@ void krb5_free_ets (krb5_context); krb5_error_code krb5_generate_subkey (krb5_context, - krb5_const krb5_keyblock *, krb5_keyblock **); + const krb5_keyblock *, krb5_keyblock **); krb5_error_code krb5_generate_seq_number (krb5_context, - krb5_const krb5_keyblock *, krb5_int32 *); + const krb5_keyblock *, krb5_int32 *); krb5_error_code KRB5_CALLCONV krb5_get_server_rcache (krb5_context, - krb5_const krb5_data *, krb5_rcache *); + const krb5_data *, krb5_rcache *); krb5_error_code KRB5_CALLCONV_C krb5_build_principal_ext - (krb5_context, krb5_principal *, unsigned int, krb5_const char *, ...); + (krb5_context, krb5_principal *, unsigned int, const char *, ...); krb5_error_code KRB5_CALLCONV_C krb5_build_principal - (krb5_context, krb5_principal *, unsigned int, krb5_const char *, ...); + (krb5_context, krb5_principal *, unsigned int, const char *, ...); #ifdef va_start /* XXX depending on varargs include file defining va_start... */ krb5_error_code krb5_build_principal_va (krb5_context, - krb5_principal, unsigned int, krb5_const char *, va_list); + krb5_principal, unsigned int, const char *, va_list); #endif krb5_error_code KRB5_CALLCONV krb5_425_conv_principal (krb5_context, - krb5_const char *name, - krb5_const char *instance, krb5_const char *realm, + const char *name, + const char *instance, const char *realm, krb5_principal *princ); krb5_error_code KRB5_CALLCONV krb5_524_conv_principal - (krb5_context context, krb5_const krb5_principal princ, + (krb5_context context, const krb5_principal princ, char *name, char *inst, char *realm); krb5_error_code KRB5_CALLCONV krb5_mk_chpw_req @@ -1584,7 +1582,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_register struct _krb5_kt_ops * ); krb5_error_code KRB5_CALLCONV krb5_kt_resolve (krb5_context, - krb5_const char *, + const char *, krb5_keytab * ); krb5_error_code KRB5_CALLCONV krb5_kt_default_name (krb5_context, @@ -1731,14 +1729,14 @@ krb5_error_code KRB5_CALLCONV krb5_get_default_realm char ** ); krb5_error_code KRB5_CALLCONV krb5_set_default_realm (krb5_context, - krb5_const char * ); + const char * ); void KRB5_CALLCONV krb5_free_default_realm (krb5_context, char * ); krb5_error_code KRB5_CALLCONV krb5_sname_to_principal (krb5_context, - krb5_const char *, - krb5_const char *, + const char *, + const char *, krb5_int32, krb5_principal *); krb5_error_code KRB5_CALLCONV @@ -1749,7 +1747,7 @@ krb5_change_password #ifndef macintosh krb5_error_code krb5_set_config_files - (krb5_context, krb5_const char **); + (krb5_context, const char **); krb5_error_code KRB5_CALLCONV krb5_get_default_config_files (char ***filenames); @@ -1765,31 +1763,31 @@ krb5_get_profile krb5_error_code krb5_send_tgs (krb5_context, - krb5_const krb5_flags, - krb5_const krb5_ticket_times *, - krb5_const krb5_enctype *, + const krb5_flags, + const krb5_ticket_times *, + const krb5_enctype *, krb5_const_principal, - krb5_address * krb5_const *, - krb5_authdata * krb5_const *, - krb5_pa_data * krb5_const *, - krb5_const krb5_data *, + krb5_address * const *, + krb5_authdata * const *, + krb5_pa_data * const *, + const krb5_data *, krb5_creds *, krb5_response * ); krb5_error_code KRB5_CALLCONV krb5_get_in_tkt (krb5_context, - krb5_const krb5_flags, - krb5_address * krb5_const *, + const krb5_flags, + krb5_address * const *, krb5_enctype *, krb5_preauthtype *, krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, + const krb5_enctype, krb5_data *, krb5_const_pointer, krb5_keyblock **), krb5_const_pointer, krb5_error_code ( * )(krb5_context, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * ), krb5_const_pointer, @@ -1799,33 +1797,33 @@ krb5_error_code KRB5_CALLCONV krb5_get_in_tkt krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_password (krb5_context, - krb5_const krb5_flags, - krb5_address * krb5_const *, + const krb5_flags, + krb5_address * const *, krb5_enctype *, krb5_preauthtype *, - krb5_const char *, + const char *, krb5_ccache, krb5_creds *, krb5_kdc_rep ** ); krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_skey (krb5_context, - krb5_const krb5_flags, - krb5_address * krb5_const *, + const krb5_flags, + krb5_address * const *, krb5_enctype *, krb5_preauthtype *, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_ccache, krb5_creds *, krb5_kdc_rep ** ); krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_keytab (krb5_context, - krb5_const krb5_flags, - krb5_address * krb5_const *, + const krb5_flags, + krb5_address * const *, krb5_enctype *, krb5_preauthtype *, - krb5_const krb5_keytab, + const krb5_keytab, krb5_ccache, krb5_creds *, krb5_kdc_rep ** ); @@ -1834,13 +1832,13 @@ krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_keytab krb5_error_code krb5_decode_kdc_rep (krb5_context, krb5_data *, - krb5_const krb5_keyblock *, + const krb5_keyblock *, krb5_kdc_rep ** ); krb5_error_code KRB5_CALLCONV krb5_rd_req (krb5_context, krb5_auth_context *, - krb5_const krb5_data *, + const krb5_data *, krb5_const_principal, krb5_keytab, krb5_flags *, @@ -1849,7 +1847,7 @@ krb5_error_code KRB5_CALLCONV krb5_rd_req krb5_error_code krb5_rd_req_decoded (krb5_context, krb5_auth_context *, - krb5_const krb5_ap_req *, + const krb5_ap_req *, krb5_const_principal, krb5_keytab, krb5_flags *, @@ -1858,7 +1856,7 @@ krb5_error_code krb5_rd_req_decoded krb5_error_code krb5_rd_req_decoded_anyflag (krb5_context, krb5_auth_context *, - krb5_const krb5_ap_req *, + const krb5_ap_req *, krb5_const_principal, krb5_keytab, krb5_flags *, @@ -1874,13 +1872,13 @@ krb5_error_code KRB5_CALLCONV krb5_kt_read_service_key krb5_error_code KRB5_CALLCONV krb5_mk_safe (krb5_context, krb5_auth_context, - krb5_const krb5_data *, + const krb5_data *, krb5_data *, krb5_replay_data *); krb5_error_code KRB5_CALLCONV krb5_mk_priv (krb5_context, krb5_auth_context, - krb5_const krb5_data *, + const krb5_data *, krb5_data *, krb5_replay_data *); krb5_error_code KRB5_CALLCONV krb5_cc_register @@ -1924,8 +1922,8 @@ krb5_error_code KRB5_CALLCONV krb5_recvauth_version krb5_error_code krb5_walk_realm_tree (krb5_context, - krb5_const krb5_data *, - krb5_const krb5_data *, + const krb5_data *, + const krb5_data *, krb5_principal **, int);