aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-crypto.c4
-rw-r--r--mail/mail-format.c5
3 files changed, 10 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 69eb5721de..dfa6aa381f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-22 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-crypto.c (mail_crypto_is_rfc2015_signed): Helps if I spell
+ stuff correctly so it can pass the tests ;-)
+
2001-01-21 Jeffrey Stedfast <fejj@ximian.com>
* component-factory.c (owner_set_cb): Initialize OpenPGP.
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 7f1a34c54b..ae4ce6c803 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -66,7 +66,7 @@ mail_crypto_is_rfc2015_signed (CamelMimePart *mime_part)
/* check that we have a protocol param with the value: "application/pgp-signed" */
param = header_content_type_param (type, "protocol");
- if (!param || g_strcasecmp (param, "application/pgp-signed"))
+ if (!param || g_strcasecmp (param, "application/pgp-signature"))
return FALSE;
/* check that we have exactly 2 subparts */
@@ -86,7 +86,7 @@ mail_crypto_is_rfc2015_signed (CamelMimePart *mime_part)
/* The second part should be application/pgp-signature. */
part = camel_multipart_get_part (mp, 1);
type = camel_mime_part_get_content_type (part);
- if (!header_content_type_is (type, "application", "pgp-siganture"))
+ if (!header_content_type_is (type, "application", "pgp-signature"))
return FALSE;
/* FIXME: Implement multisig stuff */
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 6e110fb806..0651b71cd7 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1218,7 +1218,6 @@ handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
}
}
-/* FIXME: So this function is mostly just a place-holder for now */
static gboolean
handle_multipart_signed (CamelMimePart *part, const char *mime_type,
MailDisplay *md)
@@ -1237,8 +1236,10 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
camel_exception_init (&ex);
valid = pgp_mime_part_verify (part, &ex);
- if (camel_exception_is_set (&ex))
+ if (camel_exception_is_set (&ex)) {
+ /* FIXME: maybe we should warn the user? */
handle_multipart_mixed (part, mime_type, md);
+ }
return valid;
}