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

Also encrypt the history when storing the entry.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-12 10:34:57 -05:00
committed by Nicolas Williams
parent fca53990e4
commit 08650b573b
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/hdb/mkey.c
View File

@@ -485,7 +485,7 @@ hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno,
hdb_entry *ent) hdb_entry *ent)
{ {
krb5_error_code ret = KRB5KRB_AP_ERR_NOKEY; /* XXX need a better code? */ krb5_error_code ret = KRB5KRB_AP_ERR_NOKEY; /* XXX need a better code? */
HDB_extension *tmp; HDB_extension *ext;
HDB_Ext_KeySet *hist_keys; HDB_Ext_KeySet *hist_keys;
hdb_keyset *tmp_keys; hdb_keyset *tmp_keys;
Key *tmp_val; Key *tmp_val;
@@ -495,15 +495,15 @@ hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno,
assert(kvno == 0 || kvno < ent->kvno); assert(kvno == 0 || kvno < ent->kvno);
tmp = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys); ext = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys);
if (tmp == NULL) if (ext == NULL)
return ret; return ret;
tmp_len = ent->keys.len; tmp_len = ent->keys.len;
tmp_val = ent->keys.val; tmp_val = ent->keys.val;
tmp_kvno = ent->kvno; tmp_kvno = ent->kvno;
hist_keys = &tmp->data.u.hist_keys; hist_keys = &ext->data.u.hist_keys;
for (i = hist_keys->len - 1; i >= 0; i++) { for (i = hist_keys->len - 1; i >= 0; i++) {
if (kvno != 0 && hist_keys->val[i].kvno != kvno) if (kvno != 0 && hist_keys->val[i].kvno != kvno)
@@ -606,14 +606,31 @@ hdb_seal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey)
krb5_error_code krb5_error_code
hdb_seal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey) hdb_seal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey)
{ {
size_t i; HDB_extension *ext;
for(i = 0; i < ent->keys.len; i++){ HDB_Ext_KeySet *hist_keys;
krb5_error_code ret; size_t i, k;
krb5_error_code ret;
for(i = 0; i < ent->keys.len; i++){
ret = hdb_seal_key_mkey(context, &ent->keys.val[i], mkey); ret = hdb_seal_key_mkey(context, &ent->keys.val[i], mkey);
if (ret) if (ret)
return ret; return ret;
} }
ext = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys);
if (ext == NULL)
return 0;
hist_keys = &ext->data.u.hist_keys;
for (i = 0; i < hist_keys->len; i++) {
for (k = 0; k < hist_keys->val[i].keys.len; i++) {
ret = hdb_seal_key_mkey(context, &hist_keys->val[i].keys.val[k],
mkey);
if (ret)
return ret;
}
}
return 0; return 0;
} }