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:
@@ -50,6 +50,8 @@ gss_inquire_cred_by_oid (OM_uint32 *minor_status,
|
||||
if (cred == NULL)
|
||||
return GSS_S_NO_CRED;
|
||||
|
||||
status = GSS_S_FAILURE;
|
||||
|
||||
HEIM_SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
|
||||
gss_buffer_set_t rset = GSS_C_NO_BUFFER_SET;
|
||||
size_t i;
|
||||
@@ -66,10 +68,12 @@ gss_inquire_cred_by_oid (OM_uint32 *minor_status,
|
||||
|
||||
status = m->gm_inquire_cred_by_oid(minor_status,
|
||||
mc->gmc_cred, desired_object, &rset);
|
||||
if (status != GSS_S_COMPLETE)
|
||||
if (status != GSS_S_COMPLETE) {
|
||||
_gss_mg_error(m, status, *minor_status);
|
||||
continue;
|
||||
}
|
||||
|
||||
for (i = 0; i < rset->count; i++) {
|
||||
for (i = 0; rset != NULL && i < rset->count; i++) {
|
||||
status = gss_add_buffer_set_member(minor_status,
|
||||
&rset->elements[i], &set);
|
||||
if (status != GSS_S_COMPLETE)
|
||||
@@ -77,7 +81,7 @@ gss_inquire_cred_by_oid (OM_uint32 *minor_status,
|
||||
}
|
||||
gss_release_buffer_set(minor_status, &rset);
|
||||
}
|
||||
if (set == GSS_C_NO_BUFFER_SET)
|
||||
if (set == GSS_C_NO_BUFFER_SET && status == GSS_S_COMPLETE)
|
||||
status = GSS_S_FAILURE;
|
||||
*data_set = set;
|
||||
*minor_status = 0;
|
||||
|
Reference in New Issue
Block a user