"Recognize" some extra subpacket types

  We sometimes see critical subpackets for signature UIDs and and Policy
  URIs. While we should probably display such things in indexes in the
  future this isn't critical enough for us to log the packets as an error.

diff --git a/decodekey.c b/decodekey.c
index 3a6e075d53544882425981dbac7bce034b5c7817..606b091f941237ec173cedf64b10b0c6aa1eb29f 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -1,9 +1,7 @@
 /*
  * decodekey.c - Routines to further decode an OpenPGP key.
  *
 /*
  * decodekey.c - Routines to further decode an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
- *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

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


@@ -75,6 +73,11 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
                         * Signature expiration time. Might want to output this?
                         */
                        break;
                         * Signature expiration time. Might want to output this?
                         */
                        break;

+               case 6:
+                       /*
+                        * Regular expression for UIDs this sig is over.
+                        */
+                       break;

                case 16:
                        if (keyid != NULL) {
                                *keyid = data[offset+packetlen - 8];
                case 16:
                        if (keyid != NULL) {
                                *keyid = data[offset+packetlen - 8];


@@ -110,6 +113,11 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
                         * Primary UID.
                         */
                        break;
                         * Primary UID.
                         */
                        break;

+               case 26:
+                       /*
+                        * Policy URI.
+                        */
+                       break;

                default:
                        /*
                         * We don't care about unrecognized packets unless bit
                default:
                        /*
                         * We don't care about unrecognized packets unless bit