Further compile warning cleanups.

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index fac501ea918e842e36b81ecef07eedd01d0bd99c..723435ad8513335f0aea516f82ecd90c8775f99e 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: decodekey.c,v 1.4 2003/09/28 21:07:50 noodles Exp $
  */
 
 #include <assert.h>
@@ -84,6 +82,12 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
                        *keyid <<= 8;
                        *keyid += data[offset+packetlen - 1];
                        break;
+               case 20:
+                       /*
+                        * Annotation data.
+                        */
+                       break;
+
                case 23:
                        /*
                         * Key server preferences. Including no-modify.
@@ -212,8 +216,11 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
        char buf[1024];
        char **uids = NULL;
        int count = 0;
+        
+        if (primary != NULL) {
+               *primary = NULL;
+       }
 
-       *primary = NULL;
        if (key != NULL && key->uids != NULL) {
                uids = malloc((spsize(key->uids) + 1) * sizeof (char *));
        
@@ -240,3 +247,30 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
 
        return uids;
 }
+
+/**
+ *     keysubkeys - Takes a key and returns an array of its subkey keyids.
+ *     @key: The key to get the subkeys of.
+ *
+ *     keysubkeys takes a public key structure and returns an array of the
+ *     subkey keyids for that key.
+ */
+uint64_t *keysubkeys(struct openpgp_publickey *key)
+{
+       struct openpgp_signedpacket_list *cursubkey = NULL;
+       uint64_t                         *subkeys = NULL;
+       int                               count = 0;
+        
+       if (key != NULL && key->subkeys != NULL) {
+               subkeys = malloc((spsize(key->subkeys) + 1) *
+                               sizeof (uint64_t));
+               cursubkey = key->subkeys;
+               while (cursubkey != NULL) {
+                       subkeys[count++] = get_packetid(cursubkey->packet);
+                       cursubkey = cursubkey -> next;
+               }
+               subkeys[count] = 0;
+       }
+
+       return subkeys;
+}