diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
| commit | 02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch) | |
| tree | 61b9147863cd8be3eff63903dc36cae168254bd5 /src/include/krb5 | |
| parent | 162ab371748cba0cc6f172419bd6e71fa04bb878 (diff) | |
make mark-cstyle
make reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/krb5.hin | 86 | ||||
| -rw-r--r-- | src/include/krb5/locate_plugin.h | 4 | ||||
| -rw-r--r-- | src/include/krb5/preauth_plugin.h | 2 |
3 files changed, 46 insertions, 46 deletions
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index e0128d058..464f3fa30 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -8,7 +8,7 @@ * require a specific license from the United States Government. * It is the responsibility of any person or organization contemplating * export to obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright @@ -22,21 +22,21 @@ * M.I.T. makes no representations about the suitability of * this software for any purpose. It is provided "as is" without express * or implied warranty. - * + * * * General definitions for Kerberos version 5. */ /* * Copyright (C) 1998 by the FundsXpress, INC. - * + * * All rights reserved. - * + * * Export of this software from the United States of America may require * a specific license from the United States Government. It is the * responsibility of any person or organization contemplating export to * obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright @@ -47,7 +47,7 @@ * permission. FundsXpress makes no representations about the suitability of * this software for any purpose. It is provided "as is" without express * or implied warranty. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -162,7 +162,7 @@ typedef unsigned short krb5_ui_4; indicator */ #define KRB5_INT32_MIN (-KRB5_INT32_MAX-1) -#define KRB5_INT16_MAX 65535 +#define KRB5_INT16_MAX 65535 /* this strange form is necessary since - is a unary operator, not a sign indicator */ #define KRB5_INT16_MIN (-KRB5_INT16_MAX-1) @@ -187,8 +187,8 @@ typedef unsigned short krb5_ui_4; #endif typedef unsigned int krb5_boolean; -typedef unsigned int krb5_msgtype; -typedef unsigned int krb5_kvno; +typedef unsigned int krb5_msgtype; +typedef unsigned int krb5_kvno; typedef krb5_int32 krb5_addrtype; typedef krb5_int32 krb5_enctype; @@ -217,9 +217,9 @@ typedef struct _krb5_octet_data { krb5_octet *data; } krb5_octet_data; -/* +/* * Hack length for crypto library to use the afs_string_to_key It is - * equivalent to -1 without possible sign extension + * equivalent to -1 without possible sign extension * We also overload for an unset salt type length - which is also -1, but * hey, why not.... */ @@ -548,9 +548,9 @@ krb5_error_code KRB5_CALLCONV (krb5_context context, krb5_data *data); /* -* Collect entropy from the OS if possible. strong requests that as strong -* of a source of entropy as available be used. Setting strong may -* increase the probability of blocking and should not be used for normal +* Collect entropy from the OS if possible. strong requests that as strong +* of a source of entropy as available be used. Setting strong may +* increase the probability of blocking and should not be used for normal * applications. Good uses include seeding the PRNG for kadmind * and realm setup. * If successful is non-null, then successful is set to 1 if the OS provided @@ -587,15 +587,15 @@ krb5_error_code KRB5_CALLCONV (krb5_context context, krb5_cksumtype cksumtype, 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_context context, const krb5_keyblock *key, krb5_keyusage usage, const krb5_data *data, const krb5_checksum *cksum, krb5_boolean *valid); - + krb5_error_code KRB5_CALLCONV krb5_c_checksum_length (krb5_context context, krb5_cksumtype cksumtype, @@ -603,7 +603,7 @@ krb5_error_code KRB5_CALLCONV krb5_error_code KRB5_CALLCONV krb5_c_keyed_checksum_types - (krb5_context context, krb5_enctype enctype, + (krb5_context context, krb5_enctype enctype, unsigned int *count, krb5_cksumtype **cksumtypes); #define KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS 1 @@ -683,7 +683,7 @@ krb5_error_code KRB5_CALLCONV krb5_error_code KRB5_CALLCONV krb5_c_verify_checksum_iov - (krb5_context context, + (krb5_context context, krb5_cksumtype cksumtype, const krb5_keyblock *key, krb5_keyusage usage, const krb5_crypto_iov *data, size_t num_data, @@ -896,7 +896,7 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum /* * Mask of ticket flags in the TGT which should be converted into KDC * options when using the TGT to get derivitive tickets. - * + * * New mask = KDC_OPT_FORWARDABLE | KDC_OPT_PROXIABLE | * KDC_OPT_ALLOW_POSTDATE | KDC_OPT_RENEWABLE */ @@ -1113,7 +1113,7 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum /* Time set */ typedef struct _krb5_ticket_times { krb5_timestamp authtime; /* XXX ? should ktime in KDC_REP == authtime - in ticket? otherwise client can't get this */ + in ticket? otherwise client can't get this */ krb5_timestamp starttime; /* optional in ticket, if not present, use authtime */ krb5_timestamp endtime; @@ -1330,7 +1330,7 @@ typedef struct _krb5_cred_enc_part { krb5_address *s_address; /* sender address, optional */ krb5_address *r_address; /* recipient address, optional */ krb5_cred_info **ticket_info; -} krb5_cred_enc_part; +} krb5_cred_enc_part; typedef struct _krb5_cred { krb5_magic magic; @@ -1385,11 +1385,11 @@ typedef struct _krb5_pa_pac_req { #define KRB5_AUTH_CONTEXT_RET_SEQUENCE 0x00000008 #define KRB5_AUTH_CONTEXT_PERMIT_ALL 0x00000010 #define KRB5_AUTH_CONTEXT_USE_SUBKEY 0x00000020 - -typedef struct krb5_replay_data { - krb5_timestamp timestamp; + +typedef struct krb5_replay_data { + krb5_timestamp timestamp; krb5_int32 usec; - krb5_ui_4 seq; + krb5_ui_4 seq; } krb5_replay_data; /* flags for krb5_auth_con_genaddrs() */ @@ -1401,7 +1401,7 @@ typedef struct krb5_replay_data { /* type of function used as a callback to generate checksum data for * mk_req */ -typedef krb5_error_code +typedef krb5_error_code (KRB5_CALLCONV * krb5_mk_req_checksum_func) (krb5_context, krb5_auth_context , void *, krb5_data **); @@ -1502,8 +1502,8 @@ krb5_cc_move (krb5_context context, krb5_ccache src, krb5_ccache dst); krb5_error_code KRB5_CALLCONV krb5_cc_last_change_time ( - krb5_context context, - krb5_ccache ccache, + krb5_context context, + krb5_ccache ccache, krb5_timestamp *change_time); krb5_error_code KRB5_CALLCONV @@ -1615,7 +1615,7 @@ void KRB5_CALLCONV krb5_free_context krb5_error_code KRB5_CALLCONV krb5_copy_context (krb5_context, krb5_context *); -krb5_error_code KRB5_CALLCONV +krb5_error_code KRB5_CALLCONV krb5_set_default_tgs_enctypes (krb5_context, const krb5_enctype *); @@ -1792,7 +1792,7 @@ krb5_boolean KRB5_CALLCONV krb5_principal_compare_flags int); krb5_error_code KRB5_CALLCONV krb5_init_keyblock (krb5_context, krb5_enctype enctype, - size_t length, krb5_keyblock **out); + size_t length, krb5_keyblock **out); /* Initialize a new keyblock and allocate storage * for the contents of the key, which will be freed along * with the keyblock when krb5_free_keyblock is called. @@ -1875,7 +1875,7 @@ krb5_error_code KRB5_CALLCONV krb5_425_conv_principal krb5_principal *princ); krb5_error_code KRB5_CALLCONV krb5_524_conv_principal - (krb5_context context, krb5_const_principal princ, + (krb5_context context, krb5_const_principal princ, char *name, char *inst, char *realm); struct credentials; @@ -2102,7 +2102,7 @@ krb5_error_code KRB5_CALLCONV krb5_mk_priv krb5_data *, krb5_replay_data *); -krb5_error_code KRB5_CALLCONV krb5_sendauth +krb5_error_code KRB5_CALLCONV krb5_sendauth (krb5_context, krb5_auth_context *, krb5_pointer, @@ -2116,14 +2116,14 @@ krb5_error_code KRB5_CALLCONV krb5_sendauth krb5_error **, krb5_ap_rep_enc_part **, krb5_creds **); - + krb5_error_code KRB5_CALLCONV krb5_recvauth (krb5_context, krb5_auth_context *, krb5_pointer, char *, krb5_principal, - krb5_int32, + krb5_int32, krb5_keytab, krb5_ticket **); krb5_error_code KRB5_CALLCONV krb5_recvauth_version @@ -2131,7 +2131,7 @@ krb5_error_code KRB5_CALLCONV krb5_recvauth_version krb5_auth_context *, krb5_pointer, krb5_principal, - krb5_int32, + krb5_int32, krb5_keytab, krb5_ticket **, krb5_data *); @@ -2158,14 +2158,14 @@ krb5_error_code KRB5_CALLCONV krb5_rd_cred krb5_replay_data *); krb5_error_code KRB5_CALLCONV krb5_fwd_tgt_creds - (krb5_context, + (krb5_context, krb5_auth_context, char *, - krb5_principal, - krb5_principal, + krb5_principal, + krb5_principal, krb5_ccache, int forwardable, - krb5_data *); + krb5_data *); krb5_error_code KRB5_CALLCONV krb5_auth_con_init (krb5_context, @@ -2564,13 +2564,13 @@ krb5_get_renewed_creds krb5_error_code KRB5_CALLCONV krb5_decode_ticket -(const krb5_data *code, +(const krb5_data *code, krb5_ticket **rep); void KRB5_CALLCONV krb5_appdefault_string (krb5_context context, - const char *appname, + const char *appname, const krb5_data *realm, const char *option, const char *default_value, @@ -2579,7 +2579,7 @@ krb5_appdefault_string void KRB5_CALLCONV krb5_appdefault_boolean (krb5_context context, - const char *appname, + const char *appname, const krb5_data *realm, const char *option, int default_value, diff --git a/src/include/krb5/locate_plugin.h b/src/include/krb5/locate_plugin.h index f9f29baf7..8496f276b 100644 --- a/src/include/krb5/locate_plugin.h +++ b/src/include/krb5/locate_plugin.h @@ -8,7 +8,7 @@ * require a specific license from the United States Government. * It is the responsibility of any person or organization contemplating * export to obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright @@ -22,7 +22,7 @@ * M.I.T. makes no representations about the suitability of * this software for any purpose. It is provided "as is" without express * or implied warranty. - * + * * * Service location plugin definitions for Kerberos 5. */ diff --git a/src/include/krb5/preauth_plugin.h b/src/include/krb5/preauth_plugin.h index e11913e3f..dd0820af1 100644 --- a/src/include/krb5/preauth_plugin.h +++ b/src/include/krb5/preauth_plugin.h @@ -367,7 +367,7 @@ typedef void /* Return the flags which the KDC should use for this module. This is a * callback instead of a static value because the module may or may not - * wish to count itself as a hardware preauthentication module (in other + * wish to count itself as a hardware preauthentication module (in other * words, the flags may be affected by the configuration, for example if a * site administrator can force a particular preauthentication type to be * supported using only hardware). This function is called for each entry |
