cscvs to tla changeset 84

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index a2ff57847e4cea077bfb8d8672a595d70cafa12a..88a4594b5b9ffd780c2ac9730cf6b40cfe93ab7e 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: parsekey.c,v 1.7 2003/06/04 20:57:12 noodles Exp $
  */
 
 #include <assert.h>
@@ -15,6 +17,7 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "parsekey.h"
 
@@ -126,7 +129,8 @@ int parse_keys(struct openpgp_packet_list *packets,
                         */
                        break;
                default:
-                       fprintf(stderr, "Unsupported packet type: %d\n",
+                       logthing(LOGTHING_ERROR,
+                                       "Unsupported packet type: %d",
                                        packets->packet->tag);
                }
                packets = packets->next;
@@ -259,18 +263,26 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += curchar;
                                        break;
                                case 3:
-                                       fprintf(stderr, "Unsupported length type 3.\n");
+                                       logthing(LOGTHING_ERROR,
+                                               "Unsupported length type 3.");
+                                       curpacket->packet->length = 0;
+                                       curpacket->packet->data = NULL;
+                                       rc = -1;
                                        break;
                                }
                        }
-                       curpacket->packet->data =
-                               malloc(curpacket->packet->length *
+
+                       if (rc == 0) {
+                               curpacket->packet->data =
+                                       malloc(curpacket->packet->length *
                                        sizeof(unsigned char));
-                       rc = getchar_func(ctx, curpacket->packet->length,
+                               rc = getchar_func(ctx,
+                                       curpacket->packet->length,
                                        curpacket->packet->data);
+                       }
                        inpacket = false;
                } else {
-                       fprintf(stderr, "Unexpected character: 0x%X\n",
+                       logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
                }
        }
@@ -314,7 +326,8 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                         0xFF;
                                putchar_func(ctx, 1, &curchar);
                        } else {
-                               fputs("Unsupported new format length.\n", stderr);
+                               logthing(LOGTHING_ERROR,
+                                       "Unsupported new format length.");
                        }
                } else {
                        curchar |= (packets->packet->tag << 2);