"Recognize" some extra subpacket types

[onak.git] / keydb_db4.c

diff --git a/keydb_db4.c b/keydb_db4.c
index 1daf00bed8f91d016d55938848f2f92ce8101399..85aeab559e9c60a7f6300401d176bfd6c19f5ee7 100644 (file)
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -69,6 +69,92 @@ DB *keydb(uint64_t keyid)
        return(dbconns[keytrun % numdbs]);
 }
 
        return(dbconns[keytrun % numdbs]);
 }
 

+/**
+ *     starttrans - Start a transaction.
+ *
+ *     Start a transaction. Intended to be used if we're about to perform many
+ *     operations on the database to help speed it all up, or if we want
+ *     something to only succeed if all relevant operations are successful.
+ */
+static bool db4_starttrans(void)
+{
+       int ret;
+
+       log_assert(dbenv != NULL);
+       log_assert(txn == NULL);
+
+       ret = dbenv->txn_begin(dbenv,
+               NULL, /* No parent transaction */
+               &txn,
+               0);
+       if (ret != 0) {
+               logthing(LOGTHING_CRITICAL,
+                               "Error starting transaction: %s",
+                               db_strerror(ret));
+               exit(1);
+       }
+
+       return true;
+}
+
+/**
+ *     endtrans - End a transaction.
+ *
+ *     Ends a transaction.
+ */
+static void db4_endtrans(void)
+{
+       int ret;
+
+       log_assert(dbenv != NULL);
+       log_assert(txn != NULL);
+
+       ret = txn->commit(txn,
+               0);
+       if (ret != 0) {
+               logthing(LOGTHING_CRITICAL,
+                               "Error ending transaction: %s",
+                               db_strerror(ret));
+               exit(1);
+       }
+       txn = NULL;
+
+       return;
+}
+
+/**
+ *     cleanupdb - De-initialize the key database.
+ *
+ *     This function should be called upon program exit to allow the DB to
+ *     cleanup after itself.
+ */
+static void db4_cleanupdb(void)
+{
+       int i = 0;
+
+       if (dbenv != NULL) {
+               dbenv->txn_checkpoint(dbenv, 0, 0, 0);
+               if (id32db != NULL) {
+                       id32db->close(id32db, 0);
+                       id32db = NULL;
+               }
+               if (worddb != NULL) {
+                       worddb->close(worddb, 0);
+                       worddb = NULL;
+               }
+               for (i = 0; i < numdbs; i++) {
+                       if (dbconns[i] != NULL) {
+                               dbconns[i]->close(dbconns[i], 0);
+                               dbconns[i] = NULL;
+                       }
+               }
+               free(dbconns);
+               dbconns = NULL;
+               dbenv->close(dbenv, 0);
+               dbenv = NULL;
+       }
+}
+

 /**
  *     initdb - Initialize the key database.
  *
 /**
  *     initdb - Initialize the key database.
  *


@@ -76,7 +162,7 @@ DB *keydb(uint64_t keyid)
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */

-void initdb(bool readonly)
+static void db4_initdb(bool readonly)

 {
        char       buf[1024];
        FILE      *numdb = NULL;
 {
        char       buf[1024];
        FILE      *numdb = NULL;


@@ -144,11 +230,13 @@ void initdb(bool readonly)
                                        "Error opening db environment: %s (%s)",
                                        config.db_dir,
                                        db_strerror(ret));
                                        "Error opening db environment: %s (%s)",
                                        config.db_dir,
                                        db_strerror(ret));

+                       dbenv->close(dbenv, 0);
+                       dbenv = NULL;

                }
        }
 
        if (ret == 0) {
                }
        }
 
        if (ret == 0) {

-               starttrans();
+               db4_starttrans();

 
                for (i = 0; !ret && i < numdbs; i++) {
                        ret = db_create(&dbconns[i], dbenv, 0);
 
                for (i = 0; !ret && i < numdbs; i++) {
                        ret = db_create(&dbconns[i], dbenv, 0);


@@ -231,11 +319,11 @@ void initdb(bool readonly)
        }
 
        if (txn != NULL) {
        }
 
        if (txn != NULL) {

-               endtrans();
+               db4_endtrans();

        }
 
        if (ret != 0) {
        }
 
        if (ret != 0) {

-               cleanupdb();
+               db4_cleanupdb();

                logthing(LOGTHING_CRITICAL,
                                "Error opening database; exiting");
                exit(EXIT_FAILURE);
                logthing(LOGTHING_CRITICAL,
                                "Error opening database; exiting");
                exit(EXIT_FAILURE);


@@ -245,87 +333,52 @@ void initdb(bool readonly)
 }
 
 /**
 }
 
 /**

- *     cleanupdb - De-initialize the key database.
+ *     getfullkeyid - Maps a 32bit key id to a 64bit one.
+ *     @keyid: The 32bit keyid.

  *
  *

- *     This function should be called upon program exit to allow the DB to
- *     cleanup after itself.
+ *     This function maps a 32bit key id to the full 64bit one. It returns the
+ *     full keyid. If the key isn't found a keyid of 0 is returned.

  */
  */

-void cleanupdb(void)
+static uint64_t db4_getfullkeyid(uint64_t keyid)

 {
 {

-       int i = 0;
-
-       if (dbenv != NULL) {
-               dbenv->txn_checkpoint(dbenv, 0, 0, 0);
-               if (id32db != NULL) {
-                       id32db->close(id32db, 0);
-                       id32db = NULL;
-               }
-               if (worddb != NULL) {
-                       worddb->close(worddb, 0);
-                       worddb = NULL;
-               }
-               for (i = 0; i < numdbs; i++) {
-                       if (dbconns[i] != NULL) {
-                               dbconns[i]->close(dbconns[i], 0);
-                               dbconns[i] = NULL;
-                       }
-               }
-               dbenv->close(dbenv, 0);
-               dbenv = NULL;
-       }
-}
+       DBT       key, data;
+       DBC      *cursor = NULL;
+       uint32_t  shortkeyid = 0;
+       int       ret = 0;

 
 

-/**
- *     starttrans - Start a transaction.
- *
- *     Start a transaction. Intended to be used if we're about to perform many
- *     operations on the database to help speed it all up, or if we want
- *     something to only succeed if all relevant operations are successful.
- */
-bool starttrans(void)
-{
-       int ret;
+       if (keyid < 0x100000000LL) {
+               ret = id32db->cursor(id32db,
+                               txn,
+                               &cursor,
+                               0);   /* flags */

 
 

-       log_assert(dbenv != NULL);
-       log_assert(txn == NULL);
+               shortkeyid = keyid & 0xFFFFFFFF;

 
 

-       ret = dbenv->txn_begin(dbenv,
-               NULL, /* No parent transaction */
-               &txn,
-               0);
-       if (ret != 0) {
-               logthing(LOGTHING_CRITICAL,
-                               "Error starting transaction: %s",
-                               db_strerror(ret));
-               exit(1);
-       }
+               memset(&key, 0, sizeof(key));
+               memset(&data, 0, sizeof(data));
+               key.data = &shortkeyid;
+               key.size = sizeof(shortkeyid);
+               data.flags = DB_DBT_MALLOC;

 
 

-       return true;
-}
+               ret = cursor->c_get(cursor,
+                       &key,
+                       &data,
+                       DB_SET);

 
 

-/**
- *     endtrans - End a transaction.
- *
- *     Ends a transaction.
- */
-void endtrans(void)
-{
-       int ret;
+               if (ret == 0) {
+                       keyid = *(uint64_t *) data.data;

 
 

-       log_assert(dbenv != NULL);
-       log_assert(txn != NULL);
+                       if (data.data != NULL) {
+                               free(data.data);
+                               data.data = NULL;
+                       }
+               }

 
 

-       ret = txn->commit(txn,
-               0);
-       if (ret != 0) {
-               logthing(LOGTHING_CRITICAL,
-                               "Error ending transaction: %s",
-                               db_strerror(ret));
-               exit(1);
+               ret = cursor->c_close(cursor);
+               cursor = NULL;

        }
        }

-       txn = NULL;
-
-       return;
+       
+       return keyid;

 }
 
 /**
 }
 
 /**


@@ -340,7 +393,7 @@ void endtrans(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int db4_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,

                bool intrans)
 {
        struct openpgp_packet_list *packets = NULL;
                bool intrans)
 {
        struct openpgp_packet_list *packets = NULL;


@@ -350,7 +403,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        struct buffer_ctx fetchbuf;
 
        if (keyid < 0x100000000LL) {
        struct buffer_ctx fetchbuf;
 
        if (keyid < 0x100000000LL) {

-               keyid = getfullkeyid(keyid);
+               keyid = db4_getfullkeyid(keyid);

        }
 
        memset(&key, 0, sizeof(key));
        }
 
        memset(&key, 0, sizeof(key));


@@ -363,7 +416,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        key.data = &keyid;
 
        if (!intrans) {
        key.data = &keyid;
 
        if (!intrans) {

-               starttrans();
+               db4_starttrans();

        }
 
        ret = keydb(keyid)->get(keydb(keyid),
        }
 
        ret = keydb(keyid)->get(keydb(keyid),


@@ -389,7 +442,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        }
 
        if (!intrans) {
        }
 
        if (!intrans) {

-               endtrans();
+               db4_endtrans();

        }
 
        return (numkeys);
        }
 
        return (numkeys);


@@ -408,7 +461,8 @@ int worddb_cmp(const void *d1, const void *d2)
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */

-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int db4_fetch_key_text(const char *search,
+               struct openpgp_publickey **publickey)

 {
        DBC *cursor = NULL;
        DBT key, data;
 {
        DBC *cursor = NULL;
        DBT key, data;


@@ -421,13 +475,14 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        struct ll *curword = NULL;
        struct keyarray keylist = { NULL, 0, 0 };
        struct keyarray newkeylist = { NULL, 0, 0 };
        struct ll *curword = NULL;
        struct keyarray keylist = { NULL, 0, 0 };
        struct keyarray newkeylist = { NULL, 0, 0 };

+       int firstpass = 1;

 
        numkeys = 0;
        searchtext = strdup(search);
        wordlist = makewordlist(wordlist, searchtext);
 
        for (curword = wordlist; curword != NULL; curword = curword->next) {
 
        numkeys = 0;
        searchtext = strdup(search);
        wordlist = makewordlist(wordlist, searchtext);
 
        for (curword = wordlist; curword != NULL; curword = curword->next) {

-               starttrans();
+               db4_starttrans();

 
                ret = worddb->cursor(worddb,
                                txn,
 
                ret = worddb->cursor(worddb,
                                txn,


@@ -453,8 +508,12 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
                                                data.data)[i];
                        }
 
                                                data.data)[i];
                        }
 

-                       if (keylist.count == 0 ||
-                                       array_find(&keylist, keyid)) {
+                       /*
+                        * Only add the keys containing this word if this is
+                        * our first pass (ie we have no existing key list),
+                        * or the key contained a previous word.
+                        */
+                       if (firstpass || array_find(&keylist, keyid)) {

                                array_add(&newkeylist, keyid);
                        }
 
                                array_add(&newkeylist, keyid);
                        }
 


@@ -476,14 +535,15 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
                }
                ret = cursor->c_close(cursor);
                cursor = NULL;
                }
                ret = cursor->c_close(cursor);
                cursor = NULL;

-               endtrans();
+               firstpass = 0;
+               db4_endtrans();

        }
        llfree(wordlist, NULL);
        wordlist = NULL;
        
        }
        llfree(wordlist, NULL);
        wordlist = NULL;
        

-       starttrans();
+       db4_starttrans();

        for (i = 0; i < keylist.count; i++) {
        for (i = 0; i < keylist.count; i++) {

-               numkeys += fetch_key(keylist.keys[i],
+               numkeys += db4_fetch_key(keylist.keys[i],

                        publickey,
                        true);
        }
                        publickey,
                        true);
        }


@@ -491,129 +551,65 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        free(searchtext);
        searchtext = NULL;
 
        free(searchtext);
        searchtext = NULL;
 

-       endtrans();
+       db4_endtrans();

        
        return (numkeys);
 }
 
 /**
        
        return (numkeys);
 }
 
 /**

- *     store_key - Takes a key and stores it.
- *     @publickey: A pointer to the public key to store.
+ *     delete_key - Given a keyid delete the key from storage.
+ *     @keyid: The keyid to delete.

  *     @intrans: If we're already in a transaction.
  *     @intrans: If we're already in a transaction.

- *     @update: If true the key exists and should be updated.

  *
  *

- *     Again we just use the hex representation of the keyid as the filename
- *     to store the key to. We flatten the public key to a list of OpenPGP
- *     packets and then use write_openpgp_stream() to write the stream out to
- *     the file. If update is true then we delete the old key first, otherwise
- *     we trust that it doesn't exist.
+ *     This function deletes a public key from whatever storage mechanism we
+ *     are using. Returns 0 if the key existed.

  */
  */

-int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
+static int db4_delete_key(uint64_t keyid, bool intrans)

 {
 {

-       struct     openpgp_packet_list *packets = NULL;
-       struct     openpgp_packet_list *list_end = NULL;
-       struct     openpgp_publickey *next = NULL;
-       int        ret = 0;
-       int        i = 0;
-       struct     buffer_ctx storebuf;
-       DBT        key;
-       DBT        data;
-       uint64_t   keyid = 0;
+       struct openpgp_publickey *publickey = NULL;
+       DBT key, data;
+       DBC *cursor = NULL;

        uint32_t   shortkeyid = 0;
        uint64_t  *subkeyids = NULL;
        uint32_t   shortkeyid = 0;
        uint64_t  *subkeyids = NULL;

-       char     **uids = NULL;
-       char      *primary = NULL;
+       int ret = 0;
+       int i;
+       char **uids = NULL;
+       char *primary = NULL;

        unsigned char worddb_data[12];
        struct ll *wordlist = NULL;
        struct ll *curword  = NULL;
        unsigned char worddb_data[12];
        struct ll *wordlist = NULL;
        struct ll *curword  = NULL;

-       bool       deadlock = false;
-
-       keyid = get_keyid(publickey);
+       bool deadlock = false;

 
        if (!intrans) {
 
        if (!intrans) {

-               starttrans();
+               db4_starttrans();

        }
 
        }
 

+       db4_fetch_key(keyid, &publickey, true);
+

        /*
        /*

-        * Delete the key if we already have it.
-        *
-        * TODO: Can we optimize this perhaps? Possibly when other data is
-        * involved as well? I suspect this is easiest and doesn't make a lot
-        * of difference though - the largest chunk of data is the keydata and
-        * it definitely needs updated.
+        * Walk through the uids removing the words from the worddb.

         */
         */

-       if (update) {
-               deadlock = (delete_key(keyid, true) == -1);
+       if (publickey != NULL) {
+               uids = keyuids(publickey, &primary);

        }
        }

+       if (uids != NULL) {
+               for (i = 0; ret == 0 && uids[i] != NULL; i++) {
+                       wordlist = makewordlist(wordlist, uids[i]);
+               }
+                               
+               ret = worddb->cursor(worddb,
+                       txn,
+                       &cursor,
+                       0);   /* flags */

 
 

-       /*
-        * Convert the key to a flat set of binary data.
-        */
-       if (!deadlock) {
-               next = publickey->next;
-               publickey->next = NULL;
-               flatten_publickey(publickey, &packets, &list_end);
-               publickey->next = next;
-
-               storebuf.offset = 0; 
-               storebuf.size = 8192;
-               storebuf.buffer = malloc(8192);
-       
-               write_openpgp_stream(buffer_putchar, &storebuf, packets);
-
-               /*
-                * Now we have the key data store it in the DB; the keyid is
-                * the key.
-                */
-               memset(&key, 0, sizeof(key));
-               memset(&data, 0, sizeof(data));
-               key.data = &keyid;
-               key.size = sizeof(keyid);
-               data.size = storebuf.offset;
-               data.data = storebuf.buffer;
-
-               ret = keydb(keyid)->put(keydb(keyid),
-                               txn,
-                               &key,
-                               &data,
-                               0); /* flags*/
-               if (ret != 0) {
-                       logthing(LOGTHING_ERROR,
-                                       "Problem storing key: %s",
-                                       db_strerror(ret));
-                       if (ret == DB_LOCK_DEADLOCK) {
-                               deadlock = true;
-                       }
-               }
-
-               free(storebuf.buffer);
-               storebuf.buffer = NULL;
-               storebuf.size = 0;
-               storebuf.offset = 0; 
-       
-               free_packet_list(packets);
-               packets = NULL;
-       }
-
-       /*
-        * Walk through our uids storing the words into the db with the keyid.
-        */
-       if (!deadlock) {
-               uids = keyuids(publickey, &primary);
-       }
-       if (uids != NULL) {
-               for (i = 0; ret == 0 && uids[i] != NULL; i++) {
-                       wordlist = makewordlist(wordlist, uids[i]);
-               }
-
-               for (curword = wordlist; curword != NULL && !deadlock;
-                               curword = curword->next) {
-                       memset(&key, 0, sizeof(key));
-                       memset(&data, 0, sizeof(data));
-                       key.data = curword->object;
-                       key.size = strlen(key.data);
-                       data.data = worddb_data;
-                       data.size = sizeof(worddb_data);
+               for (curword = wordlist; curword != NULL && !deadlock;
+                               curword = curword->next) {
+                       memset(&key, 0, sizeof(key));
+                       memset(&data, 0, sizeof(data));
+                       key.data = curword->object;
+                       key.size = strlen(key.data);
+                       data.data = worddb_data;
+                       data.size = sizeof(worddb_data);

 
                        /*
                         * Our data is the key creation time followed by the
 
                        /*
                         * Our data is the key creation time followed by the


@@ -631,20 +627,32 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                        worddb_data[ 9] = (keyid >> 16) & 0xFF;
                        worddb_data[10] = (keyid >>  8) & 0xFF;
                        worddb_data[11] = keyid & 0xFF; 
                        worddb_data[ 9] = (keyid >> 16) & 0xFF;
                        worddb_data[10] = (keyid >>  8) & 0xFF;
                        worddb_data[11] = keyid & 0xFF; 

-                       ret = worddb->put(worddb,
-                               txn,
+
+                       ret = cursor->c_get(cursor,

                                &key,
                                &data,
                                &key,
                                &data,

-                               0);
+                               DB_GET_BOTH);
+
+                       if (ret == 0) {
+                               ret = cursor->c_del(cursor, 0);
+                               if (ret != 0) {
+                                       logthing(LOGTHING_ERROR,
+                                               "Problem deleting word: %s",
+                                               db_strerror(ret));
+                               }
+                       }
+

                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,
                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,

-                                       "Problem storing word: %s",
+                                       "Problem deleting word: %s",

                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                }
                        }
                }
                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                }
                        }
                }

+               ret = cursor->c_close(cursor);
+               cursor = NULL;

 
                /*
                 * Free our UID and word lists.
 
                /*
                 * Free our UID and word lists.


@@ -656,13 +664,16 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                }
                free(uids);
                uids = NULL;
                }
                free(uids);
                uids = NULL;

+               free_publickey(publickey);
+               publickey = NULL;

        }
 
        }
 

-       /*
-        * Write the truncated 32 bit keyid so we can lookup the full id for
-        * queries.
-        */

        if (!deadlock) {
        if (!deadlock) {

+               ret = id32db->cursor(id32db,
+                       txn,
+                       &cursor,
+                       0);   /* flags */
+

                shortkeyid = keyid & 0xFFFFFFFF;
 
                memset(&key, 0, sizeof(key));
                shortkeyid = keyid & 0xFFFFFFFF;
 
                memset(&key, 0, sizeof(key));


@@ -672,22 +683,29 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                data.data = &keyid;
                data.size = sizeof(keyid);
 
                data.data = &keyid;
                data.size = sizeof(keyid);
 

-               ret = id32db->put(id32db,
-                       txn,
+               ret = cursor->c_get(cursor,

                        &key,
                        &data,
                        &key,
                        &data,

-                       0);
+                       DB_GET_BOTH);
+
+               if (ret == 0) {
+                       ret = cursor->c_del(cursor, 0);
+                       if (ret != 0) {
+                               logthing(LOGTHING_ERROR,
+                                       "Problem deleting short keyid: %s",
+                                       db_strerror(ret));
+                       }
+               }
+

                if (ret != 0) {
                        logthing(LOGTHING_ERROR,
                if (ret != 0) {
                        logthing(LOGTHING_ERROR,

-                               "Problem storing short keyid: %s",
+                               "Problem deleting short keyid: %s",

                                db_strerror(ret));
                        if (ret == DB_LOCK_DEADLOCK) {
                                deadlock = true;
                        }
                }
                                db_strerror(ret));
                        if (ret == DB_LOCK_DEADLOCK) {
                                deadlock = true;
                        }
                }

-       }

 
 

-       if (!deadlock) {

                subkeyids = keysubkeys(publickey);
                i = 0;
                while (subkeyids != NULL && subkeyids[i] != 0) {
                subkeyids = keysubkeys(publickey);
                i = 0;
                while (subkeyids != NULL && subkeyids[i] != 0) {


@@ -700,14 +718,24 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                        data.data = &keyid;
                        data.size = sizeof(keyid);
 
                        data.data = &keyid;
                        data.size = sizeof(keyid);
 

-                       ret = id32db->put(id32db,
-                               txn,
+                       ret = cursor->c_get(cursor,

                                &key,
                                &data,
                                &key,
                                &data,

-                               0);
+                               DB_GET_BOTH);
+
+                       if (ret == 0) {
+                               ret = cursor->c_del(cursor, 0);
+                               if (ret != 0) {
+                                       logthing(LOGTHING_ERROR,
+                                               "Problem deleting short"
+                                               " keyid: %s",
+                                               db_strerror(ret));
+                               }
+                       }
+

                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,
                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,

-                                       "Problem storing short keyid: %s",
+                                       "Problem deleting short keyid: %s",

                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;


@@ -718,60 +746,138 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                        free(subkeyids);
                        subkeyids = NULL;
                }
                        free(subkeyids);
                        subkeyids = NULL;
                }

+
+               ret = cursor->c_close(cursor);
+               cursor = NULL;
+       }
+
+       if (!deadlock) {
+               key.data = &keyid;
+               key.size = sizeof(keyid);
+
+               keydb(keyid)->del(keydb(keyid),
+                               txn,
+                               &key,
+                               0); /* flags */

        }
 
        if (!intrans) {
        }
 
        if (!intrans) {

-               endtrans();
+               db4_endtrans();

        }
 
        }
 

-       return deadlock ? -1 : 0 ;
+       return deadlock ? (-1) : (ret == DB_NOTFOUND);

 }
 
 /**
 }
 
 /**

- *     delete_key - Given a keyid delete the key from storage.
- *     @keyid: The keyid to delete.
+ *     store_key - Takes a key and stores it.
+ *     @publickey: A pointer to the public key to store.

  *     @intrans: If we're already in a transaction.
  *     @intrans: If we're already in a transaction.

+ *     @update: If true the key exists and should be updated.

  *
  *

- *     This function deletes a public key from whatever storage mechanism we
- *     are using. Returns 0 if the key existed.
+ *     Again we just use the hex representation of the keyid as the filename
+ *     to store the key to. We flatten the public key to a list of OpenPGP
+ *     packets and then use write_openpgp_stream() to write the stream out to
+ *     the file. If update is true then we delete the old key first, otherwise
+ *     we trust that it doesn't exist.

  */
  */

-int delete_key(uint64_t keyid, bool intrans)
+static int db4_store_key(struct openpgp_publickey *publickey, bool intrans,
+               bool update)

 {
 {

-       struct openpgp_publickey *publickey = NULL;
-       DBT key, data;
-       DBC *cursor = NULL;
+       struct     openpgp_packet_list *packets = NULL;
+       struct     openpgp_packet_list *list_end = NULL;
+       struct     openpgp_publickey *next = NULL;
+       int        ret = 0;
+       int        i = 0;
+       struct     buffer_ctx storebuf;
+       DBT        key;
+       DBT        data;
+       uint64_t   keyid = 0;

        uint32_t   shortkeyid = 0;
        uint64_t  *subkeyids = NULL;
        uint32_t   shortkeyid = 0;
        uint64_t  *subkeyids = NULL;

-       int ret = 0;
-       int i;
-       char **uids = NULL;
-       char *primary = NULL;
+       char     **uids = NULL;
+       char      *primary = NULL;

        unsigned char worddb_data[12];
        struct ll *wordlist = NULL;
        struct ll *curword  = NULL;
        unsigned char worddb_data[12];
        struct ll *wordlist = NULL;
        struct ll *curword  = NULL;

-       bool deadlock = false;
+       bool       deadlock = false;
+
+       keyid = get_keyid(publickey);

 
        if (!intrans) {
 
        if (!intrans) {

-               starttrans();
+               db4_starttrans();

        }
 
        }
 

-       fetch_key(keyid, &publickey, true);
+       /*
+        * Delete the key if we already have it.
+        *
+        * TODO: Can we optimize this perhaps? Possibly when other data is
+        * involved as well? I suspect this is easiest and doesn't make a lot
+        * of difference though - the largest chunk of data is the keydata and
+        * it definitely needs updated.
+        */
+       if (update) {
+               deadlock = (db4_delete_key(keyid, true) == -1);
+       }

 
        /*
 
        /*

-        * Walk through the uids removing the words from the worddb.
+        * Convert the key to a flat set of binary data.

         */
         */

-       if (publickey != NULL) {
+       if (!deadlock) {
+               next = publickey->next;
+               publickey->next = NULL;
+               flatten_publickey(publickey, &packets, &list_end);
+               publickey->next = next;
+
+               storebuf.offset = 0; 
+               storebuf.size = 8192;
+               storebuf.buffer = malloc(8192);
+       
+               write_openpgp_stream(buffer_putchar, &storebuf, packets);
+
+               /*
+                * Now we have the key data store it in the DB; the keyid is
+                * the key.
+                */
+               memset(&key, 0, sizeof(key));
+               memset(&data, 0, sizeof(data));
+               key.data = &keyid;
+               key.size = sizeof(keyid);
+               data.size = storebuf.offset;
+               data.data = storebuf.buffer;
+
+               ret = keydb(keyid)->put(keydb(keyid),
+                               txn,
+                               &key,
+                               &data,
+                               0); /* flags*/
+               if (ret != 0) {
+                       logthing(LOGTHING_ERROR,
+                                       "Problem storing key: %s",
+                                       db_strerror(ret));
+                       if (ret == DB_LOCK_DEADLOCK) {
+                               deadlock = true;
+                       }
+               }
+
+               free(storebuf.buffer);
+               storebuf.buffer = NULL;
+               storebuf.size = 0;
+               storebuf.offset = 0; 
+       
+               free_packet_list(packets);
+               packets = NULL;
+       }
+
+       /*
+        * Walk through our uids storing the words into the db with the keyid.
+        */
+       if (!deadlock) {

                uids = keyuids(publickey, &primary);
        }
        if (uids != NULL) {
                for (i = 0; ret == 0 && uids[i] != NULL; i++) {
                        wordlist = makewordlist(wordlist, uids[i]);
                }
                uids = keyuids(publickey, &primary);
        }
        if (uids != NULL) {
                for (i = 0; ret == 0 && uids[i] != NULL; i++) {
                        wordlist = makewordlist(wordlist, uids[i]);
                }

-                               
-               ret = worddb->cursor(worddb,
-                       txn,
-                       &cursor,
-                       0);   /* flags */

 
                for (curword = wordlist; curword != NULL && !deadlock;
                                curword = curword->next) {
 
                for (curword = wordlist; curword != NULL && !deadlock;
                                curword = curword->next) {


@@ -798,32 +904,20 @@ int delete_key(uint64_t keyid, bool intrans)
                        worddb_data[ 9] = (keyid >> 16) & 0xFF;
                        worddb_data[10] = (keyid >>  8) & 0xFF;
                        worddb_data[11] = keyid & 0xFF; 
                        worddb_data[ 9] = (keyid >> 16) & 0xFF;
                        worddb_data[10] = (keyid >>  8) & 0xFF;
                        worddb_data[11] = keyid & 0xFF; 

-
-                       ret = cursor->c_get(cursor,
+                       ret = worddb->put(worddb,
+                               txn,

                                &key,
                                &data,
                                &key,
                                &data,

-                               DB_GET_BOTH);
-
-                       if (ret == 0) {
-                               ret = cursor->c_del(cursor, 0);
-                               if (ret != 0) {
-                                       logthing(LOGTHING_ERROR,
-                                               "Problem deleting word: %s",
-                                               db_strerror(ret));
-                               }
-                       }
-
+                               0);

                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,
                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,

-                                       "Problem deleting word: %s",
+                                       "Problem storing word: %s",

                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                }
                        }
                }
                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                }
                        }
                }

-               ret = cursor->c_close(cursor);
-               cursor = NULL;

 
                /*
                 * Free our UID and word lists.
 
                /*
                 * Free our UID and word lists.


@@ -835,16 +929,13 @@ int delete_key(uint64_t keyid, bool intrans)
                }
                free(uids);
                uids = NULL;
                }
                free(uids);
                uids = NULL;

-               free_publickey(publickey);
-               publickey = NULL;

        }
 
        }
 

+       /*
+        * Write the truncated 32 bit keyid so we can lookup the full id for
+        * queries.
+        */

        if (!deadlock) {
        if (!deadlock) {

-               ret = id32db->cursor(id32db,
-                       txn,
-                       &cursor,
-                       0);   /* flags */
-

                shortkeyid = keyid & 0xFFFFFFFF;
 
                memset(&key, 0, sizeof(key));
                shortkeyid = keyid & 0xFFFFFFFF;
 
                memset(&key, 0, sizeof(key));


@@ -854,29 +945,22 @@ int delete_key(uint64_t keyid, bool intrans)
                data.data = &keyid;
                data.size = sizeof(keyid);
 
                data.data = &keyid;
                data.size = sizeof(keyid);
 

-               ret = cursor->c_get(cursor,
+               ret = id32db->put(id32db,
+                       txn,

                        &key,
                        &data,
                        &key,
                        &data,

-                       DB_GET_BOTH);
-
-               if (ret == 0) {
-                       ret = cursor->c_del(cursor, 0);
-                       if (ret != 0) {
-                               logthing(LOGTHING_ERROR,
-                                       "Problem deleting short keyid: %s",
-                                       db_strerror(ret));
-                       }
-               }
-
+                       0);

                if (ret != 0) {
                        logthing(LOGTHING_ERROR,
                if (ret != 0) {
                        logthing(LOGTHING_ERROR,

-                               "Problem deleting short keyid: %s",
+                               "Problem storing short keyid: %s",

                                db_strerror(ret));
                        if (ret == DB_LOCK_DEADLOCK) {
                                deadlock = true;
                        }
                }
                                db_strerror(ret));
                        if (ret == DB_LOCK_DEADLOCK) {
                                deadlock = true;
                        }
                }

+       }

 
 

+       if (!deadlock) {

                subkeyids = keysubkeys(publickey);
                i = 0;
                while (subkeyids != NULL && subkeyids[i] != 0) {
                subkeyids = keysubkeys(publickey);
                i = 0;
                while (subkeyids != NULL && subkeyids[i] != 0) {


@@ -889,24 +973,14 @@ int delete_key(uint64_t keyid, bool intrans)
                        data.data = &keyid;
                        data.size = sizeof(keyid);
 
                        data.data = &keyid;
                        data.size = sizeof(keyid);
 

-                       ret = cursor->c_get(cursor,
+                       ret = id32db->put(id32db,
+                               txn,

                                &key,
                                &data,
                                &key,
                                &data,

-                               DB_GET_BOTH);
-
-                       if (ret == 0) {
-                               ret = cursor->c_del(cursor, 0);
-                               if (ret != 0) {
-                                       logthing(LOGTHING_ERROR,
-                                               "Problem deleting short"
-                                               " keyid: %s",
-                                               db_strerror(ret));
-                               }
-                       }
-
+                               0);

                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,
                        if (ret != 0) {
                                logthing(LOGTHING_ERROR,

-                                       "Problem deleting short keyid: %s",
+                                       "Problem storing short keyid: %s",

                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;
                                        db_strerror(ret));
                                if (ret == DB_LOCK_DEADLOCK) {
                                        deadlock = true;


@@ -917,85 +991,13 @@ int delete_key(uint64_t keyid, bool intrans)
                        free(subkeyids);
                        subkeyids = NULL;
                }
                        free(subkeyids);
                        subkeyids = NULL;
                }

-
-               ret = cursor->c_close(cursor);
-               cursor = NULL;
-       }
-
-       if (!deadlock) {
-               key.data = &keyid;
-               key.size = sizeof(keyid);
-
-               keydb(keyid)->del(keydb(keyid),
-                               txn,
-                               &key,
-                               0); /* flags */

        }
 
        if (!intrans) {
        }
 
        if (!intrans) {

-               endtrans();
+               db4_endtrans();

        }
 
        }
 

-       return deadlock ? (-1) : (ret == DB_NOTFOUND);
-}
-
-/**
- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
- *
- *     Dumps the database into one or more files, which contain pure OpenPGP
- *     that can be reimported into onak or gpg. filenamebase provides a base
- *     file name for the dump; several files may be created, all of which will
- *     begin with this string and then have a unique number and a .pgp
- *     extension.
- */
-int dumpdb(char *filenamebase)
-{
-       DBT   key, data;
-       DBC  *cursor = NULL;
-       int   ret = 0;
-       int   fd = -1;
-       int   i = 0;
-       char  filename[1024];
-
-       filename[1023] = 0;
-       for (i = 0; i < numdbs; i++) {
-               ret = dbconns[i]->cursor(dbconns[i],
-                       NULL,
-                       &cursor,
-                       0);   /* flags */
-
-               snprintf(filename, 1023, "%s.%d.pgp", filenamebase, i);
-               fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
-               if (fd == -1) {
-                       logthing(LOGTHING_ERROR,
-                               "Error opening keydump file (%s): %s",
-                               filename,
-                               strerror(errno));
-               } else {
-                       memset(&key, 0, sizeof(key));
-                       memset(&data, 0, sizeof(data));
-                       ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
-                       while (ret == 0) {
-                               write(fd, data.data, data.size);
-                               memset(&key, 0, sizeof(key));
-                               memset(&data, 0, sizeof(data));
-                               ret = cursor->c_get(cursor, &key, &data,
-                                               DB_NEXT);
-                       }
-                       if (ret != DB_NOTFOUND) {
-                               logthing(LOGTHING_ERROR,
-                                       "Problem reading key: %s",
-                                       db_strerror(ret));
-                       }
-                       close(fd);
-               }
-
-               ret = cursor->c_close(cursor);
-               cursor = NULL;
-       }
-       
-       return 0;
+       return deadlock ? -1 : 0 ;

 }
 
 /**
 }
 
 /**


@@ -1009,8 +1011,8 @@ int dumpdb(char *filenamebase)
  *
  *     Returns the number of keys we iterated over.
  */
  *
  *     Returns the number of keys we iterated over.
  */

-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
-               void *ctx)
+static int db4_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)

 {
        DBT                         dbkey, data;
        DBC                        *cursor = NULL;
 {
        DBT                         dbkey, data;
        DBC                        *cursor = NULL;


@@ -1064,55 +1066,6 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
        return numkeys;
 }
 
        return numkeys;
 }
 

-/**
- *     getfullkeyid - Maps a 32bit key id to a 64bit one.
- *     @keyid: The 32bit keyid.
- *
- *     This function maps a 32bit key id to the full 64bit one. It returns the
- *     full keyid. If the key isn't found a keyid of 0 is returned.
- */
-uint64_t getfullkeyid(uint64_t keyid)
-{
-       DBT       key, data;
-       DBC      *cursor = NULL;
-       uint32_t  shortkeyid = 0;
-       int       ret = 0;
-
-       if (keyid < 0x100000000LL) {
-               ret = id32db->cursor(id32db,
-                               txn,
-                               &cursor,
-                               0);   /* flags */
-
-               shortkeyid = keyid & 0xFFFFFFFF;
-
-               memset(&key, 0, sizeof(key));
-               memset(&data, 0, sizeof(data));
-               key.data = &shortkeyid;
-               key.size = sizeof(shortkeyid);
-               data.flags = DB_DBT_MALLOC;
-
-               ret = cursor->c_get(cursor,
-                       &key,
-                       &data,
-                       DB_SET);
-
-               if (ret == 0) {
-                       keyid = *(uint64_t *) data.data;
-
-                       if (data.data != NULL) {
-                               free(data.data);
-                               data.data = NULL;
-                       }
-               }
-
-               ret = cursor->c_close(cursor);
-               cursor = NULL;
-       }
-       
-       return keyid;
-}
-

 /*
  * Include the basic keydb routines.
  */
 /*
  * Include the basic keydb routines.
  */


@@ -1120,3 +1073,20 @@ uint64_t getfullkeyid(uint64_t keyid)
 #define NEED_KEYID2UID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"
 #define NEED_KEYID2UID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"

+
+struct dbfuncs keydb_db4_funcs = {
+       .initdb                 = db4_initdb,
+       .cleanupdb              = db4_cleanupdb,
+       .starttrans             = db4_starttrans,
+       .endtrans               = db4_endtrans,
+       .fetch_key              = db4_fetch_key,
+       .fetch_key_text         = db4_fetch_key_text,
+       .store_key              = db4_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = db4_delete_key,
+       .getkeysigs             = generic_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = generic_keyid2uid,
+       .getfullkeyid           = db4_getfullkeyid,
+       .iterate_keys           = db4_iterate_keys,
+};