X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.h;h=5dcb4364860e10967eb31709fb808e0a94c494d7;hb=2b28bb7cc65dc9594092dff860fd89bd14dd8b27;hp=50f969a303831c5f8cbc27c77d5eb0568f40f29a;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git

diff --git a/keydb.h b/keydb.h
index 50f969a..5dcb436 100644
--- a/keydb.h
+++ b/keydb.h
@@ -14,13 +14,13 @@
  * 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 "keystructs.h"
@@ -81,8 +81,7 @@ struct onak_dbctx {
  * are using.
  */
 	int (*fetch_key_fp)(struct onak_dbctx *,
-			uint8_t *fp,
-			size_t fpsize,
+			struct openpgp_fingerprint *fingerprint,
 			struct openpgp_publickey **publickey,
 			bool intrans);
 
@@ -105,13 +104,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.
@@ -184,15 +184,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.
@@ -208,6 +199,11 @@ struct onak_dbctx {
 			void (*iterfunc)(void *ctx,
 			struct openpgp_publickey *key),	void *ctx);
 
+/**
+ * @brief Configuration file information for this backend instance
+ */
+	struct onak_db_config *config;
+
 /**
  * @brief Private backend context information.
  */