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

(find_etype): support null keys

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7154 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-10-17 10:35:33 +00:00
parent d472f4f067
commit 89d9ad5354
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kdc/kerberos5.c
View File

@@ -115,11 +115,23 @@ find_etype(hdb_entry *princ, unsigned *etypes, unsigned len,
Key **key, int *index)
{
int i;
krb5_error_code ret = -1;
for(i = 0; i < len ; i++)
if((ret = hdb_enctype2key(context, princ, etypes[i], key)) == 0)
break;
if(index) *index = i;
krb5_error_code ret = KRB5KDC_ERR_ETYPE_NOSUPP;
for(i = 0; i < len ; i++) {
krb5_error_code tmp;
tmp = hdb_enctype2key(context, princ, etypes[i], key);
if (tmp == 0) {
if ((*key)->key.keyvalue.length != 0) {
ret = 0;
break;
} else {
ret = KRB5KDC_ERR_NULL_KEY;
}
}
}
if(index)
*index = i;
return ret;
}
@@ -138,9 +150,9 @@ find_keys(hdb_entry *client,
if(client){
/* find client key */
ret = find_etype(client, etypes, num_etypes, ckey, &i);
if(ret){
if (ret) {
kdc_log(0, "Client has no support for etypes");
return KRB5KDC_ERR_ETYPE_NOSUPP;
return ret;
}
*cetype = etypes[i];
}
@@ -148,9 +160,9 @@ find_keys(hdb_entry *client,
if(server){
/* find server key */
ret = find_etype(server, etypes, num_etypes, skey, NULL);
if(ret){
if (ret) {
kdc_log(0, "Server has no support for etypes");
return KRB5KDC_ERR_ETYPE_NOSUPP;
return ret;
}
*setype = (*skey)->key.keytype;
}