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

gssapi: import bugfixes from Apple Heimdal-520

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/gssapi/mech/gss_inquire_cred.c
View File

@@ -100,6 +100,9 @@ gss_inquire_cred(OM_uint32 *minor_status,
gss_name_t mc_name;
OM_uint32 mc_lifetime;
if (mc->gmc_mech->gm_inquire_cred == NULL)
continue;
major_status = mc->gmc_mech->gm_inquire_cred(minor_status,
mc->gmc_cred, &mc_name, &mc_lifetime, &usage, NULL);
if (major_status)
@@ -135,6 +138,9 @@ gss_inquire_cred(OM_uint32 *minor_status,
gss_name_t mc_name;
OM_uint32 mc_lifetime;
if (m->gm_mech.gm_inquire_cred == NULL)
continue;
major_status = m->gm_mech.gm_inquire_cred(minor_status,
GSS_C_NO_CREDENTIAL, &mc_name, &mc_lifetime,
&usage, NULL);
@@ -169,12 +175,15 @@ gss_inquire_cred(OM_uint32 *minor_status,
}
}
if (found == 0) {
if (found == 0 || min_lifetime == 0) {
gss_name_t n = (gss_name_t)name;
if (n)
gss_release_name(minor_status, &n);
gss_release_oid_set(minor_status, mechanisms);
*minor_status = 0;
if (min_lifetime == 0)
return (GSS_S_CREDENTIALS_EXPIRED);
return (GSS_S_NO_CRED);
}