X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=parsekey.c;h=ed61e24d16be5e556a527cfbfa80bc4f10e6beaa;hb=fe4482ac9d5350ad0803073781a6244f5cb6aa5c;hp=aedbd14d8361a395b71d18abe7ee92eec4298c0d;hpb=e0dd4d10f385cd19da389ec66622eea8aa66ae59;p=onak.git

diff --git a/parsekey.c b/parsekey.c
index aedbd14..ed61e24 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -137,7 +137,7 @@ int parse_keys(struct openpgp_packet_list *packets,
 				packet_dup(packets->packet));
 			break;
 		case OPENPGP_PACKET_TRUST:
-		case 61:
+		case OPENPGP_PACKET_COMMENT:
 			/*
 			 * One of:
 			 *
@@ -191,10 +191,9 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 				int maxnum)
 {
 	unsigned char			 curchar = 0;
-	struct openpgp_packet_list	*curpacket = NULL;
+	struct openpgp_packet_list	*curpacket = NULL, **packetend = NULL;
 	onak_status_t			 rc = ONAK_E_OK;
 	int				 keys = 0;
-	bool				 inpacket = false;
 
 	if (packets == NULL)
 		return ONAK_E_INVALID_PARAM;
@@ -206,20 +205,20 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 		}
 	}
 
-	while (!rc && (maxnum == 0 || keys < maxnum) &&
+	while (rc == ONAK_E_OK && (maxnum == 0 || keys < maxnum) &&
 			!getchar_func(ctx, 1, &curchar)) {
-		if (!inpacket && (curchar & 0x80)) {
+		if (curchar & 0x80) {
 			/*
-			 * New packet. Record the fact we're in a packet and
-			 * allocate memory for it.
+			 * New packet. Allocate memory for it.
 			 */
-			inpacket = true;
 			if (curpacket != NULL) {
 				curpacket->next = malloc(sizeof (*curpacket));
+				packetend = &curpacket->next;
 				curpacket = curpacket->next;
 			} else {
 				*packets = curpacket =
 					malloc(sizeof (*curpacket));
+				packetend = packets;
 			}
 			memset(curpacket, 0, sizeof(*curpacket));
 			curpacket->packet =
@@ -234,7 +233,10 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 			 */
 			if (curpacket->packet->newformat) {
 				curpacket->packet->tag = (curchar & 0x3F);
-				rc = getchar_func(ctx, 1, &curchar);
+				if (getchar_func(ctx, 1, &curchar)) {
+					rc = ONAK_E_INVALID_PKT;
+					break;
+				}
 				curpacket->packet->length = curchar;
 				if (curpacket->packet->length > 191 &&
 					curpacket->packet->length < 224) {
@@ -245,55 +247,90 @@ onak_status_t 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) {
-					return ONAK_E_UNSUPPORTED_FEATURE;
+					free(curpacket->packet);
+					curpacket->packet = NULL;
+					rc = ONAK_E_UNSUPPORTED_FEATURE;
 				} else if (curpacket->packet->length == 255) {
 					/*
 					 * 5 byte length; ie 255 followed by 3
 					 * bytes of MSB length.
 					 */
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length = curchar;
 					curpacket->packet->length <<= 8;
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length += curchar;
 					curpacket->packet->length <<= 8;
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length += curchar;
 					curpacket->packet->length <<= 8;
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length += curchar;
 				}
 			} else {
 				curpacket->packet->tag = (curchar & 0x3C) >> 2;
 				switch (curchar & 3) {
 				case 0:
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length = curchar;
 					break;
 				case 1:
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length = curchar;
 					curpacket->packet->length <<= 8;
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length += curchar;
 					break;
 				case 2:
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length = 
 						(curchar << 24);
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length +=
 						(curchar << 16);
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length +=
 						(curchar << 8);
-					rc = getchar_func(ctx, 1, &curchar);
+					if (getchar_func(ctx, 1, &curchar)) {
+						rc = ONAK_E_INVALID_PKT;
+						break;
+					}
 					curpacket->packet->length += curchar;
 					break;
 				case 3:
 					rc = ONAK_E_UNSUPPORTED_FEATURE;
-					curpacket->packet->length = 0;
-					curpacket->packet->data = NULL;
+					free(curpacket->packet);
+					curpacket->packet = NULL;
 					break;
 				}
 			}
@@ -314,12 +351,17 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 						curpacket->packet->data);
 				}
 			}
-			inpacket = false;
 		} else {
 			rc = ONAK_E_INVALID_PKT;
 		}
 	}
 
+	/* Trim the last packet if it doesn't actually exist */
+	if (packetend != NULL && (*packetend)->packet == NULL) {
+		free(*packetend);
+		*packetend = NULL;
+	}
+
 	return (rc);
 }