diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-01-22 23:37:35 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-01-22 23:37:35 +0000 |
| commit | 57ed9284758599aac78e7441a0070e2519ca0e86 (patch) | |
| tree | 5fd37ea7dc8a20f61e0e30eb4886f14243d6c695 /src/lib | |
| parent | f391d18be3aa3de52b391596bd8025010281cfb7 (diff) | |
fix trailing whitespace
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21779 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 12 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/copy_ccache.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/gssapi_krb5.c | 11 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5sealiov.c | 3 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5sealv3iov.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5unsealiov.c | 3 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/krb5_gss_glue.c | 11 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/util_crypt.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_decode.c | 5 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 4 | ||||
| -rw-r--r-- | src/lib/krb5/rcache/rc_dfl.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/rcache/rcdef.c | 4 | ||||
| -rw-r--r-- | src/lib/krb5/rcache/t_replay.c | 4 |
14 files changed, 33 insertions, 38 deletions
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 5cdb5dca8..f96dfe595 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -335,7 +335,7 @@ kg_accept_dce(minor_status, context_handle, verifier_cred_handle, /* real failure code follows */ if (ctx) - (void) krb5_gss_delete_sec_context(minor_status, + (void) krb5_gss_delete_sec_context(minor_status, (gss_ctx_id_t *) &ctx, NULL); *context_handle = GSS_C_NO_CONTEXT; *minor_status = code; @@ -910,7 +910,7 @@ kg_accept_krb5(minor_status, context_handle, * DCE_STYLE implies that we will use a subkey.) */ if (ctx->proto == 0 && - (ctx->gss_flags & GSS_C_DCE_STYLE) == 0 && + (ctx->gss_flags & GSS_C_DCE_STYLE) == 0 && (ap_req_options & AP_OPTS_USE_SUBKEY)) { code = (*kaccess.krb5_auth_con_get_subkey_enctype) (context, auth_context, diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index f32cd81c6..48471b4f4 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -264,11 +264,11 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred) if (!err) { err = kim_ccache_create_from_client_identity (&kimccache, identity); } - + if (!err) { err = kim_ccache_get_state (kimccache, &state); } - + if (!err && state != kim_credentials_state_valid) { if (state == kim_credentials_state_needs_validation) { err = kim_ccache_validate (kimccache, KIM_OPTIONS_DEFAULT); @@ -277,13 +277,13 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred) ccache = NULL; } } - + if (!kimccache && kim_library_allow_automatic_prompting ()) { /* ccache does not already exist, create a new one */ - err = kim_ccache_create_new (&kimccache, identity, + err = kim_ccache_create_new (&kimccache, identity, KIM_OPTIONS_DEFAULT); - } - + } + if (!err) { err = kim_ccache_get_krb5_ccache (kimccache, context, &ccache); } diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c index 06caa7171..e7b48e04f 100644 --- a/src/lib/gssapi/krb5/copy_ccache.c +++ b/src/lib/gssapi/krb5/copy_ccache.c @@ -13,7 +13,7 @@ gss_krb5int_copy_ccache(OM_uint32 *minor_status, krb5_error_code code; krb5_context context; krb5_ccache out_ccache; - + assert(value->length == sizeof(out_ccache)); if (value->length != sizeof(out_ccache)) diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index bc5055cd4..6e1d61869 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -380,7 +380,7 @@ krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status, *minor_status = EINVAL; - return GSS_S_UNAVAILABLE; + return GSS_S_UNAVAILABLE; } /* @@ -500,7 +500,7 @@ krb5_gss_set_sec_context_option (OM_uint32 *minor_status, *minor_status = EINVAL; - return GSS_S_UNAVAILABLE; + return GSS_S_UNAVAILABLE; } /* @@ -626,7 +626,7 @@ krb5_gssspi_mech_invoke (OM_uint32 *minor_status, static struct gss_config krb5_mechanism = { { GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID }, - NULL, + NULL, krb5_gss_acquire_cred, krb5_gss_release_cred, krb5_gss_init_sec_context, @@ -674,8 +674,8 @@ static struct gss_config krb5_mechanism = { krb5_gss_set_sec_context_option, krb5_gssspi_set_cred_option, krb5_gssspi_mech_invoke, - NULL, /* wrap_aead */ - NULL, /* unwrap_aead */ + NULL, /* wrap_aead */ + NULL, /* unwrap_aead */ krb5_gss_wrap_iov, krb5_gss_unwrap_iov, krb5_gss_wrap_iov_length, @@ -797,4 +797,3 @@ OM_uint32 gss_krb5int_initialize_library (void) return CALL_INIT_FUNCTION(gss_krb5int_lib_init); #endif } - diff --git a/src/lib/gssapi/krb5/k5sealiov.c b/src/lib/gssapi/krb5/k5sealiov.c index bbc124034..1d0c57300 100644 --- a/src/lib/gssapi/krb5/k5sealiov.c +++ b/src/lib/gssapi/krb5/k5sealiov.c @@ -449,7 +449,7 @@ kg_seal_iov_length(OM_uint32 *minor_status, *minor_status = code; return GSS_S_FAILURE; } - + if (k5_padlen == 0 && dce_style) { /* Windows rejects AEAD tokens with non-zero EC */ code = krb5_c_block_size(context, enctype, &ec); @@ -514,4 +514,3 @@ kg_seal_iov_length(OM_uint32 *minor_status, return GSS_S_COMPLETE; } - diff --git a/src/lib/gssapi/krb5/k5sealv3iov.c b/src/lib/gssapi/krb5/k5sealv3iov.c index 718903c3a..d8542760d 100644 --- a/src/lib/gssapi/krb5/k5sealv3iov.c +++ b/src/lib/gssapi/krb5/k5sealv3iov.c @@ -314,11 +314,11 @@ gss_krb5int_unseal_v3_iov(krb5_context context, acceptor_flag = ctx->initiate ? FLAG_SENDER_IS_ACCEPTOR : 0; key_usage = (toktype == KG_TOK_WRAP_MSG - ? (!ctx->initiate + ? (!ctx->initiate ? KG_USAGE_INITIATOR_SEAL : KG_USAGE_ACCEPTOR_SEAL) : (!ctx->initiate - ? KG_USAGE_INITIATOR_SIGN + ? KG_USAGE_INITIATOR_SIGN : KG_USAGE_ACCEPTOR_SIGN)); kg_iov_msglen(iov, iov_count, &data_length, &assoc_data_length); diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c index b2eeee700..87a4b20f9 100644 --- a/src/lib/gssapi/krb5/k5unsealiov.c +++ b/src/lib/gssapi/krb5/k5unsealiov.c @@ -81,7 +81,7 @@ kg_unseal_v1_iov(krb5_context context, } ptr = (unsigned char *)header->buffer.value + token_wrapper_len; - + signalg = ptr[0]; signalg |= ptr[1] << 8; @@ -666,4 +666,3 @@ kg_unseal_iov(OM_uint32 *minor_status, return code; } - diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c index fd10408fd..63a8d6f77 100644 --- a/src/lib/gssapi/krb5/krb5_gss_glue.c +++ b/src/lib/gssapi/krb5/krb5_gss_glue.c @@ -186,7 +186,7 @@ gss_krb5_set_allowable_enctypes( OM_uint32 major_status; struct krb5_gss_set_allowable_enctypes_req req; gss_buffer_desc req_buffer; - + req.num_ktypes = num_ktypes; req.ktypes = ktypes; @@ -225,7 +225,7 @@ gss_krb5_ccache_name( (const gss_OID)&req_oid, &req_buffer); - return major_status; + return major_status; } OM_uint32 KRB5_CALLCONV @@ -247,7 +247,7 @@ gss_krb5_free_lucid_sec_context( (const gss_OID)&req_oid, &req_buffer); - return major_status; + return major_status; } OM_uint32 KRB5_CALLCONV @@ -268,7 +268,7 @@ krb5_gss_register_acceptor_identity(const char *keytab) (const gss_OID)&req_oid, &req_buffer); - return major_status; + return major_status; } krb5_error_code @@ -368,7 +368,7 @@ gss_krb5_set_cred_rcache( GSS_KRB5_SET_CRED_RCACHE_OID }; OM_uint32 major_status; gss_buffer_desc req_buffer; - + req_buffer.length = sizeof(rcache); req_buffer.value = rcache; @@ -416,4 +416,3 @@ gsskrb5_extract_authtime_from_sec_context(OM_uint32 *minor_status, return GSS_S_COMPLETE; } - diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c index 4932bd98c..db38e9eab 100644 --- a/src/lib/gssapi/krb5/util_crypt.c +++ b/src/lib/gssapi/krb5/util_crypt.c @@ -104,7 +104,7 @@ kg_setup_keys(krb5_context context, ctx->signalg = -1; ctx->sealalg = -1; } - + code = krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION); if (code != 0) return code; diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index 8427e95b4..94d62eace 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -269,9 +269,8 @@ asn1_error_code asn1_decode_boolean(asn1buf *buf, unsigned *val) retval = asn1buf_remove_octet(buf, &bval); if (retval) return retval; - + *val = (bval != 0x00); - + cleanup(); } - diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index ac52ebead..1f2cce803 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -82,7 +82,7 @@ DEFFNLENTYPE(generalstring, char *, asn1_encode_generalstring); DEFFNLENTYPE(u_generalstring, unsigned char *, asn1_encode_generalstring); DEFFNLENTYPE(opaque, char *, asn1_encode_opaque); -DEFFIELDTYPE(gstring_data, krb5_data, +DEFFIELDTYPE(gstring_data, krb5_data, FIELDOF_STRING(krb5_data, generalstring, data, length, -1)); DEFPTRTYPE(gstring_data_ptr,gstring_data); @@ -1174,7 +1174,7 @@ DEFSEQTYPE(pa_pac_request, krb5_pa_pac_req, pa_pac_request_fields, 0); #endif /* RFC 4537 */ -DEFFIELDTYPE(etype_list, krb5_etype_list, +DEFFIELDTYPE(etype_list, krb5_etype_list, FIELDOF_SEQOF_INT32(krb5_etype_list, int32_ptr, etypes, length, -1)); /* Exported complete encoders -- these produce a krb5_data with diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index 44013dafc..db76b2344 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -396,7 +396,7 @@ parse_counted_string(char **strptr, char **result) * Hash extension records have the format: * client = <empty string> * server = HASH:<msghash> <clientlen>:<client> <serverlen>:<server> - * Spaces in the client and server string are represented with + * Spaces in the client and server string are represented with * with backslashes. Client and server lengths are represented in * ASCII decimal (which is different from the 32-bit binary we use * elsewhere in the replay cache). diff --git a/src/lib/krb5/rcache/rcdef.c b/src/lib/krb5/rcache/rcdef.c index c17fa8aff..5b860f1b3 100644 --- a/src/lib/krb5/rcache/rcdef.c +++ b/src/lib/krb5/rcache/rcdef.c @@ -9,7 +9,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 @@ -23,7 +23,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. - * + * * * replay cache default operations vector. */ diff --git a/src/lib/krb5/rcache/t_replay.c b/src/lib/krb5/rcache/t_replay.c index 427991c2e..0af8aff99 100644 --- a/src/lib/krb5/rcache/t_replay.c +++ b/src/lib/krb5/rcache/t_replay.c @@ -9,7 +9,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 @@ -23,7 +23,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. - * + * * t_replay.c: Command-line interfaces to aid testing of replay cache * */ |
