cscvs to tla changeset 99

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index d584deb3072f744bb30a251843a09be9401cc5c4..f2e97fcd791e04c1c8698c7824b32c61984a00d2 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: armor.c,v 1.5 2003/06/04 20:57:06 noodles Exp $
+ * $Id: armor.c,v 1.7 2003/09/30 20:40:10 noodles Exp $

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


@@ -211,16 +211,19 @@ static void dearmor_init(struct dearmor_context *ctx)
 
 static void dearmor_finish(struct dearmor_context *state)
 {
 
 static void dearmor_finish(struct dearmor_context *state)
 {

-       // Check the checksum,
+       /*
+        * Check the checksum
+        */

 
        state->crc24 &= 0xffffffL;
 
        state->crc24 &= 0xffffffL;

-//     state->putchar_func(state->ctx, '\n');
-//     state->putchar_func(state->ctx, '=');
-//     state->putchar_func(state->ctx, encode64(state->crc24 >> 18));
-//     state->putchar_func(state->ctx, encode64((state->crc24 >> 12) & 0x3F));
-//     state->putchar_func(state->ctx, encode64((state->crc24 >> 6) & 0x3F));
-//     state->putchar_func(state->ctx, encode64(state->crc24 & 0x3F));
-
+       /*
+       state->putchar_func(state->ctx, '\n');
+       state->putchar_func(state->ctx, '=');
+       state->putchar_func(state->ctx, encode64(state->crc24 >> 18));
+       state->putchar_func(state->ctx, encode64((state->crc24 >> 12) & 0x3F));
+       state->putchar_func(state->ctx, encode64((state->crc24 >> 6) & 0x3F));
+       state->putchar_func(state->ctx, encode64(state->crc24 & 0x3F));
+       */

 }
 
 
 }
 
 


@@ -393,9 +396,12 @@ 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;
                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);
                dearmor_finish(&dearmor_ctx);

-               // TODO: Look for armor footer
+               /*
+                * TODO: Look for armor footer
+                */

        }
 
        return 0;
        }
 
        return 0;