[evolution-data-server/gnome-2-30] Bug #608620 - Use CRLF in signed & encrypted S/MIME messages

[Milan Crha <mcrha src gnome org>]

commit 15af721689f213a42eab311bb380a3ded9638101
Author: dev+gnome <dev+gnome seantek com>
Date:   Tue Apr 27 16:49:44 2010 +0200

    Bug #608620 - Use CRLF in signed & encrypted S/MIME messages

 camel/camel-smime-context.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index a8f3b4a..d531a82 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -1086,9 +1086,8 @@ sm_encrypt(CamelCipherContext *context, const gchar *userid, GPtrArray *recipien
 	}
 
 	/* FIXME: Stream the input */
-	/* FIXME: Canonicalise the input? */
 	mem = (CamelStreamMem *)camel_stream_mem_new();
-	camel_data_wrapper_write_to_stream((CamelDataWrapper *)ipart, (CamelStream *)mem);
+	camel_cipher_canonical_to_stream (ipart, CAMEL_MIME_FILTER_CANON_CRLF, (CamelStream *)mem);
 	if (NSS_CMSEncoder_Update(enc, (gchar *) mem->buffer->data, mem->buffer->len) != SECSuccess) {
 		NSS_CMSEncoder_Cancel(enc);
 		camel_object_unref(mem);