X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/d43d055372a663f85055bf255356271fdfe105e1..848a41ea337ecee39f3eaf9d091a316d07ec8e9d:/keydb.c?ds=inline

diff --git a/keydb.c b/keydb.c
index 3acf711..2b419ca 100644
--- a/keydb.c
+++ b/keydb.c
@@ -16,9 +16,10 @@
 
 #include <stdio.h>
 
+#include "decodekey.h"
+#include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "parsekey.h"
@@ -60,11 +61,13 @@ char *keyid2uid(uint64_t keyid)
 /**
  *	getkeysigs - Gets a linked list of the signatures on a key.
  *	@keyid: The keyid to get the sigs for.
+ *	@revoked: Is the key revoked?
  *
  *	This function gets the list of signatures on a key. Used for key 
- *	indexing and doing stats bits.
+ *	indexing and doing stats bits. If revoked is non-NULL then if the key
+ *	is revoked it's set to true.
  */
-struct ll *getkeysigs(uint64_t keyid)
+struct ll *getkeysigs(uint64_t keyid, bool *revoked)
 {
 	struct ll *sigs = NULL;
 	struct openpgp_signedpacket_list *uids = NULL;
@@ -76,6 +79,9 @@ struct ll *getkeysigs(uint64_t keyid)
 		for (uids = publickey->uids; uids != NULL; uids = uids->next) {
 			sigs = keysigs(sigs, uids->sigs);
 		}
+		if (revoked != NULL) {
+			*revoked = (publickey->revocations != NULL);
+		}
 		free_publickey(publickey);
 	}
 
@@ -83,6 +89,41 @@ struct ll *getkeysigs(uint64_t keyid)
 }
 #endif
 
+/**
+ *	cached_getkeysigs - Gets the signatures on a key.
+ *	@keyid: The key we want the signatures for.
+ *	
+ *	This function gets the signatures on a key. It's the same as the
+ *	getkeysigs function above except we use the hash module to cache the
+ *	data so if we need it again it's already loaded.
+ */
+struct ll *cached_getkeysigs(uint64_t keyid)
+{
+	struct stats_key *key = NULL;
+	struct stats_key *signedkey = NULL;
+	struct ll        *cursig = NULL;
+	bool		  revoked = false;
+
+	if (keyid == 0)  {
+		return NULL;
+	}
+
+	key = createandaddtohash(keyid);
+
+	if (key->gotsigs == false) {
+		key->sigs = getkeysigs(key->keyid, &revoked);
+		key->revoked = revoked;
+		for (cursig = key->sigs; cursig != NULL;
+				cursig = cursig->next) {
+			signedkey = (struct stats_key *) cursig->object;
+			signedkey->signs = lladd(signedkey->signs, key);
+		}
+		key->gotsigs = true;
+	}
+
+	return key->sigs;
+}
+
 #ifdef NEED_GETFULLKEYID
 /**
  *	getfullkeyid - Maps a 32bit key id to a 64bit one.