Cleanup logging in sixdegrees.c

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index 35c14c08c07170b5289a7c8626408edbcb07bf3c..687fd9bd8612c6f9a3cd2c41af96e9269368a620 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -4,11 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: parsekey.c,v 1.15 2003/10/03 23:24:16 noodles Exp $
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,20 +18,6 @@
 #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.
@@ -68,7 +51,7 @@ int parse_keys(struct openpgp_packet_list *packets,
                         * key (it should be a revocation), to the current UID
                         * or the current subkey.
                         */
-                       assert(curkey != NULL);
+                       log_assert(curkey != NULL);
                        if (curkey->subkeys != NULL) {
                                ADD_PACKET_TO_LIST_END(curkey->last_subkey,
                                        sig,
@@ -104,8 +87,8 @@ int parse_keys(struct openpgp_packet_list *packets,
                        /*
                         * It's a UID packet (or a photo id, which is similar).
                         */
-                       assert(curkey != NULL);
-                       assert(curkey->subkeys == NULL);
+                       log_assert(curkey != NULL);
+                       log_assert(curkey->subkeys == NULL);
                        ADD_PACKET_TO_LIST_END(curkey,
                                uid,
                                packet_dup(packets->packet));
@@ -114,7 +97,7 @@ int parse_keys(struct openpgp_packet_list *packets,
                        /*
                         * It's a subkey packet.
                         */
-                       assert(curkey != NULL);
+                       log_assert(curkey != NULL);
                        ADD_PACKET_TO_LIST_END(curkey,
                                subkey,
                                packet_dup(packets->packet));
@@ -149,7 +132,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 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);
@@ -175,13 +158,12 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                int maxnum)
 {
        unsigned char                    curchar = 0;
-       unsigned long                    count = 0;
        struct openpgp_packet_list      *curpacket = NULL;
        int                              rc = 0;
        int                              keys = 0;
        bool                             inpacket = false;
 
-       assert(packets != NULL);
+       log_assert(packets != NULL);
        curpacket = *packets;
        if (curpacket != NULL) {
                while (curpacket->next != NULL) {
@@ -197,7 +179,6 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                         * allocate memory for it.
                         */
                        inpacket = true;
-                       count = 0;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;
@@ -241,13 +222,13 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length = curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                }
                        } else {
                                curpacket->packet->tag = (curchar & 0x3C) >> 2;
@@ -308,6 +289,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                } else {
                        logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
+                       rc = 1;
                }
        }
 
@@ -349,6 +331,28 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                curchar = (packets->packet->length - 192) &
                                         0xFF;
                                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 = (packets->packet->length >> 24);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = (packets->packet->length >> 16);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = (packets->packet->length >> 8);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = packets->packet->length;
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
                        } else {
                                logthing(LOGTHING_ERROR,
                                        "Unsupported new format length.");