Fix onak.c to include version.h not config.h

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index 6bb77d8d7406376c5f4abcf5b80b173fc7356905..a192f77d18d8df0f624f67b2b54e2eac5fbb6a39 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -9,11 +9,11 @@
 #include <stdlib.h>
 
 #include "armor.h"
-#include "config.h"
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"
+#include "version.h"
 
 #define ARMOR_WIDTH 64
 
@@ -188,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]);
        }
@@ -321,8 +323,8 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
         */
        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 " PACKAGE_VERSION "\n\n") - 1,
-               (unsigned char *) "Version: onak " PACKAGE_VERSION "\n\n");
+       putchar_func(ctx, sizeof("Version: onak " ONAK_VERSION "\n\n") - 1,
+               (unsigned char *) "Version: onak " ONAK_VERSION "\n\n");
        
        armor_init(&armor_ctx);
        armor_ctx.putchar_func = putchar_func;