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

(get_des_key): change to return v4 or afs keys if possible

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8470 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-06-28 11:46:02 +00:00
parent dddd82e2ff
commit af5f12eac7
1 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
kdc/kerberos4.c
View File

@@ -107,18 +107,50 @@ db_fetch4(const char *name, const char *instance, const char *realm)
} }
krb5_error_code krb5_error_code
get_des_key(hdb_entry *principal, Key **key) get_des_key(hdb_entry *principal, krb5_boolean prefer_afs_key, Key **ret_key)
{ {
krb5_error_code ret; Key *key = NULL;
Key *v5_key = NULL, *v4_key = NULL, *afs_key = NULL;
int i;
krb5_enctype etypes = { ETYPE_DES_CBC_MD5,
ETYPE_DES_CBC_MD4,
ETYPE_DES_CBC_CRC };
ret = hdb_enctype2key(context, principal, ETYPE_DES_CBC_MD5, key); for(i = 0; i < 3; i++) {
if(ret) key = NULL;
ret = hdb_enctype2key(context, principal, ETYPE_DES_CBC_MD4, key); while(hdb_next_enctype2key(context, principal, etypes[i], &key) == 0) {
if(ret) if(key->salt == NULL) {
ret = hdb_enctype2key(context, principal, ETYPE_DES_CBC_CRC, key); if(v5_key == NULL)
if(ret) v5_key = key;
return ret; } else if(key->salt->type == hdb_pw_salt &&
if ((*key)->key.keyvalue.length == 0) key->salt->length == 0) {
if(v4_key == NULL)
v4_key = key;
} else if(key->salt->salttype == hdb_afs3_salt) {
if(afs_key == NULL)
afs_key = key;
}
}
if(v5_key != NULL && v4_key != NULL && afs_key != NULL)
break;
}
if(prefer_afs_key)
if(afs_key)
*ret_key = afs_key;
else if(v4_key)
*ret_key = v4_key;
else
*ret_key = v5_key;
else
if(v4_key)
*ret_key = v4_key;
else if(afs_key)
*ret_key = afs_key;
else
*ret_key = v5_key;
if((*ret_key)->key.keyvalue.length == 0)
return KERB_ERR_NULL_KEY; return KERB_ERR_NULL_KEY;
return 0; return 0;
} }