Fix compilation of PostgreSQL backend.

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 2547b6b090cc8302b2378fa3805be637b686debd..1eb9deff1edd1846d68993bb389ba6a375fbdb16 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: keydb.c,v 1.10 2003/06/08 21:11:00 noodles Exp $

  */
 
 /**
  */
 
 /**


@@ -16,13 +18,15 @@
 
 #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"
 

+#ifdef NEED_KEYID2UID

 /**
  *     keyid2uid - Takes a keyid and returns the primary UID for it.
  *     @keyid: The keyid to lookup.
 /**
  *     keyid2uid - Takes a keyid and returns the primary UID for it.
  *     @keyid: The keyid to lookup.


@@ -31,10 +35,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) {


@@ -50,31 +54,101 @@ 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

 
 

+#ifdef NEED_GETKEYSIGS

 /**
  *     getkeysigs - Gets a linked list of the signatures on a key.
  *     @keyid: The keyid to get the sigs for.
 /**
  *     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 
  *
  *     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;
        struct openpgp_publickey *publickey = NULL;
 
 {
        struct ll *sigs = 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) {
                        sigs = keysigs(sigs, uids->sigs);
                }
        
        if (publickey != NULL) {
                for (uids = publickey->uids; uids != NULL; uids = uids->next) {
                        sigs = keysigs(sigs, uids->sigs);
                }

+               if (revoked != NULL) {
+                       *revoked = (publickey->revocations != NULL);
+               }

                free_publickey(publickey);
        }
                free_publickey(publickey);
        }

-       
+

        return sigs;
 }
        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;
+       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.
+ *     @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