X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Ftools.c;h=ad541ddf1a0ca08726a2dca123c52182395a0864;hb=2eaed50b412bbec335b15321e058ed42b474dea3;hp=bc0cb767b3cbaa613723452761453117f0cf84f2;hpb=4d21dbb8f5715b561dfde34410dcc8b4473a0b27;p=citadel.git

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index bc0cb767b..ad541ddf1 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -292,7 +292,6 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
 	int breaklength = 68;
 	int readlength = 3 * breaklength / 4;
 
-	int t;
 	int destoffset;
 	int sourceoffset;
 	int sourceremaining;
@@ -318,17 +317,12 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
 			dest[destoffset++] = '\n';
 		}
 
-		t = destoffset;
-		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
-		if (t < destoffset) {
-			dest[destoffset++] = '\r';
-			dest[destoffset++] = '\n';
-		}
+		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
 	}
 	else {
 		destoffset = base64_encode_block(source, sourcelen, dest, &_state);
 
-		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
+		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
 	}
 	dest[destoffset] = 0;
 	return destoffset;