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

Another HDB_F_DECRYPT-isn't-critical fix.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-20 14:57:27 -05:00
parent 5335559845
commit 689d4f4dd9
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/hdb/common.c
View File

@@ -155,10 +155,7 @@ _hdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal,
} }
} }
krb5_data_free(&value); krb5_data_free(&value);
if (!db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) if ((flags & HDB_F_DECRYPT) && (flags & HDB_F_ALL_KVNOS)) {
return 0; /* HDB_F_DECRYPT isn't critical, oddly enough */
if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT) &&
(flags & HDB_F_ALL_KVNOS)) {
/* Decrypt the current keys */ /* Decrypt the current keys */
ret = hdb_unseal_keys(context, db, &entry->entry); ret = hdb_unseal_keys(context, db, &entry->entry);
if (ret) { if (ret) {
@@ -171,7 +168,7 @@ _hdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal,
hdb_free_entry(context, entry); hdb_free_entry(context, entry);
return ret; return ret;
} }
} else if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) { } else if ((flags & HDB_F_DECRYPT)) {
if ((flags & HDB_F_KVNO_SPECIFIED) == 0 || kvno == entry->entry.kvno) { if ((flags & HDB_F_KVNO_SPECIFIED) == 0 || kvno == entry->entry.kvno) {
/* Decrypt the current keys */ /* Decrypt the current keys */
ret = hdb_unseal_keys(context, db, &entry->entry); ret = hdb_unseal_keys(context, db, &entry->entry);