X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=723435ad8513335f0aea516f82ecd90c8775f99e;hb=995abb98512fb6ecf7a4529f8e3890a17839cfe0;hp=71723911c6981a2e18ee11697ad5927638a22dd4;hpb=d76720d2254815018d4881babd73d4723d22033c;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index 7172391..723435a 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: decodekey.c,v 1.5 2004/03/23 12:35:11 noodles Exp $
  */
 
 #include <assert.h>
@@ -218,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 *));
 	
@@ -246,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;
+}