X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_dynamic.c;h=536909a67c67e1c4219ce913d9ada34665cb1761;hb=cab77e4ffc25ba4fb2e5289beaa47c7d915de942;hp=ae2b8056870dba7a2a27c75c37ac5193fd275490;hpb=0211c730256c9bbaf10a569c88f7df0ef882311e;p=onak.git diff --git a/keydb_dynamic.c b/keydb_dynamic.c index ae2b805..536909a 100644 --- a/keydb_dynamic.c +++ b/keydb_dynamic.c @@ -1,9 +1,20 @@ /* * keydb_dynamic.c - backend that can load the other backends * - * Brett Parker + * Copyright 2005 Brett Parker * - * Copyright 2005 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -136,22 +147,42 @@ static void dynamic_endtrans() } } -static int dynamic_fetch_key(uint64_t keyid, +static int dynamic_fetch_key_id(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans) { if (loaded_backend == NULL) { load_backend(); } - + if (loaded_backend != NULL) { - if (loaded_backend->fetch_key != NULL) { - return loaded_backend->fetch_key(keyid,publickey,intrans); + if (loaded_backend->fetch_key_id != NULL) { + return loaded_backend->fetch_key_id(keyid, + publickey, intrans); } } return -1; } +static int dynamic_fetch_key_fp(uint8_t *fp, size_t fpsize, + struct openpgp_publickey **publickey, bool intrans) +{ + if (loaded_backend == NULL) { + load_backend(); + } + + if (loaded_backend != NULL) { + if (loaded_backend->fetch_key_id != NULL) { + return loaded_backend->fetch_key_fp(fp, fpsize, + publickey, intrans); + } + } + + return -1; +} + + + static int dynamic_store_key(struct openpgp_publickey *publickey, bool intrans, bool update) { @@ -253,7 +284,8 @@ static char *dynamic_keyid2uid(uint64_t keyid) } buf[0]=0; - if (dynamic_fetch_key(keyid, &publickey, false) && publickey != NULL) { + if (dynamic_fetch_key_id(keyid, &publickey, false) && + publickey != NULL) { curuid = publickey->uids; while (curuid != NULL && buf[0] == 0) { if (curuid->packet->tag == OPENPGP_PACKET_UID) { @@ -298,7 +330,7 @@ static struct ll *dynamic_getkeysigs(uint64_t keyid, bool *revoked) } } - dynamic_fetch_key(keyid, &publickey, false); + dynamic_fetch_key_id(keyid, &publickey, false); if (publickey != NULL) { for (uids = publickey->uids; uids != NULL; uids = uids->next) { @@ -380,9 +412,9 @@ static uint64_t dynamic_getfullkeyid(uint64_t keyid) } if (keyid < 0x100000000LL) { - dynamic_fetch_key(keyid, &publickey, false); + dynamic_fetch_key_id(keyid, &publickey, false); if (publickey != NULL) { - keyid = get_keyid(publickey); + get_keyid(publickey, &keyid); free_publickey(publickey); publickey = NULL; } else { @@ -411,6 +443,7 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync) struct openpgp_publickey *prev = NULL; int newkeys = 0; bool intrans; + uint64_t keyid; if (loaded_backend == NULL) { load_backend(); @@ -424,10 +457,11 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync) for (curkey = *keys; curkey != NULL; curkey = curkey->next) { intrans = dynamic_starttrans(); + get_keyid(curkey, &keyid); logthing(LOGTHING_INFO, "Fetching key 0x%" PRIX64 ", result: %d", - get_keyid(curkey), - dynamic_fetch_key(get_keyid(curkey), &oldkey, intrans)); + keyid, + dynamic_fetch_key_id(keyid, &oldkey, intrans)); /* * If we already have the key stored in the DB then merge it @@ -503,7 +537,8 @@ struct dbfuncs keydb_dynamic_funcs = { .cleanupdb = dynamic_cleanupdb, .starttrans = dynamic_starttrans, .endtrans = dynamic_endtrans, - .fetch_key = dynamic_fetch_key, + .fetch_key_id = dynamic_fetch_key_id, + .fetch_key_fp = dynamic_fetch_key_fp, .fetch_key_text = dynamic_fetch_key_text, .fetch_key_skshash = dynamic_fetch_key_skshash, .store_key = dynamic_store_key,