oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

spnego: Also use mechglue names

Browse Source
This commit is contained in:
Nicolas Williams
2020-04-24 19:04:50 -05:00
parent 511b5e4e97
commit 1a8855e6c4
14 changed files with 114 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/gssapi/spnego/context_stubs.c
View File

@@ -228,55 +228,6 @@ OM_uint32 GSSAPI_CALLCONV _gss_spnego_unwrap
qop_state);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_compare_name
(OM_uint32 *minor_status,
gss_const_name_t name1,
gss_const_name_t name2,
int * name_equal
)
{
return gss_compare_name(minor_status, name1, name2, name_equal);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_display_name
(OM_uint32 * minor_status,
gss_const_name_t input_name,
gss_buffer_t output_name_buffer,
gss_OID * output_name_type
)
{
return gss_display_name(minor_status, input_name,
output_name_buffer, output_name_type);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_import_name
(OM_uint32 * minor_status,
const gss_buffer_t name_buffer,
const gss_OID name_type,
gss_name_t * output_name
)
{
return gss_import_name(minor_status, name_buffer,
name_type, output_name);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_export_name
(OM_uint32 * minor_status,
gss_const_name_t input_name,
gss_buffer_t exported_name
)
{
return gss_export_name(minor_status, input_name, exported_name);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_release_name
(OM_uint32 * minor_status,
gss_name_t * input_name
)
{
return gss_release_name(minor_status, input_name);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_inquire_context (
OM_uint32 * minor_status,
gss_const_ctx_id_t context_handle,
@@ -469,47 +420,6 @@ out:
return ret;
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_inquire_mechs_for_name (
OM_uint32 * minor_status,
gss_const_name_t input_name,
gss_OID_set * mech_types
)
{
OM_uint32 ret, junk;
ret = gss_create_empty_oid_set(minor_status, mech_types);
if (ret)
return ret;
ret = gss_add_oid_set_member(minor_status,
GSS_SPNEGO_MECHANISM,
mech_types);
if (ret)
gss_release_oid_set(&junk, mech_types);
return ret;
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_canonicalize_name (
OM_uint32 * minor_status,
gss_const_name_t input_name,
const gss_OID mech_type,
gss_name_t * output_name
)
{
/* XXX */
return gss_duplicate_name(minor_status, input_name, output_name);
}
OM_uint32 GSSAPI_CALLCONV _gss_spnego_duplicate_name (
OM_uint32 * minor_status,
gss_const_name_t src_name,
gss_name_t * dest_name
)
{
return gss_duplicate_name(minor_status, src_name, dest_name);
}
OM_uint32 GSSAPI_CALLCONV
_gss_spnego_wrap_iov(OM_uint32 * minor_status,
gss_ctx_id_t context_handle,

20
lib/gssapi/spnego/external.c
View File

@@ -88,7 +88,7 @@ static gssapi_mech_interface_desc spnego_mech = {
GMI_VERSION,
"spnego",
{6, rk_UNCONST("\x2b\x06\x01\x05\x05\x02") },
GM_USE_MG_CRED,
GM_USE_MG_CRED | GM_USE_MG_NAME,
NULL, /* gm_acquire_cred */
NULL, /* gm_release_cred */
_gss_spnego_init_sec_context,
@@ -102,11 +102,11 @@ static gssapi_mech_interface_desc spnego_mech = {
_gss_spnego_unwrap,
NULL, /* gm_display_status */
NULL, /* gm_indicate_mechs */
_gss_spnego_compare_name,
_gss_spnego_display_name,
_gss_spnego_import_name,
_gss_spnego_export_name,
_gss_spnego_release_name,
NULL, /* gm_compare_name */
NULL, /* gm_display_name */
NULL, /* gm_import_name */
NULL, /* gm_export_name */
NULL, /* gm_release_name */
NULL, /* gm_inquire_cred */
_gss_spnego_inquire_context,
_gss_spnego_wrap_size_limit,
@@ -114,10 +114,10 @@ static gssapi_mech_interface_desc spnego_mech = {
NULL, /* gm_inquire_cred_by_mech */
_gss_spnego_export_sec_context,
_gss_spnego_import_sec_context,
NULL /* _gss_spnego_inquire_names_for_mech */,
_gss_spnego_inquire_mechs_for_name,
_gss_spnego_canonicalize_name,
_gss_spnego_duplicate_name,
NULL, /* gm_spnego_inquire_names_for_mech */
NULL, /* gm_spnego_inquire_mechs_for_name */
NULL, /* gm_spnego_canonicalize_name */
NULL, /* gm_spnego_duplicate_name */
_gss_spnego_inquire_sec_context_by_oid,
NULL, /* gm_inquire_cred_by_oid */
_gss_spnego_set_sec_context_option,