X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=2b419ca2af99d162643448489a0f9850de665651;hb=a047e3e158d560af079bec920460711d8222317c;hp=3fe3d34d85afe8632e9426b2e08a3ea23bdb897e;hpb=5913c95f2c7abf4c3cb06e27d384d80fb4c83547;p=onak.git

diff --git a/keydb.c b/keydb.c
index 3fe3d34..2b419ca 100644
--- a/keydb.c
+++ b/keydb.c
@@ -61,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;
@@ -77,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);
 	}
 
@@ -95,28 +100,24 @@ struct ll *getkeysigs(uint64_t keyid)
 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 = findinhash(keyid);
-	if (key == NULL) {
-		key = malloc(sizeof(*key));
-		if (key != NULL) {
-			key->keyid = keyid;
-			key->colour = 0;
-			key->parent = 0;
-			key->sigs = NULL;
-			key->gotsigs = false;
-			addtohash(key);
-		} else {
-			perror("cached_getkeysigs()");
-			return NULL;
-		}
-	}
+	key = createandaddtohash(keyid);
+
 	if (key->gotsigs == false) {
-		key->sigs = getkeysigs(key->keyid);
+		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;
 	}