X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=armor.c;h=1341950c77af48152e1f7c8189c0c66d03217e1f;hb=db700de99a954f1d88d15b28b386bc5b5e694df7;hp=9b61b1acde9ce17832907cfae5a8302771b4089a;hpb=e0dd4d10f385cd19da389ec66622eea8aa66ae59;p=onak.git
diff --git a/armor.c b/armor.c
index 9b61b1a..1341950 100644
--- a/armor.c
+++ b/armor.c
@@ -14,17 +14,16 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
#include
+#include "build-config.h"
+
#include "armor.h"
#include "keystructs.h"
-#include "onak-conf.h"
#include "parsekey.h"
-#include "version.h"
/**
* @brief Line length we'll use for armored output
@@ -331,11 +330,9 @@ 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") - 1,
- (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
- putchar_func(ctx, sizeof("Version: onak " ONAK_VERSION "\n\n") - 1,
- (unsigned char *) "Version: onak " ONAK_VERSION "\n\n");
-
+ putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n") - 1,
+ (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n");
+
armor_init(&armor_ctx);
armor_ctx.putchar_func = putchar_func;
armor_ctx.ctx = ctx;