From 0620dfff7eeebfec8279f4a7ee8e60e75161a856 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Fri, 20 May 2011 09:52:45 +0200 Subject: [PATCH] remove acquire_cred_ext until it is standardized --- moonshot/mech_eap/Makefile.am | 1 - moonshot/mech_eap/acquire_cred_ext.c | 69 ------------------------------------ moonshot/mech_eap/mech_eap.exports | 1 - 3 files changed, 71 deletions(-) delete mode 100644 moonshot/mech_eap/acquire_cred_ext.c diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am index 8da8ebc..55014cb 100644 --- a/moonshot/mech_eap/Makefile.am +++ b/moonshot/mech_eap/Makefile.am @@ -25,7 +25,6 @@ mech_eap_la_LIBADD = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \ mech_eap_la_SOURCES = \ accept_sec_context.c \ acquire_cred.c \ - acquire_cred_ext.c \ acquire_cred_with_password.c \ add_cred.c \ add_cred_with_password.c \ diff --git a/moonshot/mech_eap/acquire_cred_ext.c b/moonshot/mech_eap/acquire_cred_ext.c deleted file mode 100644 index d8c2c61..0000000 --- a/moonshot/mech_eap/acquire_cred_ext.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2011, JANET(UK) - * All rights reserved. - * - * 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. - * - * 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 JANET(UK) 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. - */ - -/* - * Wrapper for acquiring a credential handle. - */ - -#include "gssapiP_eap.h" - -OM_uint32 -gss_acquire_cred_ext - (OM_uint32 *minor, - const gss_name_t desired_name, - gss_const_OID credential_type, - const void *credential_data, - OM_uint32 time_req, - gss_const_OID desired_mech, - gss_cred_usage_t cred_usage, - gss_cred_id_t *output_cred_handle - ) -{ - OM_uint32 major; - gss_OID_set_desc mechs; - - mechs.count = 1; - mechs.elements = (gss_OID)desired_mech; - - major = gssEapAcquireCred(minor, - desired_name, - credential_type, - credential_data, - time_req, - &mechs, - cred_usage, - output_cred_handle, - NULL, - NULL); - - return major; -} diff --git a/moonshot/mech_eap/mech_eap.exports b/moonshot/mech_eap/mech_eap.exports index 14ece92..12f7f54 100644 --- a/moonshot/mech_eap/mech_eap.exports +++ b/moonshot/mech_eap/mech_eap.exports @@ -1,6 +1,5 @@ gss_accept_sec_context gss_acquire_cred -gss_acquire_cred_ext gss_add_cred gss_add_cred_with_password gss_canonicalize_name -- 2.1.4