From 4244f1386644deb13cfaad8b7f5c248afbc41e74 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sat, 16 Apr 2011 02:03:47 -0500 Subject: [PATCH] This makes hdb-sqlite work: moving the unseal of keys past the value2entry decoding. Signed-off-by: Love Hornquist Astrand --- lib/hdb/hdb-sqlite.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/hdb/hdb-sqlite.c b/lib/hdb/hdb-sqlite.c index 91ecda711..d77416893 100644 --- a/lib/hdb/hdb-sqlite.c +++ b/lib/hdb/hdb-sqlite.c @@ -416,6 +416,13 @@ hdb_sqlite_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal princi } } + value.length = sqlite3_column_bytes(fetch, 0); + value.data = (void *) sqlite3_column_blob(fetch, 0); + + ret = hdb_value2entry(context, &value, &entry->entry); + if(ret) + goto out; + if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) { ret = hdb_unseal_keys(context, db, &entry->entry); if(ret) { @@ -423,13 +430,6 @@ hdb_sqlite_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal princi goto out; } } - - value.length = sqlite3_column_bytes(fetch, 0); - value.data = (void *) sqlite3_column_blob(fetch, 0); - - ret = hdb_value2entry(context, &value, &entry->entry); - if(ret) - goto out; ret = 0;