X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ce8be6edbed5c435a8f957781a26e6f9eac6fcec..5b3f77c7fbafb036d20a1577ed74f475e94ed821:/parsekey.c?ds=inline

diff --git a/parsekey.c b/parsekey.c
index a498f4c..6e080af 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -4,11 +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>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,10 +48,9 @@ int parse_keys(struct openpgp_packet_list *packets,
 		case 2:
 			/*
 			 * It's a signature packet. Add it to either the public
-			 * key (it should be a revocation), to the current UID
-			 * or the current subkey.
+			 * key, 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,
@@ -65,8 +61,25 @@ int parse_keys(struct openpgp_packet_list *packets,
 					packet_dup(packets->packet));
 			} else {
 				ADD_PACKET_TO_LIST_END(curkey,
-					revocation,
+					sig,
 					packet_dup(packets->packet));
+				/*
+				 * This is a signature on the public key; check
+				 * if it's a revocation.
+				 */
+				if (packets->packet->data[0] == 3 &&
+					packets->packet->data[2] == 0x20) {
+					/*
+					 * Type 3 key, 0x20 == revocation
+					 */
+					curkey->revoked = true;
+				} else if (packets->packet->data[0] == 4 &&
+					packets->packet->data[1] == 0x20) {
+					/*
+					 * Type 4 key, 0x20 == revocation
+					 */
+					curkey->revoked = true;
+				}
 			}
 			break;
 		case 6:
@@ -90,8 +103,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));
@@ -100,7 +113,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));
@@ -166,7 +179,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 	int				 keys = 0;
 	bool				 inpacket = false;
 
-	assert(packets != NULL);
+	log_assert(packets != NULL);
 	curpacket = *packets;
 	if (curpacket != NULL) {
 		while (curpacket->next != NULL) {
@@ -225,13 +238,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;
@@ -292,6 +305,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 		} else {
 			logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
 				curchar);
+			rc = 1;
 		}
 	}
 
@@ -333,6 +347,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.");
@@ -396,9 +432,9 @@ int flatten_publickey(struct openpgp_publickey *key,
 		}
 
 		/*
-		 * Now do any revocation signatures on the main key.
+		 * Now do any signatures on the main key.
 		 */
-		for (tmplist = key->revocations; tmplist != NULL;
+		for (tmplist = key->sigs; tmplist != NULL;
 				tmplist = tmplist->next) {
 			ADD_PACKET_TO_LIST((*list_end),
 					packet_dup(tmplist->packet));