cscvs to tla changeset 125

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index b9211863111cb3c00d2686efc8f2313115192589..5c6b3207801d48f583e05de44229d0377e2544d2 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: parsekey.c,v 1.13 2003/09/30 20:40:11 noodles Exp $
+ * $Id: parsekey.c,v 1.18 2004/01/04 18:47:35 noodles Exp $

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


@@ -21,20 +21,6 @@
 #include "mem.h"
 #include "parsekey.h"
 
 #include "mem.h"
 #include "parsekey.h"
 

-/**
- *     add_key - Takes a key and adds it to the keyserver.
- *     @key: The public key to add.
- *
- *     This function takes a public key and adds it to the keyserver.
- *     It first of all sees if we already have the key locally. If we do then
- *     we retrieve it and merge the two keys. We then store the resulting key
- *     (or just the original we received if we don't already have it). We then
- *     send out the appropriate updates to our keyserver peers.
- */
-int add_key(struct openpgp_publickey *key) {
-       return 0;
-}
-

 /**
  *     parse_keys - Process a stream of packets for public keys + sigs.
  *     @packets: The packet list to parse.
 /**
  *     parse_keys - Process a stream of packets for public keys + sigs.
  *     @packets: The packet list to parse.


@@ -149,7 +135,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: %d, Length: %d\n",
+       printf("\tNew format: %d, Tag: %u, Length: %d\n",

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


@@ -175,7 +161,6 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                int maxnum)
 {
        unsigned char                    curchar = 0;
                                int maxnum)
 {
        unsigned char                    curchar = 0;

-       unsigned long                    count = 0;

        struct openpgp_packet_list      *curpacket = NULL;
        int                              rc = 0;
        int                              keys = 0;
        struct openpgp_packet_list      *curpacket = NULL;
        int                              rc = 0;
        int                              keys = 0;


@@ -189,15 +174,14 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                }
        }
 
                }
        }
 

-       while (!rc && !getchar_func(ctx, 1, &curchar) &&
-                       (maxnum == 0 || keys < maxnum)) {
+       while (!rc && (maxnum == 0 || keys < maxnum) &&
+                       !getchar_func(ctx, 1, &curchar)) {

                if (!inpacket && (curchar & 0x80)) {
                        /*
                         * New packet. Record the fact we're in a packet and
                         * allocate memory for it.
                         */
                        inpacket = true;
                if (!inpacket && (curchar & 0x80)) {
                        /*
                         * New packet. Record the fact we're in a packet and
                         * allocate memory for it.
                         */
                        inpacket = true;

-                       count = 0;

                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;


@@ -231,7 +215,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length < 255) {
                                        logthing(LOGTHING_NOTICE,
                                                "Partial length;"
                                        curpacket->packet->length < 255) {
                                        logthing(LOGTHING_NOTICE,
                                                "Partial length;"

-                                               " not supported.\n");
+                                               " not supported.");

                                } 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


@@ -308,6 +292,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                } else {
                        logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
                } else {
                        logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);

+                       rc = 1;

                }
        }
 
                }
        }