cscvs to tla changeset 137

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index 3f47f64f01637a46b14390a658f557e71a555ea6..e24787e122d878777a0e8ed88c4580c40796a785 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: armor.c,v 1.6 2003/06/07 13:45:34 noodles Exp $
+ * $Id: armor.c,v 1.8 2003/11/01 19:23:38 noodles Exp $
  */
 
 #include <assert.h>
@@ -102,16 +102,28 @@ static void armor_finish(struct armor_context *state)
                state->putchar_func(state->ctx, 1, &c);
                state->putchar_func(state->ctx, 1, (unsigned char *) "=");
                state->putchar_func(state->ctx, 1, (unsigned char *) "=");
+               state->count += 3;
+               if ((state->count % ARMOR_WIDTH) == 0) {
+                       state->putchar_func(state->ctx, 1,
+                                (unsigned char *) "\n");
+               }
                break;
        case 2:
                c = encode64((state->lastoctet & 0xF) << 2);
                state->putchar_func(state->ctx, 1, &c);
                state->putchar_func(state->ctx, 1, (unsigned char *) "=");
+               state->count += 2;
+               if ((state->count % ARMOR_WIDTH) == 0) {
+                       state->putchar_func(state->ctx, 1,
+                                (unsigned char *) "\n");
+               }
                break;
        }
 
        state->crc24 &= 0xffffffL;
-       state->putchar_func(state->ctx, 1, (unsigned char *) "\n");
+       if ((state->count % ARMOR_WIDTH) != 0) {
+               state->putchar_func(state->ctx, 1, (unsigned char *) "\n");
+       }
        state->putchar_func(state->ctx, 1, (unsigned char *) "=");
        c = encode64(state->crc24 >> 18);
        state->putchar_func(state->ctx, 1, &c);
@@ -396,7 +408,8 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                dearmor_init(&dearmor_ctx);
                dearmor_ctx.getchar_func = getchar_func;
                dearmor_ctx.ctx = ctx;
-               read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx, packets);
+               read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx,
+                       packets, 0);
                dearmor_finish(&dearmor_ctx);
                /*
                 * TODO: Look for armor footer