X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=1a882386bf25933c4ea4ae5fa47853301ce5bd6b;hb=42977c5361ef21c99bc157e9c7edbba49243014f;hp=f92c252667a95eeb23bed61d76f763d69031e6a7;hpb=357fbc65bfab230bbf12313e8b458d8325a6174f;p=onak.git

diff --git a/keydb.c b/keydb.c
index f92c252..1a88238 100644
--- a/keydb.c
+++ b/keydb.c
@@ -155,33 +155,6 @@ struct ll *generic_cached_getkeysigs(struct onak_dbctx *dbctx, uint64_t keyid)
 	return key->sigs;
 }
 
-#ifdef NEED_GETFULLKEYID
-/**
- *	getfullkeyid - Maps a 32bit key id to a 64bit one.
- *	@keyid: The 32bit keyid.
- *
- *	This function maps a 32bit key id to the full 64bit one. It returns the
- *	full keyid. If the key isn't found a keyid of 0 is returned.
- */
-uint64_t generic_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
-{
-	struct openpgp_publickey *publickey = NULL;
-
-	if (keyid < 0x100000000LL) {
-		dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
-		if (publickey != NULL) {
-			get_keyid(publickey, &keyid);
-			free_publickey(publickey);
-			publickey = NULL;
-		} else {
-			keyid = 0;
-		}
-	}
-	
-	return keyid;
-}
-#endif
-
 #ifdef NEED_UPDATEKEYS
 /**
  *	update_keys - Takes a list of public keys and updates them in the DB.
@@ -200,17 +173,16 @@ int generic_update_keys(struct onak_dbctx *dbctx,
 	struct openpgp_publickey *curkey = NULL;
 	struct openpgp_publickey *oldkey = NULL;
 	struct openpgp_publickey *prev = NULL;
+	struct openpgp_fingerprint fp;
 	int newkeys = 0;
 	bool intrans;
-	uint64_t keyid;
 
 	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
 		intrans = dbctx->starttrans(dbctx);
-		get_keyid(curkey, &keyid);
+		get_fingerprint(curkey->publickey, &fp);
 		logthing(LOGTHING_INFO,
-			"Fetching key 0x%" PRIX64 ", result: %d",
-			keyid,
-			dbctx->fetch_key_id(dbctx, keyid, &oldkey,
+			"Fetching key, result: %d",
+			dbctx->fetch_key_fp(dbctx, &fp, &oldkey,
 					intrans));
 
 		/*
@@ -273,13 +245,23 @@ static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
 	/*
 	 * We assume if the backend is using this function it's not storing
 	 * anything bigger than the 64 bit key ID and just truncate the
-	 * fingerprint to get that value. This doesn't work for v3 keys,
+	 * fingerprint to get that value. v4 keys want the lowest 64 bits, v5
+	 * keys need the top 64 bits.  This doesn't work for v3 keys,
 	 * but there's no way to map from v3 fingerprint to v3 key ID so
 	 * if the backend can't do it we're going to fail anyway.
 	 */
 	keyid = 0;
-	for (i = (fingerprint->length - 8); i < fingerprint->length; i++) {
-		keyid = (keyid << 8) + fingerprint->fp[i];
+	if (fingerprint->length == 20) {
+		/* v4 */
+		for (i = (fingerprint->length - 8); i < fingerprint->length;
+				i++) {
+			keyid = (keyid << 8) + fingerprint->fp[i];
+		}
+	} else {
+		/* v5 */
+		for (i = 0; i < 8; i++) {
+			keyid = (keyid << 8) + fingerprint->fp[i];
+		}
 	}
 
 	return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);