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

Pass keytype to string_to_key

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3535 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-22 18:38:36 +00:00
parent a888c4e3ac
commit c4125f8ac4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/util.c
View File

@@ -62,7 +62,8 @@ set_keys(hdb_entry *ent, char *password)
memset(&salt, 0, sizeof(salt)); memset(&salt, 0, sizeof(salt));
krb5_get_salt(ent->principal, &salt); krb5_get_salt(ent->principal, &salt);
for(i = 0; i < ent->keys.len; i++) { for(i = 0; i < ent->keys.len; i++) {
krb5_string_to_key(password, &salt, &ent->keys.val[i].key); /* XXX */ krb5_string_to_key(password, &salt, ent->keys.val[i].key.keytype,
&ent->keys.val[i].key); /* XXX */
seal_key(&ent->keys.val[i]); seal_key(&ent->keys.val[i]);
} }
krb5_data_free(&salt); krb5_data_free(&salt);

5
kpasswd/kpasswdd.c
View File

@@ -275,9 +275,10 @@ change (krb5_auth_context auth_context,
krb5_data_zero (&salt); krb5_data_zero (&salt);
krb5_get_salt (principal, &salt); krb5_get_salt (principal, &salt);
memset (&new_keyblock, 0, sizeof(new_keyblock)); memset (&new_keyblock, 0, sizeof(new_keyblock));
krb5_string_to_key_data (pwd_data, &salt, &new_keyblock);
krb5_data_free (&salt);
old_keyblock = &ent.keys.val[0].key; old_keyblock = &ent.keys.val[0].key;
krb5_string_to_key_data (pwd_data, &salt, old_keyblock->keytype, /* XXX */
&new_keyblock);
krb5_data_free (&salt);
if (new_keyblock.keytype == old_keyblock->keytype if (new_keyblock.keytype == old_keyblock->keytype
&& new_keyblock.keyvalue.length == old_keyblock->keyvalue.length && new_keyblock.keyvalue.length == old_keyblock->keyvalue.length