Switch debian build system to dh

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index 0367e2d1a927dd0f71631e569f5d582b05c8c7eb..f780520c9c7f5a9e251217370970d3785bcb4176 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -1,14 +1,22 @@
 /*
  * parsekey.c - Routines to parse an OpenPGP key.
  *
 /*
  * parsekey.c - Routines to parse an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.

  *
  *

- * $Id: parsekey.c,v 1.20 2004/05/27 21:55:38 noodles Exp $
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

-#include <assert.h>

 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -17,8 +25,9 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"

-#include "log.h"

 #include "mem.h"
 #include "mem.h"

+#include "onak.h"
+#include "openpgp.h"

 #include "parsekey.h"
 
 /**
 #include "parsekey.h"
 
 /**


@@ -48,13 +57,13 @@ int parse_keys(struct openpgp_packet_list *packets,
 
        while (packets != NULL) {
                switch (packets->packet->tag) {
 
        while (packets != NULL) {
                switch (packets->packet->tag) {

-               case 2:
+               case OPENPGP_PACKET_SIGNATURE:

                        /*
                         * It's a signature packet. Add it to either the public
                        /*
                         * It's a signature packet. Add it to either the public

-                        * key (it should be a revocation), to the current UID
-                        * or the current subkey.
+                        * key, to the current UID or the current subkey.

                         */
                         */

-                       assert(curkey != NULL);
+                       if (curkey == NULL)
+                               return ONAK_E_INVALID_PARAM;

                        if (curkey->subkeys != NULL) {
                                ADD_PACKET_TO_LIST_END(curkey->last_subkey,
                                        sig,
                        if (curkey->subkeys != NULL) {
                                ADD_PACKET_TO_LIST_END(curkey->last_subkey,
                                        sig,


@@ -65,11 +74,30 @@ int parse_keys(struct openpgp_packet_list *packets,
                                        packet_dup(packets->packet));
                        } else {
                                ADD_PACKET_TO_LIST_END(curkey,
                                        packet_dup(packets->packet));
                        } else {
                                ADD_PACKET_TO_LIST_END(curkey,

-                                       revocation,
+                                       sig,

                                        packet_dup(packets->packet));
                                        packet_dup(packets->packet));

+                               /*
+                                * This is a signature on the public key; check
+                                * if it's a revocation.
+                                */
+                               if (packets->packet->data[0] == 3 &&
+                                       packets->packet->data[2] ==
+                                               OPENPGP_SIGTYPE_KEY_REV) {
+                                       /*
+                                        * Type 3 key, 0x20 == revocation
+                                        */
+                                       curkey->revoked = true;
+                               } else if (packets->packet->data[0] == 4 &&
+                                       packets->packet->data[1] ==
+                                               OPENPGP_SIGTYPE_KEY_REV) {
+                                       /*
+                                        * Type 4 key, 0x20 == revocation
+                                        */
+                                       curkey->revoked = true;
+                               }

                        }
                        break;
                        }
                        break;

-               case 6:
+               case OPENPGP_PACKET_PUBLICKEY:

                        /*
                         * It's a public key packet, so start a new key in our
                         * list.
                        /*
                         * It's a public key packet, so start a new key in our
                         * list.


@@ -85,28 +113,31 @@ int parse_keys(struct openpgp_packet_list *packets,
                        curkey->publickey = packet_dup(packets->packet);
                        count++;
                        break;
                        curkey->publickey = packet_dup(packets->packet);
                        count++;
                        break;

-               case 13:
-               case 17:
+               case OPENPGP_PACKET_UID:
+               case OPENPGP_PACKET_UAT:

                        /*
                         * It's a UID packet (or a photo id, which is similar).
                         */
                        /*
                         * It's a UID packet (or a photo id, which is similar).
                         */

-                       assert(curkey != NULL);
-                       assert(curkey->subkeys == NULL);
+                       if (curkey == NULL)
+                               return ONAK_E_INVALID_PARAM;
+                       if (curkey->subkeys != NULL)
+                               return ONAK_E_INVALID_PARAM;

                        ADD_PACKET_TO_LIST_END(curkey,
                                uid,
                                packet_dup(packets->packet));
                        break;
                        ADD_PACKET_TO_LIST_END(curkey,
                                uid,
                                packet_dup(packets->packet));
                        break;

-               case 14:
+               case OPENPGP_PACKET_PUBLICSUBKEY:

                        /*
                         * It's a subkey packet.
                         */
                        /*
                         * It's a subkey packet.
                         */

-                       assert(curkey != NULL);
+                       if (curkey == NULL)
+                               return ONAK_E_INVALID_PARAM;

                        ADD_PACKET_TO_LIST_END(curkey,
                                subkey,
                                packet_dup(packets->packet));
                        break;
                        ADD_PACKET_TO_LIST_END(curkey,
                                subkey,
                                packet_dup(packets->packet));
                        break;

-               case 12:
-               case 61:
+               case OPENPGP_PACKET_TRUST:
+               case OPENPGP_PACKET_COMMENT:

                        /*
                         * One of:
                         *
                        /*
                         * One of:
                         *


@@ -115,9 +146,8 @@ int parse_keys(struct openpgp_packet_list *packets,
                         */
                        break;
                default:
                         */
                        break;
                default:

-                       logthing(LOGTHING_ERROR,
-                                       "Unsupported packet type: %d",
-                                       packets->packet->tag);
+                       /* Unsupported packet. Do what? Ignore for now. */
+                       break;

                }
                packets = packets->next;
        }
                }
                packets = packets->next;
        }


@@ -135,7 +165,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
  */
 int debug_packet(struct openpgp_packet *packet)
 {

-       printf("\tNew format: %d, Tag: %u, Length: %d\n",
+       printf("\tNew format: %d, Tag: %u, Length: %zd\n",

                        packet->newformat,
                        packet->tag,
                        packet->length);
                        packet->newformat,
                        packet->tag,
                        packet->length);


@@ -154,19 +184,21 @@ int debug_packet(struct openpgp_packet *packet)
  *     packet stream and reads the packets into a linked list of packets
  *     ready for parsing as a public key or whatever.
  */
  *     packet stream and reads the packets into a linked list of packets
  *     ready for parsing as a public key or whatever.
  */

-int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
-                               unsigned char *c),
+onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+                               void *c),

                                void *ctx,
                                struct openpgp_packet_list **packets,
                                int maxnum)
 {
        unsigned char                    curchar = 0;
                                void *ctx,
                                struct openpgp_packet_list **packets,
                                int maxnum)
 {
        unsigned char                    curchar = 0;

-       struct openpgp_packet_list      *curpacket = NULL;
-       int                              rc = 0;
+       struct openpgp_packet_list      *curpacket = NULL, **packetend = NULL;
+       onak_status_t                    rc = ONAK_E_OK;

        int                              keys = 0;
        bool                             inpacket = false;
 
        int                              keys = 0;
        bool                             inpacket = false;
 

-       assert(packets != NULL);
+       if (packets == NULL)
+               return ONAK_E_INVALID_PARAM;
+

        curpacket = *packets;
        if (curpacket != NULL) {
                while (curpacket->next != NULL) {
        curpacket = *packets;
        if (curpacket != NULL) {
                while (curpacket->next != NULL) {


@@ -184,10 +216,12 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                        inpacket = true;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                        inpacket = true;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));

+                               packetend = &curpacket->next;

                                curpacket = curpacket->next;
                        } else {
                                *packets = curpacket =
                                        malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;
                        } else {
                                *packets = curpacket =
                                        malloc(sizeof (*curpacket));

+                               packetend = packets;

                        }
                        memset(curpacket, 0, sizeof(*curpacket));
                        curpacket->packet =
                        }
                        memset(curpacket, 0, sizeof(*curpacket));
                        curpacket->packet =


@@ -213,9 +247,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += 192;
                                } else if (curpacket->packet->length > 223 &&
                                        curpacket->packet->length < 255) {
                                        curpacket->packet->length += 192;
                                } else if (curpacket->packet->length > 223 &&
                                        curpacket->packet->length < 255) {

-                                       logthing(LOGTHING_NOTICE,
-                                               "Partial length;"
-                                               " not supported.");
+                                       free(curpacket->packet);
+                                       curpacket->packet = NULL;
+                                       rc = ONAK_E_UNSUPPORTED_FEATURE;

                                } else if (curpacket->packet->length == 255) {
                                        /*
                                         * 5 byte length; ie 255 followed by 3
                                } else if (curpacket->packet->length == 255) {
                                        /*
                                         * 5 byte length; ie 255 followed by 3


@@ -261,27 +295,23 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += curchar;
                                        break;
                                case 3:
                                        curpacket->packet->length += curchar;
                                        break;
                                case 3:

-                                       logthing(LOGTHING_ERROR,
-                                               "Unsupported length type 3.");
-                                       curpacket->packet->length = 0;
-                                       curpacket->packet->data = NULL;
-                                       rc = -1;
+                                       rc = ONAK_E_UNSUPPORTED_FEATURE;
+                                       free(curpacket->packet);
+                                       curpacket->packet = NULL;

                                        break;
                                }
                        }
 
                        if (rc == 0) {
                                        break;
                                }
                        }
 
                        if (rc == 0) {

-                               if (curpacket->packet->tag == 6) {
+                               if (curpacket->packet->tag ==
+                                               OPENPGP_PACKET_PUBLICKEY) {

                                        keys++;
                                }
                                curpacket->packet->data =
                                        malloc(curpacket->packet->length *
                                        sizeof(unsigned char));
                                if (curpacket->packet->data == NULL) {
                                        keys++;
                                }
                                curpacket->packet->data =
                                        malloc(curpacket->packet->length *
                                        sizeof(unsigned char));
                                if (curpacket->packet->data == NULL) {

-                                       logthing(LOGTHING_ERROR, 
-                                               "Can't allocate memory for "
-                                               "packet!");
-                                       rc = -1;
+                                       rc = ONAK_E_NOMEM;

                                } else {
                                        rc = getchar_func(ctx,
                                                curpacket->packet->length,
                                } else {
                                        rc = getchar_func(ctx,
                                                curpacket->packet->length,


@@ -290,12 +320,16 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                        }
                        inpacket = false;
                } else {
                        }
                        inpacket = false;
                } else {

-                       logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
-                               curchar);
-                       rc = 1;
+                       rc = ONAK_E_INVALID_PKT;

                }
        }
 
                }
        }
 

+       /* Trim the last packet if it doesn't actually exist */
+       if (packetend != NULL && (*packetend)->packet == NULL) {
+               free(*packetend);
+               *packetend = NULL;
+       }
+

        return (rc);
 }
 
        return (rc);
 }
 


@@ -308,8 +342,8 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
  *     This function uses putchar_func to write characters to an OpenPGP
  *     packet stream from a linked list of packets.
  */
  *     This function uses putchar_func to write characters to an OpenPGP
  *     packet stream from a linked list of packets.
  */

-int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
-                                               unsigned char *c),
+onak_status_t write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+                                               void *c),

                                void *ctx,
                                struct openpgp_packet_list *packets)
 {
                                void *ctx,
                                struct openpgp_packet_list *packets)
 {


@@ -336,8 +370,6 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                putchar_func(ctx, 1, &curchar);
                        } else if (packets->packet->length > 8382 &&
                                packets->packet->length < 0xFFFFFFFF) {
                                putchar_func(ctx, 1, &curchar);
                        } else if (packets->packet->length > 8382 &&
                                packets->packet->length < 0xFFFFFFFF) {

-                               logthing(LOGTHING_DEBUG,
-                                       "Writing 5 byte length");

                                curchar = 255;
                                putchar_func(ctx, 1, &curchar);
                                
                                curchar = 255;
                                putchar_func(ctx, 1, &curchar);
                                


@@ -357,8 +389,7 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                curchar &= 0xFF;
                                putchar_func(ctx, 1, &curchar);
                        } else {
                                curchar &= 0xFF;
                                putchar_func(ctx, 1, &curchar);
                        } else {

-                               logthing(LOGTHING_ERROR,
-                                       "Unsupported new format length.");
+                               return ONAK_E_UNSUPPORTED_FEATURE;

                        }
                } else {
                        curchar |= (packets->packet->tag << 2);
                        }
                } else {
                        curchar |= (packets->packet->tag << 2);


@@ -391,7 +422,8 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                packets->packet->data);
                packets = packets->next;
        }
                                packets->packet->data);
                packets = packets->next;
        }

-       return 0;
+
+       return ONAK_E_OK;

 }
 
 /**
 }
 
 /**


@@ -419,9 +451,9 @@ int flatten_publickey(struct openpgp_publickey *key,
                }
 
                /*
                }
 
                /*

-                * Now do any revocation signatures on the main key.
+                * Now do any signatures on the main key.

                 */
                 */

-               for (tmplist = key->revocations; tmplist != NULL;
+               for (tmplist = key->sigs; tmplist != NULL;

                                tmplist = tmplist->next) {
                        ADD_PACKET_TO_LIST((*list_end),
                                        packet_dup(tmplist->packet));
                                tmplist = tmplist->next) {
                        ADD_PACKET_TO_LIST((*list_end),
                                        packet_dup(tmplist->packet));