cscvs to tla changeset 108

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 9ae614d0cfe6e1701fbf1dd47ea4273c6883c82d..fac501ea918e842e36b81ecef07eedd01d0bd99c 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.2 2003/06/04 20:57:07 noodles Exp $
+ * $Id: decodekey.c,v 1.4 2003/09/28 21:07:50 noodles Exp $

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


@@ -20,6 +20,7 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"

+#include "log.h"

 
 /*
  *     parse_subpackets - Parse the subpackets of a Type 4 signature.
 
 /*
  *     parse_subpackets - Parse the subpackets of a Type 4 signature.


@@ -55,13 +56,13 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
                        packetlen <<= 8;
                        packetlen = data[offset++];
                }
                        packetlen <<= 8;
                        packetlen = data[offset++];
                }

-               switch (data[offset]) {
+               switch (data[offset] & 0x7F) {

                case 2:
                        /*
                         * Signature creation time. Might want to output this?
                         */
                        break;
                case 2:
                        /*
                         * Signature creation time. Might want to output this?
                         */
                        break;

-               case 0x83:
+               case 3:

                        /*
                         * Signature expiration time. Might want to output this?
                         */
                        /*
                         * Signature expiration time. Might want to output this?
                         */


@@ -96,10 +97,14 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
                default:
                        /*
                         * We don't care about unrecognized packets unless bit
                default:
                        /*
                         * We don't care about unrecognized packets unless bit

-                        * 7 is set in which case we prefer an error than
-                        * ignoring it.
+                        * 7 is set in which case we log a major error.

                         */
                         */

-                       assert(!(data[offset] & 0x80));
+                       if (data[offset] & 0x80) {
+                               logthing(LOGTHING_CRITICAL,
+                               "Critical subpacket type not parsed: 0x%X",
+                                       data[offset]);
+                       }
+                               

                }
                offset += packetlen;
        }
                }
                offset += packetlen;
        }


@@ -208,6 +213,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 *));
        


@@ -223,12 +229,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;