Various compiler warning cleanups.

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index a498f4c0e606d15a6f1a636739a68a9de35bf2b6..0367e2d1a927dd0f71631e569f5d582b05c8c7eb 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: parsekey.c,v 1.17 2003/10/11 21:52:18 noodles Exp $
+ * $Id: parsekey.c,v 1.20 2004/05/27 21:55:38 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -225,13 +225,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 <<= 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 <<= 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 <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);

-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;

                                }
                        } else {
                                curpacket->packet->tag = (curchar & 0x3C) >> 2;
                                }
                        } else {
                                curpacket->packet->tag = (curchar & 0x3C) >> 2;


@@ -292,6 +292,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                } else {
                        logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
                } else {
                        logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);

+                       rc = 1;

                }
        }
 
                }
        }
 


@@ -333,6 +334,28 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
                                curchar = (packets->packet->length - 192) &
                                         0xFF;
                                putchar_func(ctx, 1, &curchar);
                                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.");
                        } else {
                                logthing(LOGTHING_ERROR,
                                        "Unsupported new format length.");