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

(krb5_set_default_in_tkt_etypes): filter out unwanted enctypes

Browse Source 
Needed for Samba that tries really hard to use DES encryption types.

Reported by Natanael Copa on heimdal-discuss
This commit is contained in:
Love Hornquist Astrand
2010-03-17 09:30:11 -07:00
parent 523c393829
commit f26d6c2398
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/krb5/context.c
View File

@@ -825,23 +825,33 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_set_default_in_tkt_etypes(krb5_context context, krb5_set_default_in_tkt_etypes(krb5_context context,
const krb5_enctype *etypes) const krb5_enctype *etypes)
{ {
krb5_error_code ret;
krb5_enctype *p = NULL; krb5_enctype *p = NULL;
int i; unsigned int n, m;
if(etypes) { if(etypes) {
for (i = 0; etypes[i]; ++i) { for (n = 0; etypes[n]; n++)
krb5_error_code ret; ;
ret = krb5_enctype_valid(context, etypes[i]); n++;
if (ret) ALLOC(p, n);
return ret;
}
++i;
ALLOC(p, i);
if(!p) { if(!p) {
krb5_set_error_message (context, ENOMEM, N_("malloc: out of memory", "")); krb5_set_error_message (context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
memmove(p, etypes, i * sizeof(krb5_enctype)); for (n = 0, m = 0; etypes[n]; n++) {
ret = krb5_enctype_valid(context, etypes[n]);
if (ret)
continue;
p[m++] = etypes[n];
}
p[m] = ETYPE_NULL;
if (m == 0) {
free(p);
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP,
N_("no valid enctype set", ""));
return KRB5_PROG_ETYPE_NOSUPP;
}
} }
if(context->etypes) if(context->etypes)
free(context->etypes); free(context->etypes);