Update version to indicate arch build.

[onak.git] / keydb_fs.c

diff --git a/keydb_fs.c b/keydb_fs.c
index 08aff83f4f2515024950d3388f587ab8f78ceca9..33fe51ad1c265e923bf8889b11910327c2287914 100644 (file)
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -19,6 +19,7 @@
 #include <dirent.h>
 
 #include "charfuncs.h"
 #include <dirent.h>
 
 #include "charfuncs.h"

+#include "decodekey.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"


@@ -106,6 +107,25 @@ void worddir(char *buffer, char *word, uint32_t hash)
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 

+void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+{
+       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+                config.db_dir,
+                (uint8_t) ((subkey >> 24) & 0xFF),
+                (uint8_t) ((subkey >> 16) & 0xFF),
+                (uint32_t) (subkey & 0xFFFFFFFF),
+                keyid);
+}
+
+void subkeydir(char *buffer, uint64_t subkey)
+{
+       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
+                config.db_dir,
+                (uint8_t) ((subkey >> 24) & 0xFF),
+                (uint8_t) ((subkey >> 16) & 0xFF),
+                (uint32_t) (subkey & 0xFFFFFFFF));
+}
+

 /*****************************************************************************/
 
 /**
 /*****************************************************************************/
 
 /**


@@ -240,6 +260,8 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
        struct openpgp_publickey *next = NULL;
        uint64_t keyid = get_keyid(publickey);
        struct ll *wordlist = NULL, *wl = NULL;
        struct openpgp_publickey *next = NULL;
        uint64_t keyid = get_keyid(publickey);
        struct ll *wordlist = NULL, *wl = NULL;

+       uint64_t *subkeyids = NULL;
+       int i = 0;

 
 
        if (!intrans)
 
 
        if (!intrans)


@@ -276,8 +298,24 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
 
                        wl = wl->next;
                }
 
                        wl = wl->next;
                }

-

                llfree(wordlist, free);
                llfree(wordlist, free);

+               
+               subkeyids = keysubkeys(publickey);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeydir(wbuffer, subkeyids[i]);
+                       mkdir(wbuffer, 0777);
+                       subkeypath(wbuffer, subkeyids[i], keyid);
+                       link(buffer, wbuffer);
+
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }

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


@@ -296,6 +334,8 @@ int delete_key(uint64_t keyid, bool intrans)
        int ret;
        struct openpgp_publickey *pk = NULL;
        struct ll *wordlist = NULL, *wl = NULL;
        int ret;
        struct openpgp_publickey *pk = NULL;
        struct ll *wordlist = NULL, *wl = NULL;

+       uint64_t *subkeyids = NULL;
+       int i = 0;

 
        if ((keyid >> 32) == 0)
                keyid = getfullkeyid(keyid);
 
        if ((keyid >> 32) == 0)
                keyid = getfullkeyid(keyid);


@@ -306,10 +346,10 @@ int delete_key(uint64_t keyid, bool intrans)
        ret = fetch_key(keyid, &pk, true);
 
        if (ret) {
        ret = fetch_key(keyid, &pk, true);
 
        if (ret) {

-               logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+               logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",

                         keyid);
                wl = wordlist = makewordlistfromkey(wordlist, pk);
                         keyid);
                wl = wordlist = makewordlistfromkey(wordlist, pk);

-               logthing(LOGTHING_CRITICAL,
+               logthing(LOGTHING_DEBUG,

                         "Wordlist for key %016llX done", keyid);
                while (wl) {
                        uint32_t hash = calchash((uint8_t *) (wl->object));
                         "Wordlist for key %016llX done", keyid);
                while (wl) {
                        uint32_t hash = calchash((uint8_t *) (wl->object));


@@ -320,6 +360,22 @@ int delete_key(uint64_t keyid, bool intrans)
 
                        wl = wl->next;
                }
 
                        wl = wl->next;
                }

+
+               subkeyids = keysubkeys(pk);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeypath(buffer, subkeyids[i], keyid);
+                       unlink(buffer);
+
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }
+

        }
 
        keypath(buffer, keyid);
        }
 
        keypath(buffer, keyid);


@@ -340,16 +396,18 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 
        worddir(buffer, word, hash);
        d = opendir(buffer);
 
        worddir(buffer, word, hash);
        d = opendir(buffer);

-       logthing(LOGTHING_CRITICAL, "Scanning for word %s in dir %s", word,
+       logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,

                 buffer);
        if (d)
                do {
                        de = readdir(d);
                        if (de && de->d_name[0] != '.') {
                                if ((!mct)
                 buffer);
        if (d)
                do {
                        de = readdir(d);
                        if (de && de->d_name[0] != '.') {
                                if ((!mct)

-                                   || (llfind(mct, de->d_name, strcmp) !=
+                                   || (llfind(mct, de->d_name,
+                                       (int (*)(const void *, const void *))
+                                                   strcmp) !=

                                        NULL)) {
                                        NULL)) {

-                                       logthing(LOGTHING_CRITICAL,
+                                       logthing(LOGTHING_DEBUG,

                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =
                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =


@@ -376,7 +434,7 @@ int fetch_key_text(const char *search,
        char      *searchtext = NULL;
        int addedkeys = 0;
 
        char      *searchtext = NULL;
        int addedkeys = 0;
 

-       logthing(LOGTHING_CRITICAL, "Search was '%s'", search);
+       logthing(LOGTHING_DEBUG, "Search was '%s'", search);

 
        searchtext = strdup(search);
        wl = wordlist = makewordlist(wordlist, searchtext);
 
        searchtext = strdup(search);
        wl = wordlist = makewordlist(wordlist, searchtext);


@@ -411,7 +469,7 @@ int fetch_key_text(const char *search,
        /* Now add the keys... */
        wl = keylist;
        while (wl) {
        /* Now add the keys... */
        wl = keylist;
        while (wl) {

-               logthing(LOGTHING_CRITICAL, "Adding key: %s", wl->object);
+               logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);

                addedkeys +=
                    fetch_key(strtoull(wl->object, NULL, 16), publickey,
                              false);
                addedkeys +=
                    fetch_key(strtoull(wl->object, NULL, 16), publickey,
                              false);


@@ -439,21 +497,38 @@ int dumpdb(char *filenamebase)
 uint64_t getfullkeyid(uint64_t keyid)
 {
        static char buffer[PATH_MAX];
 uint64_t getfullkeyid(uint64_t keyid)
 {
        static char buffer[PATH_MAX];

-       DIR *d;
-       struct dirent *de;
+       DIR *d = NULL;
+       struct dirent *de = NULL;

        uint64_t ret = 0;
 
        keydir(buffer, keyid);
 
        d = opendir(buffer);
        uint64_t ret = 0;
 
        keydir(buffer, keyid);
 
        d = opendir(buffer);

-       do {
-               de = readdir(d);
-               if (de)
+       if (d) {
+               do {
+                       de = readdir(d);

                        if (de && de->d_name[0] != '.') {
                                ret = strtoull(de->d_name, NULL, 16);
                        }
                        if (de && de->d_name[0] != '.') {
                                ret = strtoull(de->d_name, NULL, 16);
                        }

-       } while (de && de->d_name[0] == '.');
-       closedir(d);
+               } while (de && de->d_name[0] == '.');
+               closedir(d);    
+       }
+
+       if (ret == 0) {
+               subkeydir(buffer, keyid);
+
+               d = opendir(buffer);
+               if (d) {
+                       do {
+                               de = readdir(d);
+                               if (de && de->d_name[0] != '.') {
+                                       ret = strtoull(de->d_name, NULL, 16);
+                               }
+                       } while (de && de->d_name[0] == '.');
+                       closedir(d);
+               }
+       }
+       

        return ret;
 }
 
        return ret;
 }