cscvs to tla changeset 137

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index fac501ea918e842e36b81ecef07eedd01d0bd99c..8fca1762464a474bfebc994edafec13bedf2d6ec 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.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>
  */
 
 #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.


@@ -212,8 +218,11 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
        char buf[1024];
        char **uids = NULL;
        int count = 0;
        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 *));
        
        if (key != NULL && key->uids != NULL) {
                uids = malloc((spsize(key->uids) + 1) * sizeof (char *));