X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/b7a5a70eb8d8f312325af828b47726977f4fbb79..2796e65c80aa5b1c1787e161fbb2cc8ac57b0fb0:/keydb_fs.c?ds=sidebyside diff --git a/keydb_fs.c b/keydb_fs.c index 7e739d8..33fe51a 100644 --- a/keydb_fs.c +++ b/keydb_fs.c @@ -4,8 +4,6 @@ * Daniel Silverstone * * Copyright 2004 Daniel Silverstone and Project Purple - * - * $Id: keydb_fs.c,v 1.1 2004/05/27 03:37:58 noodles Exp $ */ #include @@ -21,6 +19,7 @@ #include #include "charfuncs.h" +#include "decodekey.h" #include "keydb.h" #include "keyid.h" #include "keystructs.h" @@ -45,7 +44,7 @@ static uint32_t calchash(uint8_t * ptr) { register uint32_t h = FNV_offset_basis; register uint32_t p = FNV_mixing_prime; - register uint32_t n = strlen(ptr); + register uint32_t n = strlen((char *) ptr); register uint8_t *c = ptr; while (n--) { h *= p; @@ -58,7 +57,7 @@ static uint32_t calchash(uint8_t * ptr) void keypath(char *buffer, uint64_t _keyid) { uint64_t keyid = _keyid << 32; - snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08lX/%016llX", + snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX", config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF), (uint8_t) ((keyid >> 48) & 0xFF), (uint32_t) (keyid >> 32), _keyid); @@ -67,7 +66,7 @@ void keypath(char *buffer, uint64_t _keyid) void keydir(char *buffer, uint64_t _keyid) { uint64_t keyid = _keyid << 32; - snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08lX", config.db_dir, + snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF), (uint8_t) ((keyid >> 48) & 0xFF), (uint32_t) (keyid >> 32)); @@ -88,7 +87,7 @@ void prove_path_to(uint64_t keyid, char *what) (uint8_t) ((keyid >> 16) & 0xFF)); mkdir(buffer, 0777); - snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08lX", config.db_dir, what, + snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08X", config.db_dir, what, (uint8_t) ((keyid >> 24) & 0xFF), (uint8_t) ((keyid >> 16) & 0xFF), (uint32_t) (keyid)); mkdir(buffer, 0777); @@ -96,18 +95,37 @@ void prove_path_to(uint64_t keyid, char *what) void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid) { - snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08lX/%s/%016llX", + snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX", config.db_dir, (uint8_t) ((hash >> 24) & 0xFF), (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid); } void worddir(char *buffer, char *word, uint32_t hash) { - snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08lX/%s", config.db_dir, + snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir, (uint8_t) ((hash >> 24) & 0xFF), (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)); +} + /*****************************************************************************/ /** @@ -242,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; + uint64_t *subkeyids = NULL; + int i = 0; if (!intrans) @@ -278,10 +298,24 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, wl = wl->next; } + 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); - - - llfree(wordlist, NULL); + i++; + } + if (subkeyids != NULL) { + free(subkeyids); + subkeyids = NULL; + } } if (!intrans) @@ -300,6 +334,8 @@ int delete_key(uint64_t keyid, bool intrans) 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); @@ -310,10 +346,10 @@ int delete_key(uint64_t keyid, bool intrans) 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); - logthing(LOGTHING_CRITICAL, + logthing(LOGTHING_DEBUG, "Wordlist for key %016llX done", keyid); while (wl) { uint32_t hash = calchash((uint8_t *) (wl->object)); @@ -324,6 +360,22 @@ int delete_key(uint64_t keyid, bool intrans) 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); @@ -344,16 +396,18 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct) 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) - || (llfind(mct, de->d_name, strcmp) != + || (llfind(mct, de->d_name, + (int (*)(const void *, const void *)) + strcmp) != NULL)) { - logthing(LOGTHING_CRITICAL, + logthing(LOGTHING_DEBUG, "Found %s // %s", word, de->d_name); keys = @@ -377,16 +431,20 @@ int fetch_key_text(const char *search, { struct ll *wordlist = NULL, *wl = NULL; struct ll *keylist = NULL; + char *searchtext = NULL; int addedkeys = 0; - logthing(LOGTHING_CRITICAL, "Search was '%s'", search); + logthing(LOGTHING_DEBUG, "Search was '%s'", search); - wl = wordlist = makewordlist(wordlist, search); + searchtext = strdup(search); + wl = wordlist = makewordlist(wordlist, searchtext); keylist = internal_get_key_by_word(wordlist->object, NULL); if (!keylist) { llfree(wordlist, NULL); + free(searchtext); + searchtext = NULL; return 0; } @@ -397,6 +455,8 @@ int fetch_key_text(const char *search, if (!nkl) { llfree(wordlist, NULL); llfree(keylist, free); + free(searchtext); + searchtext = NULL; return 0; } llfree(keylist, free); @@ -409,7 +469,7 @@ int fetch_key_text(const char *search, /* 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); @@ -419,6 +479,8 @@ int fetch_key_text(const char *search, } llfree(keylist, free); + free(searchtext); + searchtext = NULL; return addedkeys; } @@ -435,21 +497,38 @@ int dumpdb(char *filenamebase) 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); - 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); } - } 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; }