X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=f8d5a0bd8ef60248157542ee55ec356a06a0ae4d;hb=85187675424f3854869f1607afd8a1e84e536946;hp=57472f9da64356035865d2ee1654e5bb7e7e4e76;hpb=83ae316a7b14e55418349e87d1a1942a0627ae14;p=onak.git

diff --git a/keydb.c b/keydb.c
index 57472f9..f8d5a0b 100644
--- a/keydb.c
+++ b/keydb.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 <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -25,6 +24,7 @@
  *	slower than custom functions however.
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 
 #include "decodekey.h"
@@ -32,11 +32,12 @@
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
+#include "ll.h"
 #include "mem.h"
 #include "merge.h"
 #include "openpgp.h"
-#include "parsekey.h"
 #include "sendsync.h"
+#include "stats.h"
 
 #ifdef NEED_KEYID2UID
 /**
@@ -87,13 +88,19 @@ struct ll *generic_getkeysigs(struct onak_dbctx *dbctx,
 {
 	struct ll *sigs = NULL;
 	struct openpgp_signedpacket_list *uids = NULL;
+	struct openpgp_packet_list *cursig;
 	struct openpgp_publickey *publickey = NULL;
 
 	dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
 	
 	if (publickey != NULL) {
 		for (uids = publickey->uids; uids != NULL; uids = uids->next) {
-			sigs = keysigs(sigs, uids->sigs);
+			for (cursig = uids->sigs; cursig != NULL;
+					cursig = cursig->next) {
+				sigs = lladd(sigs,
+						createandaddtohash(sig_keyid(
+							cursig->packet)));
+			}
 		}
 		if (revoked != NULL) {
 			*revoked = publickey->revoked;
@@ -253,26 +260,36 @@ int generic_update_keys(struct onak_dbctx *dbctx,
 
 #ifdef NEED_GET_FP
 static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
-		uint8_t *fp, size_t fpsize,
+		struct openpgp_fingerprint *fingerprint,
 		struct openpgp_publickey **publickey, bool intrans)
 {
 	uint64_t keyid;
 	int i;
 
-	if (fpsize > MAX_FINGERPRINT_LEN) {
+	if (fingerprint->length > MAX_FINGERPRINT_LEN) {
 		return 0;
 	}
 
 	/*
 	 * 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 = (fpsize - 8); i < fpsize; i++) {
-		keyid = (keyid << 8) + 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);