diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-multipart-signed.c | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index eaecfaccf7..3c115e6232 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2002-12-15 Jeffrey Stedfast <fejj@ximian.com> + + * camel-multipart-signed.c (camel_multipart_signed_verify): Don't + apply the CANON_STRIP filter here, since we are verifying whatever + raw data we received (all we want to do is convert o the canonical + CRLF format). + 2002-12-10 Jeffrey Stedfast <fejj@ximian.com> * camel-mime-filter-tohtml.c (html_convert): Use camel-url-scanner diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c index cda9e6d429..9bf7054b87 100644 --- a/camel/camel-multipart-signed.c +++ b/camel/camel-multipart-signed.c @@ -586,7 +586,8 @@ camel_multipart_signed_sign(CamelMultipartSigned *mps, CamelCipherContext *conte mem = camel_stream_mem_new(); filter = camel_stream_filter_new_with_stream(mem); - + + /* Note: see rfc2015 or rfc3156, section 5 */ canon_filter = camel_mime_filter_canon_new(CAMEL_MIME_FILTER_CANON_STRIP|CAMEL_MIME_FILTER_CANON_CRLF|CAMEL_MIME_FILTER_CANON_FROM); camel_stream_filter_add(filter, (CamelMimeFilter *)canon_filter); camel_object_unref((CamelObject *)canon_filter); @@ -683,9 +684,9 @@ camel_multipart_signed_verify(CamelMultipartSigned *mps, CamelCipherContext *con sub = camel_seekable_substream_new((CamelSeekableStream *)((CamelDataWrapper *)mps)->stream, mps->start1, mps->end1); constream = (CamelStream *)camel_stream_filter_new_with_stream(sub); camel_object_unref((CamelObject *)sub); - + /* Note: see rfc2015 or rfc3156, section 5 */ - canon_filter = camel_mime_filter_canon_new(CAMEL_MIME_FILTER_CANON_STRIP|CAMEL_MIME_FILTER_CANON_CRLF); + canon_filter = camel_mime_filter_canon_new (CAMEL_MIME_FILTER_CANON_CRLF); camel_stream_filter_add((CamelStreamFilter *)constream, (CamelMimeFilter *)canon_filter); camel_object_unref((CamelObject *)canon_filter); } |