aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-crypto.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9031c30b4c..9f62c34d31 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2001-04-11 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-crypto.c (pgp_mime_part_verify): Huh, somehow I forgot to
+ apply the from filter when verifying signed parts. Oh well,
+ probably not all that common. Fixed now though.
+
+2001-04-11 Jeffrey Stedfast <fejj@ximian.com>
+
* mail-callbacks.c (save_msg): Use the homedir as the default
filename.
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 0a5d1b06ee..51a64cc09d 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -397,7 +397,7 @@ pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
CamelMultipart *multipart;
CamelMimePart *part, *sigpart;
CamelStreamFilter *filtered_stream;
- CamelMimeFilter *crlf_filter;
+ CamelMimeFilter *crlf_filter, *from_filter;
CamelStream *stream;
GByteArray *content, *signature;
PgpValidity *valid;
@@ -417,9 +417,12 @@ pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
stream = camel_stream_mem_new ();
camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), content);
crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
+ from_filter = CAMEL_MIME_FILTER (camel_mime_filter_from_new ());
filtered_stream = camel_stream_filter_new_with_stream (stream);
camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
camel_object_unref (CAMEL_OBJECT (crlf_filter));
+ camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (from_filter));
+ camel_object_unref (CAMEL_OBJECT (from_filter));
camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
camel_object_unref (CAMEL_OBJECT (filtered_stream));
camel_object_unref (CAMEL_OBJECT (stream));