X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=efffad7d7863a7e310647113801fb21ba545c22f;hb=ec6d9d2d119c9b215103c13bcc5b9b44bd24b997;hp=fac501ea918e842e36b81ecef07eedd01d0bd99c;hpb=32851537d44f08b08ed317cbc4281ce003f84fa4;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index fac501e..efffad7 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -4,11 +4,8 @@
  * 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>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +34,7 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
 	int length = 0;
 	int packetlen = 0;
 
-	assert(data != NULL);
+	log_assert(data != NULL);
 
 	length = (data[0] << 8) + data[1] + 2;
 
@@ -84,6 +81,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 +215,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 +246,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;
+}