Add subkey support to keydb_fs backend.

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 6a1660467e87ba0ccc7b42566f93c47fd4e902ee..723435ad8513335f0aea516f82ecd90c8775f99e 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -18,6 +18,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.


@@ -53,13 +54,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?
                         */


@@ -81,6 +82,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.


@@ -94,10 +101,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;
        }


@@ -205,6 +216,10 @@ 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;
+       }

 
        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 *));


@@ -221,13 +236,41 @@ 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;
 }

+
+/**
+ *     keysubkeys - Takes a key and returns an array of its subkey keyids.
+ *     @key: The key to get the subkeys of.
+ *
+ *     keysubkeys takes a public key structure and returns an array of the
+ *     subkey keyids for that key.
+ */
+uint64_t *keysubkeys(struct openpgp_publickey *key)
+{
+       struct openpgp_signedpacket_list *cursubkey = NULL;
+       uint64_t                         *subkeys = NULL;
+       int                               count = 0;
+        
+       if (key != NULL && key->subkeys != NULL) {
+               subkeys = malloc((spsize(key->subkeys) + 1) *
+                               sizeof (uint64_t));
+               cursubkey = key->subkeys;
+               while (cursubkey != NULL) {
+                       subkeys[count++] = get_packetid(cursubkey->packet);
+                       cursubkey = cursubkey -> next;
+               }
+               subkeys[count] = 0;
+       }
+
+       return subkeys;
+}