X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_keyring.c;h=0f24366d05864106527d1721010bb1da68b49db5;hb=3886942162fd8193d8a804a685a3f96a65b9712c;hp=e8c056b7ccdf19f1cc4c1eec7e0cef8cfeac531c;hpb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;p=onak.git

diff --git a/keydb_keyring.c b/keydb_keyring.c
index e8c056b..0f24366 100644
--- a/keydb_keyring.c
+++ b/keydb_keyring.c
@@ -85,7 +85,7 @@ static int keyring_fetch_key(struct onak_keyring_dbctx *privctx,
 	if (index > privctx->count)
 		return 0;
 
-	buf.buffer = privctx->keys[index].start;
+	buf.buffer = (char *) privctx->keys[index].start;
 	buf.size = privctx->keys[index].len;
 	buf.offset = 0;
 
@@ -222,7 +222,9 @@ static int keyring_iterate_keys(struct onak_dbctx *dbctx,
 }
 
 static int keyring_update_keys(struct onak_dbctx *dbctx,
-                struct openpgp_publickey **keys, bool sendsync)
+		struct openpgp_publickey **keys,
+		struct keyarray *blacklist,
+		bool sendsync)
 {
 	return 0;
 }
@@ -232,8 +234,6 @@ static int keyring_update_keys(struct onak_dbctx *dbctx,
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
-#define NEED_GETFULLKEYID 1
-#define NEED_GET_FP 1
 #include "keydb.c"
 
 static int keyring_parse_keys(struct onak_keyring_dbctx *privctx)
@@ -265,7 +265,7 @@ static int keyring_parse_keys(struct onak_keyring_dbctx *privctx)
 				len += privctx->file[pos + 2];
 				len += 192;
 				len += 1; /* Header */
-			} else if (len > 223 & len < 255) {
+			} else if (len > 223 && len < 255) {
 				// Unsupported
 			} else if (len == 255) {
 				len = privctx->file[pos + 2];
@@ -448,7 +448,6 @@ struct onak_dbctx *keydb_keyring_init(struct onak_db_config *dbcfg,
 	dbctx->getkeysigs		= generic_getkeysigs;
 	dbctx->cached_getkeysigs	= generic_cached_getkeysigs;
 	dbctx->keyid2uid		= generic_keyid2uid;
-	dbctx->getfullkeyid		= generic_getfullkeyid;
 	dbctx->iterate_keys		= keyring_iterate_keys;
 
 	return dbctx;