remove trailing whitespace
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23815 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		| @@ -1,34 +1,34 @@ | ||||
| /* | ||||
|  * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan | ||||
|  * (Royal Institute of Technology, Stockholm, Sweden).  | ||||
|  * (Royal Institute of Technology, Stockholm, Sweden). | ||||
|  * Portions Copyright (c) 2004 PADL Software Pty Ltd. | ||||
|  * | ||||
|  * Redistribution and use in source and binary forms, with or without  | ||||
|  * modification, are permitted provided that the following conditions  | ||||
|  * are met:  | ||||
|  * Redistribution and use in source and binary forms, with or without | ||||
|  * modification, are permitted provided that the following conditions | ||||
|  * are met: | ||||
|  * | ||||
|  * 1. Redistributions of source code must retain the above copyright  | ||||
|  *    notice, this list of conditions and the following disclaimer.  | ||||
|  * 1. Redistributions of source code must retain the above copyright | ||||
|  *    notice, this list of conditions and the following disclaimer. | ||||
|  * | ||||
|  * 2. Redistributions in binary form must reproduce the above copyright  | ||||
|  *    notice, this list of conditions and the following disclaimer in the  | ||||
|  *    documentation and/or other materials provided with the distribution.  | ||||
|  * 2. Redistributions in binary form must reproduce the above copyright | ||||
|  *    notice, this list of conditions and the following disclaimer in the | ||||
|  *    documentation and/or other materials provided with the distribution. | ||||
|  * | ||||
|  * 3. Neither the name of the Institute nor the names of its contributors  | ||||
|  *    may be used to endorse or promote products derived from this software  | ||||
|  *    without specific prior written permission.  | ||||
|  * 3. Neither the name of the Institute nor the names of its contributors | ||||
|  *    may be used to endorse or promote products derived from this software | ||||
|  *    without specific prior written permission. | ||||
|  * | ||||
|  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND  | ||||
|  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE  | ||||
|  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE  | ||||
|  * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE  | ||||
|  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL  | ||||
|  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS  | ||||
|  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  | ||||
|  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT  | ||||
|  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY  | ||||
|  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  | ||||
|  * SUCH DAMAGE.  | ||||
|  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND | ||||
|  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||||
|  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||||
|  * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE | ||||
|  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||||
|  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||||
|  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||||
|  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||||
|  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||||
|  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||||
|  * SUCH DAMAGE. | ||||
|  */ | ||||
|  | ||||
| #include "spnego/spnego_locl.h" | ||||
| @@ -53,7 +53,7 @@ send_reject (OM_uint32 *minor_status, | ||||
|     nt.u.negTokenResp.supportedMech = NULL; | ||||
|     nt.u.negTokenResp.responseToken = NULL; | ||||
|     nt.u.negTokenResp.mechListMIC   = NULL; | ||||
|      | ||||
|  | ||||
|     ASN1_MALLOC_ENCODE(NegotiationToken, | ||||
| 		       output_token->value, output_token->length, &nt, | ||||
| 		       &size, *minor_status); | ||||
| @@ -76,14 +76,14 @@ acceptor_approved(gss_name_t target_name, gss_OID mech) | ||||
|  | ||||
|     gss_create_empty_oid_set(&junk, &oidset); | ||||
|     gss_add_oid_set_member(&junk, mech, &oidset); | ||||
|      | ||||
|  | ||||
|     ret = gss_acquire_cred(&junk, target_name, GSS_C_INDEFINITE, oidset, | ||||
| 			   GSS_C_ACCEPT, &cred, NULL, NULL); | ||||
|     gss_release_oid_set(&junk, &oidset); | ||||
|     if (ret != GSS_S_COMPLETE) | ||||
| 	return ret; | ||||
|     gss_release_cred(&junk, &cred); | ||||
|      | ||||
|  | ||||
|     return GSS_S_COMPLETE; | ||||
| } | ||||
|  | ||||
| @@ -188,7 +188,7 @@ send_supported_mechs (OM_uint32 *minor_status, | ||||
|     name_buf.value = NULL; | ||||
|     nt.u.negTokenInit.negHints->hintAddress = NULL; | ||||
|  | ||||
|     ASN1_MALLOC_ENCODE(NegotiationTokenWin,  | ||||
|     ASN1_MALLOC_ENCODE(NegotiationTokenWin, | ||||
| 		       data.value, data.length, &nt, &buf_len, ret); | ||||
|     free_NegotiationTokenWin(&nt); | ||||
|     if (ret) { | ||||
| @@ -307,7 +307,7 @@ send_accept (OM_uint32 *minor_status, | ||||
|  | ||||
|     } else | ||||
| 	nt.u.negTokenResp.mechListMIC = NULL; | ||||
|   | ||||
|  | ||||
|     ASN1_MALLOC_ENCODE(NegotiationToken, | ||||
| 		       output_token->value, output_token->length, | ||||
| 		       &nt, &size, ret); | ||||
| @@ -476,12 +476,12 @@ acceptor_complete(OM_uint32 * minor_status, | ||||
|     ret = _gss_spnego_require_mechlist_mic(minor_status, ctx, &require_mic); | ||||
|     if (ret) | ||||
| 	return ret; | ||||
|      | ||||
|  | ||||
|     ctx->require_mic = require_mic; | ||||
|  | ||||
|     if (mic != NULL) | ||||
| 	require_mic = 1; | ||||
|      | ||||
|  | ||||
|     if (ctx->open && require_mic) { | ||||
| 	if (mech_input_token == GSS_C_NO_BUFFER) { /* Even/One */ | ||||
| 	    verify_mic = 1; | ||||
| @@ -497,8 +497,8 @@ acceptor_complete(OM_uint32 * minor_status, | ||||
| 	if (verify_mic || get_mic) { | ||||
| 	    int eret; | ||||
| 	    size_t buf_len; | ||||
| 	     | ||||
| 	    ASN1_MALLOC_ENCODE(MechTypeList,  | ||||
| 	 | ||||
| 	    ASN1_MALLOC_ENCODE(MechTypeList, | ||||
| 			       mech_buf->value, mech_buf->length, | ||||
| 			       &ctx->initiator_mech_types, &buf_len, eret); | ||||
| 	    if (eret) { | ||||
| @@ -525,7 +525,7 @@ acceptor_complete(OM_uint32 * minor_status, | ||||
|  | ||||
|     } else | ||||
| 	*get_mic = 0; | ||||
|      | ||||
|  | ||||
|     return GSS_S_COMPLETE; | ||||
| } | ||||
|  | ||||
| @@ -615,11 +615,11 @@ acceptor_start | ||||
|      * First we try the opportunistic token if we have support for it, | ||||
|      * don't try to verify we have credential for the token, | ||||
|      * gss_accept_sec_context() will (hopefully) tell us that. | ||||
|      * If that failes,  | ||||
|      * If that failes, | ||||
|      */ | ||||
|  | ||||
|     ret = select_mech(minor_status, | ||||
| 		      &ni->mechTypes.val[0],  | ||||
| 		      &ni->mechTypes.val[0], | ||||
| 		      0, | ||||
| 		      &preferred_mech_type); | ||||
|  | ||||
| @@ -721,7 +721,7 @@ acceptor_start | ||||
| 		       output_token); | ||||
|     if (ret) | ||||
| 	goto out; | ||||
|      | ||||
|  | ||||
| out: | ||||
|     if (mech_output_token.value != NULL) | ||||
| 	gss_release_buffer(&junk, &mech_output_token); | ||||
| @@ -744,7 +744,7 @@ out: | ||||
| 	    } | ||||
| 	} | ||||
|     } | ||||
|      | ||||
|  | ||||
|     if (mech_type != NULL) | ||||
| 	*mech_type = ctx->negotiated_mech_type; | ||||
|     if (ret_flags != NULL) | ||||
| @@ -759,7 +759,7 @@ out: | ||||
|  | ||||
|     _gss_spnego_internal_delete_sec_context(&junk, context_handle, | ||||
| 					    GSS_C_NO_BUFFER); | ||||
|      | ||||
|  | ||||
|     return ret; | ||||
| } | ||||
|  | ||||
| @@ -799,7 +799,7 @@ acceptor_continue | ||||
|      * context token (negTokenInit). | ||||
|      */ | ||||
|  | ||||
|     ret = decode_NegotiationToken(input_token_buffer->value,  | ||||
|     ret = decode_NegotiationToken(input_token_buffer->value, | ||||
| 				  input_token_buffer->length, | ||||
| 				  &nt, &nt_len); | ||||
|     if (ret) { | ||||
| @@ -879,7 +879,7 @@ acceptor_continue | ||||
| 	} else | ||||
| 	    ret = GSS_S_COMPLETE; | ||||
|  | ||||
| 	ret2 = _gss_spnego_require_mechlist_mic(minor_status,  | ||||
| 	ret2 = _gss_spnego_require_mechlist_mic(minor_status, | ||||
| 						ctx, | ||||
| 						&require_mic); | ||||
| 	if (ret2) | ||||
| @@ -1000,11 +1000,11 @@ _gss_spnego_accept_sec_context | ||||
| 	*delegated_cred_handle = GSS_C_NO_CREDENTIAL; | ||||
|  | ||||
|  | ||||
|     if (*context_handle == GSS_C_NO_CONTEXT)  | ||||
|     if (*context_handle == GSS_C_NO_CONTEXT) | ||||
| 	func = acceptor_start; | ||||
|     else | ||||
| 	func = acceptor_continue; | ||||
|      | ||||
|  | ||||
|  | ||||
|     return (*func)(minor_status, context_handle, acceptor_cred_handle, | ||||
| 		   input_token_buffer, input_chan_bindings, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Love Hörnquist Åstrand
					Love Hörnquist Åstrand