}
-void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, uint64_t _keyid)
{
uint64_t keyid = _keyid << 32;
- snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
+ snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016" PRIX64,
config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
(uint8_t) ((keyid >> 48) & 0xFF),
(uint32_t) (keyid >> 32), _keyid);
}
-void keydir(char *buffer, uint64_t _keyid)
+static void keydir(char *buffer, uint64_t _keyid)
{
uint64_t keyid = _keyid << 32;
snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir,
(uint32_t) (keyid >> 32));
}
-void prove_path_to(uint64_t keyid, char *what)
+static void prove_path_to(uint64_t keyid, char *what)
{
static char buffer[1024];
snprintf(buffer, PATH_MAX, "%s/%s", config.db_dir, what);
mkdir(buffer, 0777);
}
-void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
+static void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
{
- snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
+ snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016" PRIX64,
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)
+static void worddir(char *buffer, char *word, uint32_t hash)
{
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)
+static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
{
- snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+ snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
config.db_dir,
(uint8_t) ((subkey >> 24) & 0xFF),
(uint8_t) ((subkey >> 16) & 0xFF),
keyid);
}
-void subkeydir(char *buffer, uint64_t subkey)
+static void subkeydir(char *buffer, uint64_t subkey)
{
snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
config.db_dir,
/**
* initdb - Initialize the key database.
*/
-void initdb(bool readonly)
+static void fs_initdb(bool readonly)
{
char buffer[PATH_MAX];
/**
* cleanupdb - De-initialize the key database.
*/
-void cleanupdb(void)
+static void fs_cleanupdb(void)
{
/* Mmmm nothing to do here? */
close(keydb_lockfile_fd);
/**
* starttrans - Start a transaction.
*/
-bool starttrans(void)
+static bool fs_starttrans(void)
{
struct flock lockstruct;
int remaining = 20;
/**
* endtrans - End a transaction.
*/
-void endtrans(void)
+static void fs_endtrans(void)
{
struct flock lockstruct;
fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
}
+static uint64_t fs_getfullkeyid(uint64_t keyid)
+{
+ static char buffer[PATH_MAX];
+ DIR *d = NULL;
+ struct dirent *de = NULL;
+ uint64_t ret = 0;
+
+ keydir(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);
+ }
+
+ 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;
+}
+
/**
* fetch_key - Given a keyid fetch the key from storage.
* @keyid: The keyid to fetch.
* @publickey: A pointer to a structure to return the key in.
* @intrans: If we're already in a transaction.
*/
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
bool intrans)
{
static char buffer[PATH_MAX];
struct openpgp_packet_list *packets = NULL;
if (!intrans)
- starttrans();
+ fs_starttrans();
if ((keyid >> 32) == 0)
- keyid = getfullkeyid(keyid);
+ keyid = fs_getfullkeyid(keyid);
keypath(buffer, keyid);
if ((fd = open(buffer, O_RDONLY)) != -1) {
}
if (!intrans)
- endtrans();
+ fs_endtrans();
return ret;
}
* @intrans: If we're already in a transaction.
* @update: If true the key exists and should be updated.
*/
-int store_key(struct openpgp_publickey *publickey, bool intrans,
+static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
bool update)
{
static char buffer[PATH_MAX];
if (!intrans)
- starttrans();
+ fs_starttrans();
prove_path_to(keyid, "key");
keypath(buffer, keyid);
}
if (!intrans)
- endtrans();
+ fs_endtrans();
return ret;
}
* @keyid: The keyid to delete.
* @intrans: If we're already in a transaction.
*/
-int delete_key(uint64_t keyid, bool intrans)
+static int fs_delete_key(uint64_t keyid, bool intrans)
{
static char buffer[PATH_MAX];
int ret;
int i = 0;
if ((keyid >> 32) == 0)
- keyid = getfullkeyid(keyid);
+ keyid = fs_getfullkeyid(keyid);
if (!intrans)
- starttrans();
+ fs_starttrans();
- ret = fetch_key(keyid, &pk, true);
+ ret = fs_fetch_key(keyid, &pk, true);
if (ret) {
- logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
+ logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,
keyid);
wl = wordlist = makewordlistfromkey(wordlist, pk);
logthing(LOGTHING_DEBUG,
- "Wordlist for key %016llX done", keyid);
+ "Wordlist for key %016" PRIX64 " done", keyid);
while (wl) {
uint32_t hash = calchash((uint8_t *) (wl->object));
prove_path_to(hash, "words");
unlink(buffer);
if (!intrans)
- endtrans();
+ fs_endtrans();
return 1;
}
* @search: The text to search for.
* @publickey: A pointer to a structure to return the key in.
*/
-int fetch_key_text(const char *search,
+static int fs_fetch_key_text(const char *search,
struct openpgp_publickey **publickey)
{
struct ll *wordlist = NULL, *wl = NULL;
while (wl) {
logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
addedkeys +=
- fetch_key(strtoull(wl->object, NULL, 16), publickey,
+ fs_fetch_key(strtoull(wl->object, NULL, 16), publickey,
false);
if (addedkeys >= config.maxkeys)
break;
return addedkeys;
}
-uint64_t getfullkeyid(uint64_t keyid)
-{
- static char buffer[PATH_MAX];
- DIR *d = NULL;
- struct dirent *de = NULL;
- uint64_t ret = 0;
-
- keydir(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);
- }
-
- 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;
-}
-
/**
* iterate_keys - call a function once for each key in the db.
* @iterfunc: The function to call.
*
* Returns the number of keys we iterated over.
*/
-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
- void *ctx)
+static int fs_iterate_keys(void (*iterfunc)(void *ctx,
+ struct openpgp_publickey *key), void *ctx)
{
return 0;
}
#define NEED_GETKEYSIGS 1
#define NEED_UPDATEKEYS 1
#include "keydb.c"
+
+struct dbfuncs keydb_fs_funcs = {
+ .initdb = fs_initdb,
+ .cleanupdb = fs_cleanupdb,
+ .starttrans = fs_starttrans,
+ .endtrans = fs_endtrans,
+ .fetch_key = fs_fetch_key,
+ .fetch_key_text = fs_fetch_key_text,
+ .store_key = fs_store_key,
+ .update_keys = generic_update_keys,
+ .delete_key = fs_delete_key,
+ .getkeysigs = generic_getkeysigs,
+ .cached_getkeysigs = generic_cached_getkeysigs,
+ .keyid2uid = generic_keyid2uid,
+ .getfullkeyid = fs_getfullkeyid,
+ .iterate_keys = fs_iterate_keys,
+};
projects / onak.git / blobdiff