prefix all gss_spnego with _, use generated headers

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18191 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/gssapi/spnego/accept_sec_context.c

@@ -531,7 +531,7 @@ verify_mechlist_mic
 }
 
 OM_uint32
-gss_spnego_accept_sec_context
+_gss_spnego_accept_sec_context
 	   (OM_uint32 * minor_status,
 	    gss_ctx_id_t * context_handle,
 	    const gss_cred_id_t acceptor_cred_handle,
@@ -865,7 +865,7 @@ gss_spnego_accept_sec_context
  	return ret;
     }
 
-    _gss_spnego_delete_sec_context(&minor, context_handle,
+    _gss_spnego_internal_delete_sec_context(&minor, context_handle,
 				   GSS_C_NO_BUFFER);
 
     return ret;

lib/gssapi/spnego/compat.c

@@ -94,7 +94,7 @@ OM_uint32 _gss_spnego_alloc_sec_context (OM_uint32 * minor_status,
  * Free a SPNEGO context handle. The caller must have acquired
  * the lock before this is called.
  */
-OM_uint32 _gss_spnego_delete_sec_context
+OM_uint32 _gss_spnego_internal_delete_sec_context
            (OM_uint32 *minor_status,
             gss_ctx_id_t *context_handle,
             gss_buffer_t output_token
@@ -200,20 +200,6 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_spnego_internal_release_oid(OM_uint32 *minor_status, gss_OID *OID)
-{
-    *minor_status = 0;
-
-    if (*OID == GSS_SPNEGO_MECHANISM ||
-	*OID == &gss_mskrb_mechanism_oid_desc ||
-	*OID == &gss_krb5_mechanism_oid_desc) {
-	*OID = GSS_C_NO_OID;
-	return GSS_S_COMPLETE;
-    }
-
-    return GSS_S_FAILURE;
-}
-
 int _gss_spnego_add_mech_type(gss_OID mech_type,
 			      int includeMSCompatOID,
 			      MechTypeList *mechtypelist)

lib/gssapi/spnego/context_stubs.c

@@ -67,7 +67,7 @@ spnego_supported_mechs(OM_uint32 *minor_status, gss_OID_set *mechs)
 
 
 
-OM_uint32 gss_spnego_process_context_token
+OM_uint32 _gss_spnego_process_context_token
            (OM_uint32 *minor_status,
             const gss_ctx_id_t context_handle,
             const gss_buffer_t token_buffer
@@ -95,12 +95,12 @@ OM_uint32 gss_spnego_process_context_token
 
     ctx->negotiated_ctx_id = GSS_C_NO_CONTEXT;
 
-    return _gss_spnego_delete_sec_context(minor_status,
+    return _gss_spnego_internal_delete_sec_context(minor_status,
 					   &context,
 					   GSS_C_NO_BUFFER);
 }
 
-OM_uint32 gss_spnego_delete_sec_context
+OM_uint32 _gss_spnego_delete_sec_context
            (OM_uint32 *minor_status,
             gss_ctx_id_t *context_handle,
             gss_buffer_t output_token
@@ -115,12 +115,12 @@ OM_uint32 gss_spnego_delete_sec_context
 
     HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
 
-    return _gss_spnego_delete_sec_context(minor_status,
+    return _gss_spnego_internal_delete_sec_context(minor_status,
 						   context_handle,
 						   output_token);
 }
 
-OM_uint32 gss_spnego_context_time
+OM_uint32 _gss_spnego_context_time
            (OM_uint32 *minor_status,
             const gss_ctx_id_t context_handle,
             OM_uint32 *time_rec
@@ -144,7 +144,7 @@ OM_uint32 gss_spnego_context_time
 			    time_rec);
 }
 
-OM_uint32 gss_spnego_get_mic
+OM_uint32 _gss_spnego_get_mic
            (OM_uint32 *minor_status,
             const gss_ctx_id_t context_handle,
             gss_qop_t qop_req,
@@ -170,7 +170,7 @@ OM_uint32 gss_spnego_get_mic
 		       qop_req, message_buffer, message_token);
 }
 
-OM_uint32 gss_spnego_verify_mic
+OM_uint32 _gss_spnego_verify_mic
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             const gss_buffer_t message_buffer,
@@ -199,7 +199,7 @@ OM_uint32 gss_spnego_verify_mic
 			  qop_state);
 }
 
-OM_uint32 gss_spnego_wrap
+OM_uint32 _gss_spnego_wrap
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             int conf_req_flag,
@@ -232,7 +232,7 @@ OM_uint32 gss_spnego_wrap
 		    output_message_buffer);
 }
 
-OM_uint32 gss_spnego_unwrap
+OM_uint32 _gss_spnego_unwrap
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             const gss_buffer_t input_message_buffer,
@@ -263,7 +263,7 @@ OM_uint32 gss_spnego_unwrap
 		      qop_state);
 }
 
-OM_uint32 gss_spnego_display_status
+OM_uint32 _gss_spnego_display_status
            (OM_uint32 * minor_status,
             OM_uint32 status_value,
             int status_type,
@@ -275,7 +275,7 @@ OM_uint32 gss_spnego_display_status
     return GSS_S_FAILURE;
 }
 
-OM_uint32 gss_spnego_compare_name
+OM_uint32 _gss_spnego_compare_name
            (OM_uint32 *minor_status,
             const gss_name_t name1,
             const gss_name_t name2,
@@ -285,7 +285,7 @@ OM_uint32 gss_spnego_compare_name
     return gss_compare_name(minor_status, name1, name2, name_equal);
 }
 
-OM_uint32 gss_spnego_display_name
+OM_uint32 _gss_spnego_display_name
            (OM_uint32 * minor_status,
             const gss_name_t input_name,
             gss_buffer_t output_name_buffer,
@@ -296,7 +296,7 @@ OM_uint32 gss_spnego_display_name
 			    output_name_buffer, output_name_type);
 }
 
-OM_uint32 gss_spnego_import_name
+OM_uint32 _gss_spnego_import_name
            (OM_uint32 * minor_status,
             const gss_buffer_t input_name_buffer,
             const gss_OID input_name_type,
@@ -307,7 +307,7 @@ OM_uint32 gss_spnego_import_name
 			   input_name_type, output_name);
 }
 
-OM_uint32 gss_spnego_export_name
+OM_uint32 _gss_spnego_export_name
            (OM_uint32  * minor_status,
             const gss_name_t input_name,
             gss_buffer_t exported_name
@@ -317,7 +317,7 @@ OM_uint32 gss_spnego_export_name
 			   exported_name);
 }
 
-OM_uint32 gss_spnego_release_name
+OM_uint32 _gss_spnego_release_name
            (OM_uint32 * minor_status,
             gss_name_t * input_name
            )
@@ -325,7 +325,7 @@ OM_uint32 gss_spnego_release_name
     return gss_release_name(minor_status, input_name);
 }
 
-OM_uint32 gss_spnego_inquire_context (
+OM_uint32 _gss_spnego_inquire_context (
             OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             gss_name_t * src_name,
@@ -362,7 +362,7 @@ OM_uint32 gss_spnego_inquire_context (
 			       open_context);
 }
 
-OM_uint32 gss_spnego_wrap_size_limit (
+OM_uint32 _gss_spnego_wrap_size_limit (
             OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             int conf_req_flag,
@@ -393,7 +393,7 @@ OM_uint32 gss_spnego_wrap_size_limit (
 			       max_input_size);
 }
 
-OM_uint32 gss_spnego_export_sec_context (
+OM_uint32 _gss_spnego_export_sec_context (
             OM_uint32 * minor_status,
             gss_ctx_id_t * context_handle,
             gss_buffer_t interprocess_token
@@ -424,7 +424,7 @@ OM_uint32 gss_spnego_export_sec_context (
 				 &ctx->negotiated_ctx_id,
 				 interprocess_token);
     if (ret == GSS_S_COMPLETE) {
-	ret = _gss_spnego_delete_sec_context(minor_status,
+	ret = _gss_spnego_internal_delete_sec_context(minor_status,
 					     context_handle,
 					     GSS_C_NO_BUFFER);
 	if (ret == GSS_S_COMPLETE)
@@ -436,7 +436,7 @@ OM_uint32 gss_spnego_export_sec_context (
     return ret;
 }
 
-OM_uint32 gss_spnego_import_sec_context (
+OM_uint32 _gss_spnego_import_sec_context (
             OM_uint32 * minor_status,
             const gss_buffer_t interprocess_token,
             gss_ctx_id_t *context_handle
@@ -458,7 +458,7 @@ OM_uint32 gss_spnego_import_sec_context (
 				 interprocess_token,
 				 &ctx->negotiated_ctx_id);
     if (ret != GSS_S_COMPLETE) {
-	_gss_spnego_delete_sec_context(&minor, context_handle, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, context_handle, GSS_C_NO_BUFFER);
 	return ret;
     }
 
@@ -472,7 +472,7 @@ OM_uint32 gss_spnego_import_sec_context (
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_spnego_inquire_names_for_mech (
+OM_uint32 _gss_spnego_inquire_names_for_mech (
             OM_uint32 * minor_status,
             const gss_OID mechanism,
             gss_OID_set * name_types
@@ -515,7 +515,7 @@ out:
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_spnego_inquire_mechs_for_name (
+OM_uint32 _gss_spnego_inquire_mechs_for_name (
             OM_uint32 * minor_status,
             const gss_name_t input_name,
             gss_OID_set * mech_types
@@ -536,7 +536,7 @@ OM_uint32 gss_spnego_inquire_mechs_for_name (
     return ret;
 }
 
-OM_uint32 gss_spnego_canonicalize_name (
+OM_uint32 _gss_spnego_canonicalize_name (
             OM_uint32 * minor_status,
             const gss_name_t input_name,
             const gss_OID mech_type,
@@ -547,7 +547,7 @@ OM_uint32 gss_spnego_canonicalize_name (
     return gss_duplicate_name(minor_status, input_name, output_name);
 }
 
-OM_uint32 gss_spnego_duplicate_name (
+OM_uint32 _gss_spnego_duplicate_name (
             OM_uint32 * minor_status,
             const gss_name_t src_name,
             gss_name_t * dest_name
@@ -556,7 +556,7 @@ OM_uint32 gss_spnego_duplicate_name (
     return gss_duplicate_name(minor_status, src_name, dest_name);
 }
 
-OM_uint32 gss_spnego_sign
+OM_uint32 _gss_spnego_sign
            (OM_uint32 * minor_status,
             gss_ctx_id_t context_handle,
             int qop_req,
@@ -585,7 +585,7 @@ OM_uint32 gss_spnego_sign
 		    message_token);
 }
 
-OM_uint32 gss_spnego_verify
+OM_uint32 _gss_spnego_verify
            (OM_uint32 * minor_status,
             gss_ctx_id_t context_handle,
             gss_buffer_t message_buffer,
@@ -614,7 +614,7 @@ OM_uint32 gss_spnego_verify
 		      qop_state);
 }
 
-OM_uint32 gss_spnego_seal
+OM_uint32 _gss_spnego_seal
            (OM_uint32 * minor_status,
             gss_ctx_id_t context_handle,
             int conf_req_flag,
@@ -647,7 +647,7 @@ OM_uint32 gss_spnego_seal
 		    output_message_buffer);
 }
 
-OM_uint32 gss_spnego_unseal
+OM_uint32 _gss_spnego_unseal
            (OM_uint32 * minor_status,
             gss_ctx_id_t context_handle,
             gss_buffer_t input_message_buffer,
@@ -679,7 +679,7 @@ OM_uint32 gss_spnego_unseal
 }
 
 #if 0
-OM_uint32 gss_spnego_unwrap_ex
+OM_uint32 _gss_spnego_unwrap_ex
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
 	    const gss_buffer_t token_header_buffer,
@@ -713,7 +713,7 @@ OM_uint32 gss_spnego_unwrap_ex
 			 qop_state);
 }
 
-OM_uint32 gss_spnego_wrap_ex
+OM_uint32 _gss_spnego_wrap_ex
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             int conf_req_flag,
@@ -756,7 +756,7 @@ OM_uint32 gss_spnego_wrap_ex
 		       output_message_buffer);
 }
 
-OM_uint32 gss_spnego_complete_auth_token
+OM_uint32 _gss_spnego_complete_auth_token
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
 	    gss_buffer_t input_message_buffer)
@@ -781,7 +781,7 @@ OM_uint32 gss_spnego_complete_auth_token
 }
 #endif
 
-OM_uint32 gss_spnego_inquire_sec_context_by_oid
+OM_uint32 _gss_spnego_inquire_sec_context_by_oid
            (OM_uint32 * minor_status,
             const gss_ctx_id_t context_handle,
             const gss_OID desired_object,
@@ -807,7 +807,7 @@ OM_uint32 gss_spnego_inquire_sec_context_by_oid
 					  data_set);
 }
 
-OM_uint32 gss_spnego_set_sec_context_option
+OM_uint32 _gss_spnego_set_sec_context_option
            (OM_uint32 * minor_status,
             gss_ctx_id_t * context_handle,
             const gss_OID desired_object,

lib/gssapi/spnego/cred_stubs.c

@@ -86,7 +86,7 @@ _gss_spnego_alloc_cred(OM_uint32 *minor_status,
  * we support gss_{get,set}_neg_mechs() we will need to expose
  * more functionality.
  */
-OM_uint32 gss_spnego_acquire_cred
+OM_uint32 _gss_spnego_acquire_cred
 (OM_uint32 *minor_status,
  const gss_name_t desired_name,
  OM_uint32 time_req,
@@ -157,15 +157,7 @@ out:
     return ret;
 }
 
-OM_uint32 gss_spnego_release_cred
+OM_uint32 _gss_spnego_inquire_cred
-           (OM_uint32 *minor_status,
-            gss_cred_id_t *cred_handle
-           )
-{
-    return _gss_spnego_release_cred(minor_status, cred_handle);
-}
-
-OM_uint32 gss_spnego_inquire_cred
            (OM_uint32 * minor_status,
             const gss_cred_id_t cred_handle,
             gss_name_t * name,
@@ -194,7 +186,7 @@ OM_uint32 gss_spnego_inquire_cred
     return ret;
 }
 
-OM_uint32 gss_spnego_add_cred (
+OM_uint32 _gss_spnego_add_cred (
             OM_uint32 * minor_status,
             const gss_cred_id_t input_cred_handle,
             const gss_name_t desired_name,
@@ -243,7 +235,7 @@ OM_uint32 gss_spnego_add_cred (
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_spnego_inquire_cred_by_mech (
+OM_uint32 _gss_spnego_inquire_cred_by_mech (
             OM_uint32 * minor_status,
             const gss_cred_id_t cred_handle,
             const gss_OID mech_type,
@@ -274,7 +266,7 @@ OM_uint32 gss_spnego_inquire_cred_by_mech (
     return ret;
 }
 
-OM_uint32 gss_spnego_inquire_cred_by_oid
+OM_uint32 _gss_spnego_inquire_cred_by_oid
            (OM_uint32 * minor_status,
             const gss_cred_id_t cred_handle,
             const gss_OID desired_object,

lib/gssapi/spnego/external.c

@@ -46,35 +46,35 @@ static gssapi_mech_interface_desc spnego_mech = {
     GMI_VERSION,
     "spnego",
     {6, (void *)"\x2b\x06\x01\x05\x05\x02"},
-    gss_spnego_acquire_cred,
+    _gss_spnego_acquire_cred,
-    gss_spnego_release_cred,
+    _gss_spnego_release_cred,
-    gss_spnego_init_sec_context,
+    _gss_spnego_init_sec_context,
-    gss_spnego_accept_sec_context,
+    _gss_spnego_accept_sec_context,
-    gss_spnego_process_context_token,
+    _gss_spnego_process_context_token,
-    gss_spnego_delete_sec_context,
+    _gss_spnego_internal_delete_sec_context,
-    gss_spnego_context_time,
+    _gss_spnego_context_time,
-    gss_spnego_get_mic,
+    _gss_spnego_get_mic,
-    gss_spnego_verify_mic,
+    _gss_spnego_verify_mic,
-    gss_spnego_wrap,
+    _gss_spnego_wrap,
-    gss_spnego_unwrap,
+    _gss_spnego_unwrap,
-    gss_spnego_display_status,
+    _gss_spnego_display_status,
     NULL,
-    gss_spnego_compare_name,
+    _gss_spnego_compare_name,
-    gss_spnego_display_name,
+    _gss_spnego_display_name,
-    gss_spnego_import_name,
+    _gss_spnego_import_name,
-    gss_spnego_export_name,
+    _gss_spnego_export_name,
-    gss_spnego_release_name,
+    _gss_spnego_release_name,
-    gss_spnego_inquire_cred,
+    _gss_spnego_inquire_cred,
-    gss_spnego_inquire_context,
+    _gss_spnego_inquire_context,
-    gss_spnego_wrap_size_limit,
+    _gss_spnego_wrap_size_limit,
-    gss_spnego_add_cred,
+    _gss_spnego_add_cred,
-    gss_spnego_inquire_cred_by_mech,
+    _gss_spnego_inquire_cred_by_mech,
-    gss_spnego_export_sec_context,
+    _gss_spnego_export_sec_context,
-    gss_spnego_import_sec_context,
+    _gss_spnego_import_sec_context,
-    gss_spnego_inquire_names_for_mech,
+    _gss_spnego_inquire_names_for_mech,
-    gss_spnego_inquire_mechs_for_name,
+    _gss_spnego_inquire_mechs_for_name,
-    gss_spnego_canonicalize_name,
+    _gss_spnego_canonicalize_name,
-    gss_spnego_duplicate_name
+    _gss_spnego_duplicate_name
 };
 
 gssapi_mech_interface
@@ -83,7 +83,7 @@ __gss_spnego_initialize(void)
 	return &spnego_mech;
 }
 
-static gss_OID_desc gss_spnego_mechanism_desc = 
+static gss_OID_desc _gss_spnego_mechanism_desc = 
     {6, (void *)"\x2b\x06\x01\x05\x05\x02"};
 
-gss_OID GSS_SPNEGO_MECHANISM = &gss_spnego_mechanism_desc;
+gss_OID GSS_SPNEGO_MECHANISM = &_gss_spnego_mechanism_desc;

lib/gssapi/spnego/init_sec_context.c

@@ -196,7 +196,7 @@ spnego_initial
 					    &ctx->preferred_mech_type);
     if (GSS_ERROR(sub)) {
 	*minor_status = minor;
-	_gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	return sub;
     }
 
@@ -225,7 +225,7 @@ spnego_initial
     if (GSS_ERROR(sub)) {
 	free_NegTokenInit(&ni);
 	*minor_status = minor;
-	_gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	return sub;
     }
 
@@ -234,7 +234,7 @@ spnego_initial
 	if (ni.mechToken == NULL) {
 	    free_NegTokenInit(&ni);
 	    gss_release_buffer(&minor, &mech_token);
-	    _gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	    _gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	    *minor_status = ENOMEM;
 	    return GSS_S_FAILURE;
 	}
@@ -244,7 +244,7 @@ spnego_initial
 	    free_NegTokenInit(&ni);
 	    gss_release_buffer(&minor, &mech_token);
 	    *minor_status = ENOMEM;
-	    _gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	    _gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	    return GSS_S_FAILURE;
 	}
 	memcpy(ni.mechToken->data, mech_token.value, mech_token.length);
@@ -261,7 +261,7 @@ spnego_initial
     if (buf == NULL) {
 	free_NegTokenInit(&ni);
 	*minor_status = ENOMEM;
-	_gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	return GSS_S_FAILURE;
     }
 
@@ -288,7 +288,7 @@ spnego_initial
 	*minor_status = ret;
 	free(buf);
 	free_NegTokenInit(&ni);
-	_gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	return GSS_S_FAILURE;
     }
 
@@ -308,7 +308,7 @@ spnego_initial
     free (buf);
 
     if (sub) {
-	_gss_spnego_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+	_gss_spnego_internal_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
 	return sub;
     }
 
@@ -528,7 +528,7 @@ spnego_reply
     return ret;
 }
 
-OM_uint32 gss_spnego_init_sec_context
+OM_uint32 _gss_spnego_init_sec_context
            (OM_uint32 * minor_status,
             const gss_cred_id_t initiator_cred_handle,
             gss_ctx_id_t * context_handle,

lib/gssapi/spnego/spnego_locl.h

@@ -81,386 +81,6 @@ typedef struct {
 	HEIMDAL_MUTEX		ctx_id_mutex;
 } *gssspnego_ctx;
 
-OM_uint32
+#include <spnego-private.h>
-_gss_spnego_encode_response(OM_uint32 *, const NegTokenResp *,
-			    gss_buffer_t, u_char **);
-OM_uint32
-_gss_spnego_indicate_mechtypelist (OM_uint32 *, int,
-				   const gssspnego_cred cred_handle,
-				   MechTypeList *,
-				   gss_OID *preferred_mech);
-OM_uint32 _gss_spnego_alloc_sec_context (OM_uint32 *,
-					 gss_ctx_id_t *);
-
-/*
- * NB: caller must acquire ctx_id_mutex before
- * calling _gss_spnego_delete_sec_context()
- */
-OM_uint32 _gss_spnego_delete_sec_context (OM_uint32 *, gss_ctx_id_t *, gss_buffer_t);
-OM_uint32 _gss_spnego_require_mechlist_mic(OM_uint32 *, gssspnego_ctx, int *);
-OM_uint32 gss_spnego_internal_release_oid(OM_uint32 *minor_status, gss_OID *OID);
-int _gss_spnego_add_mech_type(gss_OID, int, MechTypeList *);
-OM_uint32 _gss_spnego_select_mech(OM_uint32 *, MechType *, gss_OID *);
-OM_uint32 _gss_spnego_alloc_cred(OM_uint32 *, gss_cred_id_t, gss_cred_id_t *);
-OM_uint32 _gss_spnego_release_cred(OM_uint32 *, gss_cred_id_t *);
-
-OM_uint32 _gss_spnego_supported_mechs(OM_uint32 *, gss_OID_set *);
-
-
-/*
- * Finally, function prototypes for the GSS-API routines.
- */
-
-OM_uint32 gss_spnego_acquire_cred
-           (OM_uint32 * /*minor_status*/,
-            const gss_name_t /*desired_name*/,
-            OM_uint32 /*time_req*/,
-            const gss_OID_set /*desired_mechs*/,
-            gss_cred_usage_t /*cred_usage*/,
-            gss_cred_id_t * /*output_cred_handle*/,
-            gss_OID_set * /*actual_mechs*/,
-            OM_uint32 * /*time_rec*/
-           );
-
-OM_uint32 gss_spnego_release_cred
-           (OM_uint32 * /*minor_status*/,
-            gss_cred_id_t * /*cred_handle*/
-           );
-
-OM_uint32 gss_spnego_init_sec_context
-           (OM_uint32 * /*minor_status*/,
-            const gss_cred_id_t /*initiator_cred_handle*/,
-            gss_ctx_id_t * /*context_handle*/,
-            const gss_name_t /*target_name*/,
-            const gss_OID /*mech_type*/,
-            OM_uint32 /*req_flags*/,
-            OM_uint32 /*time_req*/,
-            const gss_channel_bindings_t /*input_chan_bindings*/,
-            const gss_buffer_t /*input_token*/,
-            gss_OID * /*actual_mech_type*/,
-            gss_buffer_t /*output_token*/,
-            OM_uint32 * /*ret_flags*/,
-            OM_uint32 * /*time_rec*/
-           );
-
-OM_uint32 gss_spnego_accept_sec_context
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t * /*context_handle*/,
-            const gss_cred_id_t /*acceptor_cred_handle*/,
-            const gss_buffer_t /*input_token_buffer*/,
-            const gss_channel_bindings_t /*input_chan_bindings*/,
-            gss_name_t * /*src_name*/,
-            gss_OID * /*mech_type*/,
-            gss_buffer_t /*output_token*/,
-            OM_uint32 * /*ret_flags*/,
-            OM_uint32 * /*time_rec*/,
-            gss_cred_id_t * /*delegated_cred_handle*/
-           );
-
-OM_uint32 gss_spnego_process_context_token
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            const gss_buffer_t /*token_buffer*/
-           );
-
-OM_uint32 gss_spnego_delete_sec_context
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t * /*context_handle*/,
-            gss_buffer_t /*output_token*/
-           );
-
-OM_uint32 gss_spnego_context_time
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            OM_uint32 * /*time_rec*/
-           );
-
-OM_uint32 gss_spnego_get_mic
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            gss_qop_t /*qop_req*/,
-            const gss_buffer_t /*message_buffer*/,
-            gss_buffer_t /*message_token*/
-           );
-
-OM_uint32 gss_spnego_verify_mic
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            const gss_buffer_t /*message_buffer*/,
-            const gss_buffer_t /*token_buffer*/,
-            gss_qop_t * /*qop_state*/
-           );
-
-OM_uint32 gss_spnego_wrap
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            int /*conf_req_flag*/,
-            gss_qop_t /*qop_req*/,
-            const gss_buffer_t /*input_message_buffer*/,
-            int * /*conf_state*/,
-            gss_buffer_t /*output_message_buffer*/
-           );
-
-OM_uint32 gss_spnego_unwrap
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            const gss_buffer_t /*input_message_buffer*/,
-            gss_buffer_t /*output_message_buffer*/,
-            int * /*conf_state*/,
-            gss_qop_t * /*qop_state*/
-           );
-
-OM_uint32 gss_spnego_display_status
-           (OM_uint32 * /*minor_status*/,
-            OM_uint32 /*status_value*/,
-            int /*status_type*/,
-            const gss_OID /*mech_type*/,
-            OM_uint32 * /*message_context*/,
-            gss_buffer_t /*status_string*/
-           );
-
-OM_uint32 gss_spnego_inquire_names_for_mech (
-            OM_uint32 * minor_status,
-            const gss_OID mechanism,
-            gss_OID_set * name_types
-	   );
-
-OM_uint32 gss_spnego_compare_name
-           (OM_uint32 * /*minor_status*/,
-            const gss_name_t /*name1*/,
-            const gss_name_t /*name2*/,
-            int * /*name_equal*/
-           );
-
-OM_uint32 gss_spnego_display_name
-           (OM_uint32 * /*minor_status*/,
-            const gss_name_t /*input_name*/,
-            gss_buffer_t /*output_name_buffer*/,
-            gss_OID * /*output_name_type*/
-           );
-
-OM_uint32 gss_spnego_import_name
-           (OM_uint32 * /*minor_status*/,
-            const gss_buffer_t /*input_name_buffer*/,
-            const gss_OID /*input_name_type*/,
-            gss_name_t * /*output_name*/
-           );
-
-OM_uint32 gss_spnego_export_name
-           (OM_uint32  * /*minor_status*/,
-            const gss_name_t /*input_name*/,
-            gss_buffer_t /*exported_name*/
-           );
-
-OM_uint32 gss_spnego_release_name
-           (OM_uint32 * /*minor_status*/,
-            gss_name_t * /*input_name*/
-           );
-
-OM_uint32 gss_spnego_release_buffer
-           (OM_uint32 * /*minor_status*/,
-            gss_buffer_t /*buffer*/
-           );
-
-OM_uint32 gss_spnego_release_oid_set
-           (OM_uint32 * /*minor_status*/,
-            gss_OID_set * /*set*/
-           );
-
-OM_uint32 gss_spnego_inquire_cred
-           (OM_uint32 * /*minor_status*/,
-            const gss_cred_id_t /*cred_handle*/,
-            gss_name_t * /*name*/,
-            OM_uint32 * /*lifetime*/,
-            gss_cred_usage_t * /*cred_usage*/,
-            gss_OID_set * /*mechanisms*/
-           );
-
-OM_uint32 gss_spnego_inquire_context (
-            OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            gss_name_t * /*src_name*/,
-            gss_name_t * /*targ_name*/,
-            OM_uint32 * /*lifetime_rec*/,
-            gss_OID * /*mech_type*/,
-            OM_uint32 * /*ctx_flags*/,
-            int * /*locally_initiated*/,
-            int * /*open_context*/
-           );
-
-OM_uint32 gss_spnego_wrap_size_limit (
-            OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            int /*conf_req_flag*/,
-            gss_qop_t /*qop_req*/,
-            OM_uint32 /*req_output_size*/,
-            OM_uint32 * /*max_input_size*/
-           );
-
-OM_uint32 gss_spnego_add_cred (
-            OM_uint32 * /*minor_status*/,
-            const gss_cred_id_t /*input_cred_handle*/,
-            const gss_name_t /*desired_name*/,
-            const gss_OID /*desired_mech*/,
-            gss_cred_usage_t /*cred_usage*/,
-            OM_uint32 /*initiator_time_req*/,
-            OM_uint32 /*acceptor_time_req*/,
-            gss_cred_id_t * /*output_cred_handle*/,
-            gss_OID_set * /*actual_mechs*/,
-            OM_uint32 * /*initiator_time_rec*/,
-            OM_uint32 * /*acceptor_time_rec*/
-           );
-
-OM_uint32 gss_spnego_inquire_cred_by_mech (
-            OM_uint32 * /*minor_status*/,
-            const gss_cred_id_t /*cred_handle*/,
-            const gss_OID /*mech_type*/,
-            gss_name_t * /*name*/,
-            OM_uint32 * /*initiator_lifetime*/,
-            OM_uint32 * /*acceptor_lifetime*/,
-            gss_cred_usage_t * /*cred_usage*/
-           );
-
-OM_uint32 gss_spnego_export_sec_context (
-            OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t * /*context_handle*/,
-            gss_buffer_t /*interprocess_token*/
-           );
-
-OM_uint32 gss_spnego_import_sec_context (
-            OM_uint32 * /*minor_status*/,
-            const gss_buffer_t /*interprocess_token*/,
-            gss_ctx_id_t * /*context_handle*/
-           );
-
-OM_uint32 gss_spnego_create_empty_oid_set (
-            OM_uint32 * /*minor_status*/,
-            gss_OID_set * /*oid_set*/
-           );
-
-OM_uint32 gss_spnego_add_oid_set_member (
-            OM_uint32 * /*minor_status*/,
-            const gss_OID /*member_oid*/,
-            gss_OID_set * /*oid_set*/
-           );
-
-OM_uint32 gss_spnego_test_oid_set_member (
-            OM_uint32 * /*minor_status*/,
-            const gss_OID /*member*/,
-            const gss_OID_set /*set*/,
-            int * /*present*/
-           );
-
-OM_uint32 gss_spnego_inquire_mechs_for_name (
-            OM_uint32 * /*minor_status*/,
-            const gss_name_t /*input_name*/,
-            gss_OID_set * /*mech_types*/
-           );
-
-OM_uint32 gss_spnego_duplicate_name (
-            OM_uint32 * /*minor_status*/,
-            const gss_name_t /*src_name*/,
-            gss_name_t * /*dest_name*/
-           );
-
-OM_uint32 gss_spnego_canonicalize_name (
-            OM_uint32 * minor_status,
-            const gss_name_t src_name,
-            const gss_OID mech_type,
-            gss_name_t * dest_name
-           );
-
-/*
- * The following routines are obsolete variants of gss_get_mic,
- * gss_verify_mic, gss_wrap and gss_unwrap.  They should be
- * provided by GSSAPI V2 implementations for backwards
- * compatibility with V1 applications.  Distinct entrypoints
- * (as opposed to #defines) should be provided, both to allow
- * GSSAPI V1 applications to link against GSSAPI V2 implementations,
- * and to retain the slight parameter type differences between the
- * obsolete versions of these routines and their current forms.
- */
-
-OM_uint32 gss_spnego_sign
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t /*context_handle*/,
-            int /*qop_req*/,
-            gss_buffer_t /*message_buffer*/,
-            gss_buffer_t /*message_token*/
-           );
-
-OM_uint32 gss_spnego_verify
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t /*context_handle*/,
-            gss_buffer_t /*message_buffer*/,
-            gss_buffer_t /*token_buffer*/,
-            int * /*qop_state*/
-           );
-
-OM_uint32 gss_spnego_seal
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t /*context_handle*/,
-            int /*conf_req_flag*/,
-            int /*qop_req*/,
-            gss_buffer_t /*input_message_buffer*/,
-            int * /*conf_state*/,
-            gss_buffer_t /*output_message_buffer*/
-           );
-
-OM_uint32 gss_spnego_unseal
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t /*context_handle*/,
-            gss_buffer_t /*input_message_buffer*/,
-            gss_buffer_t /*output_message_buffer*/,
-            int * /*conf_state*/,
-            int * /*qop_state*/
-           );
-
-#if 0
-OM_uint32 gss_spnego_unwrap_ex
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-	    const gss_buffer_t /*token_header_buffer*/,
-	    const gss_buffer_t /*associated_data_buffer*/,
-	    const gss_buffer_t /*input_message_buffer*/,
-	    gss_buffer_t /*output_message_buffer*/,
-	    int * /*conf_state*/,
-	    gss_qop_t * /*qop_state*/);
-
-OM_uint32 gss_spnego_wrap_ex
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            int /*conf_req_flag*/,
-            gss_qop_t /*qop_req*/,
-            const gss_buffer_t /*associated_data_buffer*/,
-            const gss_buffer_t /*input_message_buffer*/,
-            int * /*conf_state*/,
-            gss_buffer_t /*output_token_buffer*/,
-            gss_buffer_t /*output_message_buffer*/
-	   );
-
-OM_uint32 gss_spnego_complete_auth_token
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-	    gss_buffer_t /*input_message_buffer*/);
-#endif
-
-OM_uint32 gss_spnego_inquire_sec_context_by_oid
-           (OM_uint32 * /*minor_status*/,
-            const gss_ctx_id_t /*context_handle*/,
-            const gss_OID /*desired_object*/,
-            gss_buffer_set_t */*data_set*/);
-
-OM_uint32 gss_spnego_inquire_cred_by_oid
-           (OM_uint32 * /*minor_status*/,
-            const gss_cred_id_t /*cred_handle*/,
-            const gss_OID /*desired_object*/,
-            gss_buffer_set_t */*data_set*/);
-
-OM_uint32 gss_spnego_set_sec_context_option
-           (OM_uint32 * /*minor_status*/,
-            gss_ctx_id_t * /*cred_handle*/,
-            const gss_OID /*desired_object*/,
-            const gss_buffer_t /*value*/);
 
 #endif /* SPNEGO_LOCL_H */