X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6938a097fb6c1cda197b18f868808c860e832bb9..393d83b8760584006eaefd6fc370abead228e02a:/armor.c?ds=inline diff --git a/armor.c b/armor.c index e24787e..6d3fc13 100644 --- a/armor.c +++ b/armor.c @@ -4,15 +4,13 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: armor.c,v 1.8 2003/11/01 19:23:38 noodles Exp $ */ -#include #include #include "armor.h" #include "keystructs.h" +#include "log.h" #include "onak-conf.h" #include "parsekey.h" @@ -36,7 +34,7 @@ static unsigned char encode64(unsigned char c) { } else if (c == 63) { c = '/'; } else { - assert(c < 64); + log_assert(c < 64); } return c; @@ -144,7 +142,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++) { @@ -245,7 +243,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;