X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.h;h=7297a7664b39fe53ceccefb23c791951acfb586a;hb=6565bed3065d1751abf469da1a85884d9ddde759;hp=d7515c8f7881452b259b6ae8e6ecf30bb1a6149a;hpb=2458360e75aa46091f60c16e041c07bffe2edefb;p=onak.git

diff --git a/keydb.h b/keydb.h
index d7515c8..7297a76 100644
--- a/keydb.h
+++ b/keydb.h
@@ -14,15 +14,16 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __KEYDB_H__
 #define __KEYDB_H__
 
+#include <stdbool.h>
 #include <inttypes.h>
 
+#include "keyarray.h"
 #include "keystructs.h"
 #include "ll.h"
 
@@ -104,13 +105,14 @@ struct onak_dbctx {
 
 /**
  * @brief Given a keyid delete the key from storage.
- * @param keyid The keyid to delete.
+ * @param fp The fingerprint of the key to delete.
  * @param intrans If we're already in a transaction.
  *
  * This function deletes a public key from whatever storage mechanism we
  * are using. Returns 0 if the key existed.
  */
-	int (*delete_key)(struct onak_dbctx *, uint64_t keyid, bool intrans);
+	int (*delete_key)(struct onak_dbctx *, struct openpgp_fingerprint *fp,
+			bool intrans);
 
 /**
  * @brief Trys to find the keys that contain the supplied text.
@@ -138,6 +140,8 @@ struct onak_dbctx {
 /**
  * @brief Takes a list of public keys and updates them in the DB.
  * @param keys The keys to update in the DB.
+ * @param blacklist A keyarray of fingerprints that shouldn't be added.
+ * @updateonly: Only update existing keys, don't add new ones.
  * @param sendsync If we should send a keysync mail.
  *
  * Takes a list of keys and adds them to the database, merging them with
@@ -150,7 +154,10 @@ struct onak_dbctx {
  * with the update.
  */
 	int (*update_keys)(struct onak_dbctx *,
-			struct openpgp_publickey **keys, bool sendsync);
+			struct openpgp_publickey **keys,
+			struct keyarray *blacklist,
+			bool updateonly,
+			bool sendsync);
 
 /**
  * @brief Takes a keyid and returns the primary UID for it.
@@ -183,15 +190,6 @@ struct onak_dbctx {
 	struct ll * (*cached_getkeysigs)(struct onak_dbctx *,
 			uint64_t keyid);
 
-/**
- * @brief Maps a 32 bit key id to a 64 bit one.
- * @param keyid The 32 bit keyid.
- *
- * This function maps a 32 bit key id to the full 64 bit one. It returns the
- * full keyid. If the key isn't found a keyid of 0 is returned.
- */
-	uint64_t (*getfullkeyid)(struct onak_dbctx *, uint64_t keyid);
-
 /**
  * @brief call a function once for each key in the db.
  * @param iterfunc The function to call.