X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=parsekey.c;h=fb9cf83e25b0ce33c0a0a4b2e454cebd04c179d6;hb=995abb98512fb6ecf7a4529f8e3890a17839cfe0;hp=a498f4c0e606d15a6f1a636739a68a9de35bf2b6;hpb=ce8be6edbed5c435a8f957781a26e6f9eac6fcec;p=onak.git

diff --git a/parsekey.c b/parsekey.c
index a498f4c..fb9cf83 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -4,8 +4,6 @@
  * 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>
@@ -225,13 +223,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 +290,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 +332,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.");