cscvs to tla changeset 7

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 2547b6b090cc8302b2378fa3805be637b686debd..3ebb0560bf72ab8cb8ecbdfa5a6221c27cceb65e 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -23,6 +23,7 @@
 #include "mem.h"
 #include "parsekey.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.


@@ -34,7 +35,7 @@ char *keyid2uid(uint64_t keyid)
        static char buf[1024];
 
        buf[0]=0;
        static char buf[1024];
 
        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) {


@@ -53,7 +54,9 @@ char *keyid2uid(uint64_t keyid)
                return buf;
        }
 }
                return 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.


@@ -67,7 +70,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) {


@@ -75,6 +78,29 @@ struct ll *getkeysigs(uint64_t keyid)
                }
                free_publickey(publickey);
        }
                }
                free_publickey(publickey);
        }

-       
+

        return sigs;
 }
        return sigs;
 }

+#endif
+
+#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.
+ */
+uint64_t getfullkeyid(uint64_t keyid)
+{
+       struct openpgp_publickey *publickey = NULL;
+
+       if (keyid < 0x100000000) {
+               fetch_key(keyid, &publickey, false);
+               keyid = get_keyid(publickey);
+               free_publickey(publickey);
+       }
+       
+       return keyid;
+}
+#endif