X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/b8790eaafd4ed0be8ab280581dedd3ff81ba752b..0211c730256c9bbaf10a569c88f7df0ef882311e:/keydb_dynamic.c

diff --git a/keydb_dynamic.c b/keydb_dynamic.c
index ba7792f..ae2b805 100644
--- a/keydb_dynamic.c
+++ b/keydb_dynamic.c
@@ -19,11 +19,11 @@
 #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 +110,6 @@ static bool load_backend(void)
 
 static bool dynamic_starttrans()
 {
-	struct dynamic_backend *backend;
-
 	if (loaded_backend == NULL) {
 		load_backend();
 	}
@@ -127,8 +125,6 @@ static bool dynamic_starttrans()
 
 static void dynamic_endtrans()
 {
-	struct dynamic_backend *backend;
-
 	if (loaded_backend == NULL) {
 		load_backend();
 	}
@@ -143,8 +139,6 @@ static void dynamic_endtrans()
 static int dynamic_fetch_key(uint64_t keyid,
 		struct openpgp_publickey **publickey, bool intrans)
 {
-	struct dynamic_backend *backend;
-
 	if (loaded_backend == NULL) {
 		load_backend();
 	}
@@ -161,8 +155,6 @@ static int dynamic_fetch_key(uint64_t keyid,
 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 +170,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 +186,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 +199,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 +242,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();
 	}
@@ -254,7 +256,7 @@ static char *dynamic_keyid2uid(uint64_t keyid)
 	if (dynamic_fetch_key(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 +288,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();
 	}
@@ -326,8 +327,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 +368,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();
 	}
@@ -411,7 +409,6 @@ 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;
 	
@@ -479,8 +476,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 +489,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();
@@ -512,6 +505,7 @@ struct dbfuncs keydb_dynamic_funcs = {
 	.endtrans		= dynamic_endtrans,
 	.fetch_key		= dynamic_fetch_key,
 	.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,