gssapi: import bugfixes from Apple Heimdal-520
* check `ctx->gc_ctx` in `gss_inquire_context()` * check `gm_inquire_cred != NULL` in `gss_inquire_context()` * check `min_lifetime` in `gss_inquire_cred()` * check `gm_inquire_cred_by_mech != NULL` in `gss_inquire_cred_by_mech()` * set mech error in `gss_inquire_cred_by_oid()` * don't clobber error in `gss_inquire_cred_by_oid()` * don't pass NULL minor_status to `gss_krb5_free_lucid_sec_context()` * allow NULL ccache in `gss_krb5_ccache_name()` * NULL names OK in `_gss_find_mn()` * allow empty names in `gss_import_name()` (removes `input_name_buffer` length check). to support ANONYMOUS. in `gss_import_name()`, ignore mech name import failure as long as it's possible to import the name in some other mechanism * better argument validation in `gss_export_sec_context()` * in `gss_compare_name()`, check `mn2 != NULL` * check `gss_add_oid_set_member()` return code in `gss_indicate_mechs()` * in `gss_destroy_cred()`, set output cred handle to `GSS_C_NO_CREDENTIAL` * cast size_t to OM_uint32 where required
This commit is contained in:
@@ -186,12 +186,14 @@ gss_import_name(OM_uint32 *minor_status,
|
||||
struct _gss_mech_switch *m;
|
||||
gss_name_t rname;
|
||||
|
||||
if (input_name_buffer == GSS_C_NO_BUFFER)
|
||||
return GSS_S_CALL_INACCESSIBLE_READ;
|
||||
if (output_name == NULL)
|
||||
return GSS_S_CALL_INACCESSIBLE_WRITE;
|
||||
|
||||
*output_name = GSS_C_NO_NAME;
|
||||
|
||||
if (input_name_buffer->length == 0) {
|
||||
*minor_status = 0;
|
||||
return (GSS_S_BAD_NAME);
|
||||
}
|
||||
/* Allow empty names since that's valid (ANONYMOUS for example) */
|
||||
|
||||
_gss_load_mech();
|
||||
|
||||
@@ -261,7 +263,14 @@ gss_import_name(OM_uint32 *minor_status,
|
||||
if (major_status != GSS_S_COMPLETE) {
|
||||
_gss_mg_error(&m->gm_mech, major_status, *minor_status);
|
||||
free(mn);
|
||||
goto out;
|
||||
/**
|
||||
* If we failed to import the name in a mechanism, it
|
||||
* will be ignored as long as its possible to import
|
||||
* name in some other mechanism. We will catch the
|
||||
* failure later though in gss_init_sec_context() or
|
||||
* another function.
|
||||
*/
|
||||
continue;
|
||||
}
|
||||
|
||||
mn->gmn_mech = &m->gm_mech;
|
||||
|
Reference in New Issue
Block a user