diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-11-10 21:00:07 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-11-10 21:00:07 +0800 |
| commit | e2919e15d1880c1ef76e5a2ffdd36f428dc05946 (patch) | |
| tree | f59c74ef72186f395e30ee23589c4f331ec015c9 /mail/em-format-html.c | |
| parent | bb90a934d50682e2ffc93d307664b20e6e54bee7 (diff) | |
| download | gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar.gz gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar.bz2 gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar.lz gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar.xz gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.tar.zst gsoc2013-evolution-e2919e15d1880c1ef76e5a2ffdd36f428dc05946.zip | |
changed for cipher context api changes. ditto.
2003-11-10 Not Zed <NotZed@Ximian.com>
* em-format-html.c (em_format_html_multipart_signed_sign): changed
for cipher context api changes.
* em-format.c (emf_multipart_signed): ditto.
2003-11-07 Not Zed <NotZed@Ximian.com>
* mail-config.glade: added security_information_dialog (probably
temporarily in this file).
* em-format.c (em_format_is_attachment): also treat pkcs7-mime as
non-attachment.
(emf_application_xpkcs7mime): no longer need to worry about
scanning the part.
svn path=/trunk/; revision=23243
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 09f45d8ceb..c2d2a153fd 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -909,7 +909,6 @@ static const struct { void em_format_html_multipart_signed_sign(EMFormat *emf, CamelStream *stream, CamelMimePart *part) { - CamelMimePart *spart; CamelMultipartSigned *mps; CamelCipherValidity *valid = NULL; CamelException ex; @@ -924,11 +923,8 @@ em_format_html_multipart_signed_sign(EMFormat *emf, CamelStream *stream, CamelMi /* FIXME: This sequence is also copied in em-format-html.c */ - spart = camel_multipart_get_part((CamelMultipart *)mps, CAMEL_MULTIPART_SIGNED_SIGNATURE); camel_exception_init(&ex); - if (spart == NULL) { - message = _("No signature present"); - } else if (emf->session == NULL) { + if (emf->session == NULL) { message = _("Session not initialised"); } else { CamelCipherContext *cipher = NULL; @@ -942,7 +938,7 @@ em_format_html_multipart_signed_sign(EMFormat *emf, CamelStream *stream, CamelMi if (cipher == NULL) { message = _("Unsupported signature format"); } else { - valid = camel_multipart_signed_verify(mps, cipher, &ex); + valid = camel_cipher_verify(cipher, part, &ex); camel_object_unref(cipher); if (valid) { good = camel_cipher_validity_get_valid(valid)?1:0; |