X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ce8be6edbed5c435a8f957781a26e6f9eac6fcec..4d1212e60c60d000bc289e197fc0dccf98285bb1:/parsekey.c?ds=sidebyside

diff --git a/parsekey.c b/parsekey.c
index a498f4c..687fd9b 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>
@@ -54,7 +51,7 @@ int parse_keys(struct openpgp_packet_list *packets,
 			 * key (it should be a revocation), 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,
@@ -90,8 +87,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 +97,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 +163,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 +222,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 +289,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 +331,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.");