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

Scope etype.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19684 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-04 12:42:51 +00:00
parent 4fe8e7566e
commit 8588cd9ebd
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
kdc/krb5tgs.c
View File

@@ -1254,7 +1254,6 @@ tgs_build_reply(krb5_context context,
KRB5SignedPathPrincipals *spp = NULL; KRB5SignedPathPrincipals *spp = NULL;
const EncryptionKey *ekey; const EncryptionKey *ekey;
krb5_keyblock sessionkey; krb5_keyblock sessionkey;
krb5_enctype etype;
krb5_kvno kvno; krb5_kvno kvno;
krb5_data rspac; krb5_data rspac;
@@ -1669,34 +1668,38 @@ server_lookup:
* Select enctype, return key and kvno. * Select enctype, return key and kvno.
*/ */
if(b->kdc_options.enc_tkt_in_skey) { {
int i; krb5_enctype etype;
ekey = &adtkt.key;
for(i = 0; i < b->etype.len; i++)
if (b->etype.val[i] == adtkt.key.keytype)
break;
if(i == b->etype.len) {
krb5_clear_error_string(context);
return KRB5KDC_ERR_ETYPE_NOSUPP;
}
etype = b->etype.val[i];
kvno = 0;
}else{
Key *skey;
ret = _kdc_find_etype(context, server, b->etype.val, b->etype.len, if(b->kdc_options.enc_tkt_in_skey) {
&skey, &etype); int i;
if(ret) { ekey = &adtkt.key;
kdc_log(context, config, 0, for(i = 0; i < b->etype.len; i++)
"Server (%s) has no support for etypes", spp); if (b->etype.val[i] == adtkt.key.keytype)
return ret; break;
if(i == b->etype.len) {
krb5_clear_error_string(context);
return KRB5KDC_ERR_ETYPE_NOSUPP;
}
etype = b->etype.val[i];
kvno = 0;
} else {
Key *skey;
ret = _kdc_find_etype(context, server, b->etype.val, b->etype.len,
&skey, &etype);
if(ret) {
kdc_log(context, config, 0,
"Server (%s) has no support for etypes", spp);
return ret;
}
ekey = &skey->key;
kvno = server->entry.kvno;
} }
ekey = &skey->key;
kvno = server->entry.kvno; krb5_generate_random_keyblock(context, etype, &sessionkey);
} }
krb5_generate_random_keyblock(context, etype, &sessionkey);
/* check PAC if there is one */ /* check PAC if there is one */
{ {
Key *tkey; Key *tkey;