cscvs to tla changeset 126

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 46c75833d3317a41d6bca8084dc1e525e1037a12..71723911c6981a2e18ee11697ad5927638a22dd4 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: decodekey.c,v 1.3 2003/06/08 10:45:44 noodles Exp $
+ * $Id: decodekey.c,v 1.5 2004/03/23 12:35:11 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -84,6 +84,12 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
                        *keyid <<= 8;
                        *keyid += data[offset+packetlen - 1];
                        break;
                        *keyid <<= 8;
                        *keyid += data[offset+packetlen - 1];
                        break;

+               case 20:
+                       /*
+                        * Annotation data.
+                        */
+                       break;
+

                case 23:
                        /*
                         * Key server preferences. Including no-modify.
                case 23:
                        /*
                         * Key server preferences. Including no-modify.


@@ -213,6 +219,7 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
        char **uids = NULL;
        int count = 0;
 
        char **uids = NULL;
        int count = 0;
 

+       *primary = NULL;

        if (key != NULL && key->uids != NULL) {
                uids = malloc((spsize(key->uids) + 1) * sizeof (char *));
        
        if (key != NULL && key->uids != NULL) {
                uids = malloc((spsize(key->uids) + 1) * sizeof (char *));
        


@@ -228,12 +235,13 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
                        curuid = curuid -> next;
                }
                uids[count] = NULL;
                        curuid = curuid -> next;
                }
                uids[count] = NULL;

-       }
-       /*
-        * TODO: Parse subpackets for real primary ID (v4 keys)
-        */
-       if (primary != NULL) {
-               *primary = uids[0];
+
+               /*
+                * TODO: Parse subpackets for real primary ID (v4 keys)
+                */
+               if (primary != NULL) {
+                       *primary = uids[0];
+               }

        }
 
        return uids;
        }
 
        return uids;