From 9c7a001a2631b7603883cacfb470ec58a472efcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 16 Aug 2016 07:01:21 +0200 Subject: New pgp-encode helper function, write_string. --- pgp-encode.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pgp-encode.c') diff --git a/pgp-encode.c b/pgp-encode.c index 983d5a23..fc78e7f6 100644 --- a/pgp-encode.c +++ b/pgp-encode.c @@ -339,7 +339,11 @@ pgp_crc24(unsigned length, const uint8_t *data) } -#define WRITE(buffer, s) (nettle_buffer_write(buffer, strlen((s)), (s))) +static int +write_string (struct nettle_buffer *buffer, const char *s) +{ + return nettle_buffer_write(buffer, strlen((s)), (const uint8_t *) (s)); +} /* 15 base 64 groups data per line */ #define BINARY_PER_LINE 45 @@ -357,9 +361,9 @@ pgp_armor(struct nettle_buffer *buffer, base64_encode_init(&ctx); - if (! (WRITE(buffer, "BEGIN PGP ") - && WRITE(buffer, tag) - && WRITE(buffer, "\nComment: Nettle\n\n"))) + if (! (write_string(buffer, "BEGIN PGP ") + && write_string(buffer, tag) + && write_string(buffer, "\nComment: Nettle\n\n"))) return 0; for (; @@ -414,7 +418,7 @@ pgp_armor(struct nettle_buffer *buffer, base64_encode_group(p, crc); } - return (WRITE(buffer, "\nBEGIN PGP ") - && WRITE(buffer, tag) + return (write_string(buffer, "\nBEGIN PGP ") + && write_string(buffer, tag) && NETTLE_BUFFER_PUTC(buffer, '\n')); } -- cgit v1.2.1