From accdc44d3aa603bfed81eb8ca3bc269b2a647dca Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Thu, 11 Jan 2018 13:47:10 -0500 Subject: [PATCH] Fix grouping of GGF extensions in gssapi_ext.h Move gss_import/export_cred to be with the rest of the GGF extensions and mark them as using Heimdal's signatures. Also add clarifying comments that gss_set_cred_option and gssspi_mech_invoke are not part of the GGF extensions. --- src/lib/gssapi/generic/gssapi_ext.h | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h index 9d3a7e7367..074a3756d4 100644 --- a/src/lib/gssapi/generic/gssapi_ext.h +++ b/src/lib/gssapi/generic/gssapi_ext.h @@ -169,12 +169,31 @@ OM_uint32 KRB5_CALLCONV gss_set_sec_context_option const gss_OID /*desired_object*/, const gss_buffer_t /*value*/); +/* + * Export import cred extensions from GGF, but using Heimdal's signatures + */ +OM_uint32 KRB5_CALLCONV gss_export_cred + (OM_uint32 * /* minor_status */, + gss_cred_id_t /* cred_handle */, + gss_buffer_t /* token */); + +OM_uint32 KRB5_CALLCONV gss_import_cred + (OM_uint32 * /* minor_status */, + gss_buffer_t /* token */, + gss_cred_id_t * /* cred_handle */); + +/* + * Heimdal extension + */ OM_uint32 KRB5_CALLCONV gss_set_cred_option (OM_uint32 * /*minor_status*/, gss_cred_id_t * /*cred*/, const gss_OID /*desired_object*/, const gss_buffer_t /*value*/); +/* + * Call the given method on the given mechanism + */ OM_uint32 KRB5_CALLCONV gssspi_mech_invoke (OM_uint32 * /*minor_status*/, const gss_OID /*desired_mech*/, @@ -559,18 +578,6 @@ gss_store_cred_into( gss_OID_set *, /* elements_stored */ gss_cred_usage_t *); /* cred_usage_stored */ -OM_uint32 KRB5_CALLCONV -gss_export_cred( - OM_uint32 *, /* minor_status */ - gss_cred_id_t, /* cred_handle */ - gss_buffer_t); /* token */ - -OM_uint32 KRB5_CALLCONV -gss_import_cred( - OM_uint32 *, /* minor_status */ - gss_buffer_t, /* token */ - gss_cred_id_t *); /* cred_handle */ - #ifdef __cplusplus } #endif -- 2.47.2