X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/62c94dacbe471278972813b59776a5fadbd8a543..6938a097fb6c1cda197b18f868808c860e832bb9:/parsekey.c

diff --git a/parsekey.c b/parsekey.c
index 4ec7ef3..a498f4c 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.17 2003/10/11 21:52:18 noodles Exp $
  */
 
 #include <assert.h>
@@ -15,23 +17,10 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.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.
@@ -126,7 +115,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;
@@ -145,7 +135,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);
@@ -158,6 +148,7 @@ int debug_packet(struct openpgp_packet *packet)
  *	@getchar_func: The function to get the next character from the stream.
  *	@ctx: A pointer to the context structure for getchar_func.
  *	@packets: The outputted list of packets.
+ *	@maxnum: The maximum number of keys to read. 0 means unlimited.
  *
  *	This function uses getchar_func to read characters from an OpenPGP
  *	packet stream and reads the packets into a linked list of packets
@@ -166,24 +157,31 @@ int debug_packet(struct openpgp_packet *packet)
 int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 				unsigned char *c),
 				void *ctx,
-				struct openpgp_packet_list **packets)
+				struct openpgp_packet_list **packets,
+				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);
+	curpacket = *packets;
+	if (curpacket != NULL) {
+		while (curpacket->next != NULL) {
+			curpacket = curpacket->next;
+		}
+	}
 
-	while (!rc && !getchar_func(ctx, 1, &curchar)) {
+	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;
-			count = 0;
 			if (curpacket != NULL) {
 				curpacket->next = malloc(sizeof (*curpacket));
 				curpacket = curpacket->next;
@@ -199,7 +197,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);
@@ -213,7 +213,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.");
 				} else if (curpacket->packet->length == 255) {
 					/*
 					 * 5 byte length; ie 255 followed by 3
@@ -259,7 +261,8 @@ 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;
@@ -268,16 +271,26 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 			}
 
 			if (rc == 0) {
+				if (curpacket->packet->tag == 6) {
+					keys++;
+				}
 				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);
 		}
 	}
@@ -321,7 +334,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);
@@ -350,10 +364,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;