cscvs to tla changeset 69

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index a9e4cef30bd9907349ee82025016ab26ce6a3162..406f857147aa29391083db351b3f77d36430c338 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -16,9 +16,10 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+#include "decodekey.h"
+#include "hash.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keydb.h"
 #include "keyid.h"

-#include "keyindex.h"

 #include "keystructs.h"
 #include "mem.h"
 #include "parsekey.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "parsekey.h"


@@ -32,10 +33,10 @@ char *keyid2uid(uint64_t keyid)
 {
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_signedpacket_list *curuid = NULL;
 {
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_signedpacket_list *curuid = NULL;

-       static char buf[1024];
+       char buf[1024];

 
        buf[0]=0;
 
        buf[0]=0;

-       if (fetch_key(keyid, &publickey) && publickey != NULL) {
+       if (fetch_key(keyid, &publickey, false) && publickey != NULL) {

                curuid = publickey->uids;
                while (curuid != NULL && buf[0] == 0) {
                        if (curuid->packet->tag == 13) {
                curuid = publickey->uids;
                while (curuid != NULL && buf[0] == 0) {
                        if (curuid->packet->tag == 13) {


@@ -51,7 +52,7 @@ char *keyid2uid(uint64_t keyid)
        if (buf[0] == 0) {
                return NULL;
        } else {
        if (buf[0] == 0) {
                return NULL;
        } else {

-               return buf;
+               return strdup(buf);

        }
 }
 #endif
        }
 }
 #endif


@@ -70,7 +71,7 @@ struct ll *getkeysigs(uint64_t keyid)
        struct openpgp_signedpacket_list *uids = NULL;
        struct openpgp_publickey *publickey = NULL;
 
        struct openpgp_signedpacket_list *uids = NULL;
        struct openpgp_publickey *publickey = NULL;
 

-       fetch_key(keyid, &publickey);
+       fetch_key(keyid, &publickey, false);

        
        if (publickey != NULL) {
                for (uids = publickey->uids; uids != NULL; uids = uids->next) {
        
        if (publickey != NULL) {
                for (uids = publickey->uids; uids != NULL; uids = uids->next) {


@@ -82,3 +83,70 @@ struct ll *getkeysigs(uint64_t keyid)
        return sigs;
 }
 #endif
        return sigs;
 }
 #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;
+                       key->disabled = 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. 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 < 0x100000000LL) {
+               fetch_key(keyid, &publickey, false);
+               if (publickey != NULL) {
+                       keyid = get_keyid(publickey);
+                       free_publickey(publickey);
+                       publickey = NULL;
+               } else {
+                       keyid = 0;
+               }
+       }
+       
+       return keyid;
+}
+#endif