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

(gss_krb5_set_allowable_enctypes): use the length of the array passed

Browse Source 
in, stop leaking memory, check for error conditions.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20322 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-04-12 16:43:50 +00:00
parent f2b595ad48
commit bdff5b6032
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/gssapi/mech/gss_krb5.c
View File

@@ -164,7 +164,12 @@ gss_krb5_import_cred(OM_uint32 *minor_status,
goto out; goto out;
} }
krb5_storage_to_data(sp, &data); ret = krb5_storage_to_data(sp, &data);
if (ret) {
*minor_status = ret;
major_status = GSS_S_FAILURE;
goto out;
}
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
@@ -421,37 +426,49 @@ gss_krb5_free_lucid_sec_context(OM_uint32 *minor_status, void *c)
*/ */
OM_uint32 OM_uint32
gss_krb5_set_allowable_enctypes(OM_uint32 *min_status, gss_krb5_set_allowable_enctypes(OM_uint32 *minor_status,
gss_cred_id_t cred, gss_cred_id_t cred,
OM_uint32 num_enctypes, OM_uint32 num_enctypes,
int32_t *enctypes) int32_t *enctypes)
{ {
krb5_error_code ret;
OM_uint32 maj_status; OM_uint32 maj_status;
gss_buffer_desc buffer; gss_buffer_desc buffer;
krb5_storage *sp; krb5_storage *sp;
krb5_data data; krb5_data data;
int i;
sp = krb5_storage_emem(); sp = krb5_storage_emem();
if (sp == NULL) { if (sp == NULL) {
*min_status = ENOMEM; *minor_status = ENOMEM;
maj_status = GSS_S_FAILURE; maj_status = GSS_S_FAILURE;
goto out; goto out;
} }
while(*enctypes) { for (i = 0; i < num_enctypes; i++) {
krb5_store_int32(sp, *enctypes); ret = krb5_store_int32(sp, enctypes[i]);
enctypes++; if (ret) {
*minor_status = ret;
maj_status = GSS_S_FAILURE;
goto out;
}
} }
krb5_storage_to_data(sp, &data); ret = krb5_storage_to_data(sp, &data);
if (ret) {
*minor_status = ret;
maj_status = GSS_S_FAILURE;
goto out;
}
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
maj_status = gss_set_cred_option(min_status, maj_status = gss_set_cred_option(minor_status,
&cred, &cred,
GSS_KRB5_SET_ALLOWABLE_ENCTYPES_X, GSS_KRB5_SET_ALLOWABLE_ENCTYPES_X,
&buffer); &buffer);
krb5_data_free(&data);
out: out:
if (sp) if (sp)
krb5_storage_free(sp); krb5_storage_free(sp);