]> the.earth.li Git - onak.git/blobdiff - keydb_dynamic.c
Change SHA_DIGEST_LENGTH to SHA1_DIGEST_SIZE to match nettle
[onak.git] / keydb_dynamic.c
index e22b00db30156e084505a3ec9a748a45c0c910e7..536909a67c67e1c4219ce913d9ada34665cb1761 100644 (file)
@@ -1,9 +1,20 @@
 /*
  * keydb_dynamic.c - backend that can load the other backends
  *
- * Brett Parker <iDunno@sommitrealweird.co.uk>
+ * Copyright 2005 Brett Parker <iDunno@sommitrealweird.co.uk>
  *
- * 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 <dlfcn.h>
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
+#include "openpgp.h"
 #include "parsekey.h"
 #include "sendsync.h"
 
 static struct dbfuncs *loaded_backend = NULL;
-static char *backendsoname;
 static void *backend_handle;
 
 static bool close_backend(void)
@@ -110,8 +121,6 @@ static bool load_backend(void)
 
 static bool dynamic_starttrans()
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -127,8 +136,6 @@ static bool dynamic_starttrans()
 
 static void dynamic_endtrans()
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -140,29 +147,45 @@ 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)
 {
-       struct dynamic_backend *backend;
+       if (loaded_backend == NULL) {
+               load_backend();
+       }
+
+       if (loaded_backend != NULL) {
+               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 != NULL) {
-                       return loaded_backend->fetch_key(keyid,publickey,intrans);
+               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)
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -178,8 +201,6 @@ static int dynamic_store_key(struct openpgp_publickey *publickey, bool intrans,
 
 static int dynamic_delete_key(uint64_t keyid, bool intrans)
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -196,8 +217,6 @@ static int dynamic_delete_key(uint64_t keyid, bool intrans)
 static int dynamic_fetch_key_text(const char *search,
                struct openpgp_publickey **publickey)
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -211,11 +230,26 @@ static int dynamic_fetch_key_text(const char *search,
        return -1;
 }
 
+static int dynamic_fetch_key_skshash(const struct skshash *hash,
+               struct openpgp_publickey **publickey)
+{
+       if (loaded_backend == NULL) {
+               load_backend();
+       }
+       
+       if (loaded_backend != NULL) {
+               if (loaded_backend->fetch_key_skshash != NULL) {
+                       return loaded_backend->fetch_key_skshash(hash,
+                                                               publickey);
+               }
+       }
+
+       return -1;
+}
+
 static int dynamic_iterate_keys(void (*iterfunc)(void *ctx,
                struct openpgp_publickey *key), void *ctx)
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -239,7 +273,6 @@ static char *dynamic_keyid2uid(uint64_t keyid)
        struct openpgp_signedpacket_list *curuid = NULL;
        char buf[1024];
 
-       struct dynamic_backend *backend;
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -251,10 +284,11 @@ 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 == 13) {
+                       if (curuid->packet->tag == OPENPGP_PACKET_UID) {
                                snprintf(buf, 1023, "%.*s",
                                                (int) curuid->packet->length,
                                                curuid->packet->data);
@@ -286,7 +320,6 @@ static struct ll *dynamic_getkeysigs(uint64_t keyid, bool *revoked)
        struct openpgp_signedpacket_list *uids = NULL;
        struct openpgp_publickey *publickey = NULL;
        
-       struct dynamic_backend *backend;
        if ( loaded_backend == NULL ) {
                load_backend();
        }
@@ -297,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) {
@@ -326,8 +359,6 @@ static struct ll *dynamic_cached_getkeysigs(uint64_t keyid)
        struct stats_key *signedkey = NULL;
        struct ll        *cursig = NULL;
        bool              revoked = false;
-       
-       struct dynamic_backend *backend;
 
        if (keyid == 0)  {
                return NULL;
@@ -369,8 +400,7 @@ static struct ll *dynamic_cached_getkeysigs(uint64_t keyid)
 static uint64_t dynamic_getfullkeyid(uint64_t keyid)
 {
        struct openpgp_publickey *publickey = NULL;
-       struct dynamic_backend *backend;
-       
+
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -382,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,9 +441,9 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
        struct openpgp_publickey *prev = NULL;
-       struct dynamic_backend *backend;
        int newkeys = 0;
        bool intrans;
+       uint64_t keyid;
        
        if (loaded_backend == NULL) {
                load_backend();
@@ -427,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%llX, result: %d",
-                       get_keyid(curkey),
-                       dynamic_fetch_key(get_keyid(curkey), &oldkey, intrans));
+                       "Fetching key 0x%" PRIX64 ", result: %d",
+                       keyid,
+                       dynamic_fetch_key_id(keyid, &oldkey, intrans));
 
                /*
                 * If we already have the key stored in the DB then merge it
@@ -479,8 +510,6 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
 
 static void dynamic_initdb(bool readonly)
 {
-       struct dynamic_backend *backend;
-       
        if (loaded_backend == NULL) {
                load_backend();
        }
@@ -494,8 +523,6 @@ static void dynamic_initdb(bool readonly)
 
 static void dynamic_cleanupdb(void)
 {
-       struct dynamic_backend *backend;
-
        if (loaded_backend != NULL) {
                if (loaded_backend->cleanupdb != NULL) {
                        loaded_backend->cleanupdb();
@@ -510,8 +537,10 @@ 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,
        .update_keys            = dynamic_update_keys,
        .delete_key             = dynamic_delete_key,