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

count number of enctypes too

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-06-14 21:44:23 -07:00
parent 0f489b7b28
commit 7dccddc6fb
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/krb5/context.c
View File

@@ -897,10 +897,11 @@ krb5_kerberos_enctypes(krb5_context context)
*/ */
static krb5_error_code static krb5_error_code
copy_enctypes(krb5_context context, const krb5_enctype *in, krb5_enctype **out) copy_enctypes(krb5_context context,
const krb5_enctype *in,
krb5_enctype **out)
{ {
krb5_enctype *p = NULL; krb5_enctype *p = NULL;
krb5_error_code ret;
size_t m, n; size_t m, n;
for (n = 0; in[n]; n++) for (n = 0; in[n]; n++)
@@ -910,8 +911,7 @@ copy_enctypes(krb5_context context, const krb5_enctype *in, krb5_enctype **out)
if(p == NULL) if(p == NULL)
return krb5_enomem(context); return krb5_enomem(context);
for (n = 0, m = 0; in[n]; n++) { for (n = 0, m = 0; in[n]; n++) {
ret = krb5_enctype_valid(context, in[n]); if (krb5_enctype_valid(context, in[n]) != 0)
if (ret)
continue; continue;
p[m++] = in[n]; p[m++] = in[n];
} }
@@ -1433,10 +1433,21 @@ _krb5_init_etype(krb5_context context,
krb5_enctype **val, krb5_enctype **val,
const krb5_enctype *etypes) const krb5_enctype *etypes)
{ {
if (etypes == NULL) krb5_error_code ret;
return krb5_get_default_in_tkt_etypes(context, pdu_type, val);
return copy_enctypes(context, etypes, val); if (etypes == NULL)
ret = krb5_get_default_in_tkt_etypes(context, pdu_type, val);
else
ret = copy_enctypes(context, etypes, val);
if (ret)
return ret;
if (len) {
*len = 0;
while ((*val)[*len] != KRB5_ENCTYPE_NULL)
(*len)++;
}
return 0;
} }
/* /*