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

diff --git a/keydb.c b/keydb.c
index 3ebb056..3fe3d34 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"
@@ -32,7 +33,7 @@ char *keyid2uid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_signedpacket_list *curuid = NULL;
-	static char buf[1024];
+	char buf[1024];
 
 	buf[0]=0;
 	if (fetch_key(keyid, &publickey, false) && publickey != NULL) {
@@ -51,7 +52,7 @@ char *keyid2uid(uint64_t keyid)
 	if (buf[0] == 0) {
 		return NULL;
 	} else {
-		return buf;
+		return strdup(buf);
 	}
 }
 #endif
@@ -83,22 +84,66 @@ 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;
+
+	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;
+		}
+	}
+	if (key->gotsigs == false) {
+		key->sigs = getkeysigs(key->keyid);
+		key->gotsigs = true;
+	}
+
+	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.
+ *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
 uint64_t getfullkeyid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 
-	if (keyid < 0x100000000) {
+	if (keyid < 0x100000000LL) {
 		fetch_key(keyid, &publickey, false);
-		keyid = get_keyid(publickey);
-		free_publickey(publickey);
+		if (publickey != NULL) {
+			keyid = get_keyid(publickey);
+			free_publickey(publickey);
+			publickey = NULL;
+		} else {
+			keyid = 0;
+		}
 	}
 	
 	return keyid;