X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/32851537d44f08b08ed317cbc4281ce003f84fa4..ec10586ae774074490665d5baeef8488861904ee:/decodekey.c?ds=inline

diff --git a/decodekey.c b/decodekey.c
index fac501e..8fca176 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: decodekey.c,v 1.4 2003/09/28 21:07:50 noodles Exp $
+ * $Id: decodekey.c,v 1.6 2004/05/27 03:24:01 noodles Exp $
  */
 
 #include <assert.h>
@@ -84,6 +84,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 +218,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 *));