X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..156fd1c31592b821c170b5567b2fc81060359232:/parsekey.c

diff --git a/parsekey.c b/parsekey.c
index fbdde15..9cdb90c 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: parsekey.c,v 1.12 2003/09/30 17:40:41 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"
 
@@ -39,11 +42,16 @@ int add_key(struct openpgp_publickey *key) {
  *
  *	This function takes an list of OpenPGP packets and attempts to parse it
  *	into a list of public keys with signatures and subkeys.
+ *
+ *      Returns a count of how many keys we parsed.
  */
 int parse_keys(struct openpgp_packet_list *packets,
 		struct openpgp_publickey **keys)
 {
 	struct openpgp_publickey *curkey = NULL;
+	int count;
+
+	count = 0;
 
 	/*
 	 * If keys already has some keys in it then set curkey to the last one
@@ -89,6 +97,7 @@ int parse_keys(struct openpgp_packet_list *packets,
 			}
 			memset(curkey, 0, sizeof(*curkey));
 			curkey->publickey = packet_dup(packets->packet);
+			count++;
 			break;
 		case 13:
 		case 17:
@@ -120,13 +129,14 @@ 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;
 	}
 
-	return 0;
+	return count;
 }
 
 /**
@@ -169,6 +179,12 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 	bool				 inpacket = false;
 
 	assert(packets != NULL);
+	curpacket = *packets;
+	if (curpacket != NULL) {
+		while (curpacket->next != NULL) {
+			curpacket = curpacket->next;
+		}
+	}
 
 	while (!rc && !getchar_func(ctx, 1, &curchar)) {
 		if (!inpacket && (curchar & 0x80)) {
@@ -193,7 +209,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 
 			curpacket->packet->newformat = (curchar & 0x40);
 
-			// TODO: Better error checking on getchar_func.
+			/*
+			 * TODO: Better error checking on getchar_func.
+			 */
 			if (curpacket->packet->newformat) {
 				curpacket->packet->tag = (curchar & 0x3F);
 				rc = getchar_func(ctx, 1, &curchar);
@@ -207,7 +225,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) {
-					printf("Partial length; not supported.\n");
+					logthing(LOGTHING_NOTICE,
+						"Partial length;"
+						" not supported.\n");
 				} else if (curpacket->packet->length == 255) {
 					/*
 					 * 5 byte length; ie 255 followed by 3
@@ -253,18 +273,33 @@ 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,
-					curpacket->packet->data);
+				if (curpacket->packet->data == NULL) {
+					logthing(LOGTHING_ERROR, 
+						"Can't allocate memory for "
+						"packet!");
+					rc = -1;
+				} else {
+					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);
 		}
 	}
@@ -308,7 +343,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);
@@ -337,10 +373,8 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
 			}
 		}
 
-		putchar_func(ctx, packets->packet->length, packets->packet->data);
-//		for (i = 0; i < packets->packet->length; i++) {
-//			putchar_func(ctx, packets->packet->data[i]);
-//		}
+		putchar_func(ctx, packets->packet->length,
+				packets->packet->data);
 		packets = packets->next;
 	}
 	return 0;