X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_hkp.c;h=79d5c4b302e30d433a63664092fedba9895b2bc4;hb=dfab9e96ee1fa4a10acf9c1cf644d7a4366a5af6;hp=a65d11b238cb155cf9bc88dbc9eb9a708e2d0be9;hpb=0c120d1895d25b59abe338862189be1b87447569;p=onak.git
diff --git a/keydb_hkp.c b/keydb_hkp.c
index a65d11b..79d5c4b 100644
--- a/keydb_hkp.c
+++ b/keydb_hkp.c
@@ -13,8 +13,7 @@
* 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 .
*/
#include
@@ -24,6 +23,8 @@
#include
#include
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "keydb.h"
@@ -32,7 +33,6 @@
#include "mem.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "version.h"
struct onak_hkp_dbctx {
struct onak_db_config *config; /* Our DB config info */
@@ -271,13 +271,13 @@ static int hkp_store_key(struct onak_dbctx *dbctx,
/**
* delete_key - Given a keyid delete the key from storage.
- * @keyid: The keyid to delete.
+ * @fp: The fingerprint of the key to delete.
* @intrans: If we're already in a transaction.
*
* No op for HKP.
*/
static int hkp_delete_key(struct onak_dbctx *dbctx,
- uint64_t keyid, bool intrans)
+ struct openpgp_fingerprint *fp, bool intrans)
{
return -1;
}
@@ -321,7 +321,6 @@ static void hkp_endtrans(struct onak_dbctx *dbctx)
*/
#define NEED_KEYID2UID 1
#define NEED_GETKEYSIGS 1
-#define NEED_GETFULLKEYID 1
#define NEED_UPDATEKEYS 1
#include "keydb.c"
@@ -373,7 +372,6 @@ struct onak_dbctx *keydb_hkp_init(struct onak_db_config *dbcfg, bool readonly)
dbctx->getkeysigs = generic_getkeysigs;
dbctx->cached_getkeysigs = generic_cached_getkeysigs;
dbctx->keyid2uid = generic_keyid2uid;
- dbctx->getfullkeyid = generic_getfullkeyid;
dbctx->iterate_keys = hkp_iterate_keys;
if (!hkp_parse_url(privctx, dbcfg->location)) {