From 79adce4c855c03160e37e6b65553369ca9c04e10 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 14 Apr 2015 00:37:39 +0200 Subject: [PATCH] Make base64 encoding not add random linebreak/feed characters. --- libcitadel/lib/b64/cencode.c | 1 + libcitadel/lib/tools.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libcitadel/lib/b64/cencode.c b/libcitadel/lib/b64/cencode.c index e440f3784..64720f6cf 100644 --- a/libcitadel/lib/b64/cencode.c +++ b/libcitadel/lib/b64/cencode.c @@ -92,6 +92,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in) case step_A: break; } + *codechar++ = '\r'; *codechar++ = '\n'; return codechar - code_out; diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c index bc0cb767b..ff35f9eca 100644 --- a/libcitadel/lib/tools.c +++ b/libcitadel/lib/tools.c @@ -320,10 +320,6 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li t = destoffset; destoffset += base64_encode_blockend(&(dest[destoffset]), &_state); - if (t < destoffset) { - dest[destoffset++] = '\r'; - dest[destoffset++] = '\n'; - } } else { destoffset = base64_encode_block(source, sourcelen, dest, &_state); -- 2.30.2