From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 13 Apr 2015 22:37:39 +0000 (+0200)
Subject: Make base64 encoding not add random linebreak/feed characters.
X-Git-Tag: Release_902~167^2~39
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=4e567f2a85608cc801193319701cb79fdf169eb2;hp=b768970c892b1d382fc9b2bf946757882e939214;p=citadel.git

Make base64 encoding not add random linebreak/feed characters.
---

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);