X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..348e7d134e9243fd72cf8fbe366c77c1571faec1:/armor.c?ds=sidebyside

diff --git a/armor.c b/armor.c
index 9f5c19a..bb0085e 100644
--- a/armor.c
+++ b/armor.c
@@ -6,11 +6,12 @@
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdlib.h>
 
 #include "armor.h"
+#include "config.h"
 #include "keystructs.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
@@ -34,7 +35,7 @@ static unsigned char encode64(unsigned char c) {
 	} else if (c == 63) {
 		c = '/';
 	} else {
-		assert(c < 64);
+		log_assert(c < 64);
 	}
 
 	return c;
@@ -100,16 +101,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);
@@ -130,7 +143,7 @@ static int armor_putchar_int(void *ctx, unsigned char c)
 	unsigned char t;
 	int i;
 
-	assert(ctx != NULL);
+	log_assert(ctx != NULL);
 	state = (struct armor_context *) ctx;
 
 	switch (state->curoctet++) {
@@ -175,6 +188,8 @@ static int armor_putchar(void *ctx, size_t count, unsigned char *c)
 {
 	int i;
 
+	log_assert(c != NULL);
+
 	for (i = 0; i < count; i++) {
 		armor_putchar_int(ctx, c[i]);
 	}
@@ -209,16 +224,19 @@ static void dearmor_init(struct dearmor_context *ctx)
 
 static void dearmor_finish(struct dearmor_context *state)
 {
-	// Check the checksum,
+	/*
+	 * Check the checksum
+	 */
 
 	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));
+	*/
 }
 
 
@@ -228,7 +246,7 @@ static int dearmor_getchar(void *ctx, unsigned char *c)
 	unsigned char tmpc;
 	int i;
 
-	assert(ctx != NULL);
+	log_assert(ctx != NULL);
 	state = (struct dearmor_context *) ctx;
 	*c = 0;
 	
@@ -303,10 +321,10 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
 	/*
 	 * Print armor header
 	 */
-	putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n"),
+	putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n") - 1,
 		(unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
-	putchar_func(ctx, sizeof("Version: onak " VERSION "\n\n"),
-		(unsigned char *) "Version: onak " VERSION "\n\n");
+	putchar_func(ctx, sizeof("Version: onak " PACKAGE_VERSION "\n\n") - 1,
+		(unsigned char *) "Version: onak " PACKAGE_VERSION "\n\n");
 	
 	armor_init(&armor_ctx);
 	armor_ctx.putchar_func = putchar_func;
@@ -317,7 +335,7 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
 	/*
 	 * Print armor footer
 	 */
-	putchar_func(ctx, sizeof("-----END PGP PUBLIC KEY BLOCK-----\n"),
+	putchar_func(ctx, sizeof("-----END PGP PUBLIC KEY BLOCK-----\n") - 1,
 		(unsigned char *) "-----END PGP PUBLIC KEY BLOCK-----\n");
 
 	return 0;
@@ -391,9 +409,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;
-		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
+		/*
+		 * TODO: Look for armor footer
+		 */
 	}
 
 	return 0;