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:
Luke Howard
2019-01-03 09:06:46 +11:00
parent 29fe69f95f
commit ad426d0385
13 changed files with 98 additions and 26 deletions

View File

@@ -33,7 +33,7 @@ gss_indicate_mechs(OM_uint32 *minor_status,
gss_OID_set *mech_set)
{
struct _gss_mech_switch *m;
OM_uint32 major_status;
OM_uint32 major_status, junk;
gss_OID_set set;
size_t i;
@@ -50,16 +50,25 @@ gss_indicate_mechs(OM_uint32 *minor_status,
minor_status, &set);
if (major_status)
continue;
for (i = 0; i < set->count; i++)
gss_add_oid_set_member(
major_status = GSS_S_COMPLETE;
for (i = 0; i < set->count; i++) {
major_status = gss_add_oid_set_member(
minor_status, &set->elements[i], mech_set);
if (major_status)
break;
}
gss_release_oid_set(minor_status, &set);
} else {
gss_add_oid_set_member(
major_status = gss_add_oid_set_member(
minor_status, m->gm_mech_oid, mech_set);
}
if (major_status)
break;
}
if (major_status)
gss_release_oid_set(&junk, mech_set);
*minor_status = 0;
return (GSS_S_COMPLETE);
return major_status;
}