aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-04-13 05:25:52 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-04-13 05:25:52 +0800
commita125cbdcb54527ce541b10f28ca543807aee419a (patch)
tree8256c00441687f7b6b0e4e6584f19e60331d29df /mail
parent0417c81c051f9180a38a6ac0054646bf5877e8b0 (diff)
downloadgsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar.gz
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar.bz2
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar.lz
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar.xz
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.tar.zst
gsoc2013-evolution-a125cbdcb54527ce541b10f28ca543807aee419a.zip
Use the CamelCipherHash enum. (mail_crypto_pgp_mime_part_verify): Use a
2001-04-12 Jeffrey Stedfast <fejj@ximian.com> * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the CamelCipherHash enum. (mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity. * mail-format.c (try_inline_pgp_sig): Updated to use CamelCipherValidity instead of CamelPgpValidity. (handle_multipart_signed): Same. svn path=/trunk/; revision=9284
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/mail-crypto.c8
-rw-r--r--mail/mail-crypto.h6
-rw-r--r--mail/mail-format.c22
4 files changed, 28 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2883c49ebf..5c9a533f90 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-12 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the
+ CamelCipherHash enum.
+ (mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity.
+
+ * mail-format.c (try_inline_pgp_sig): Updated to use
+ CamelCipherValidity instead of CamelPgpValidity.
+ (handle_multipart_signed): Same.
+
2001-04-12 Dan Winship <danw@ximian.com>
* folder-browser.c (do_message_selected, on_message_selected):
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index e77893c4af..7613f11eef 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -48,7 +48,7 @@ mail_crypto_is_smime_v3_signed (CamelMimePart *mime_part)
if (!header_content_type_is (type, "multipart", "signed"))
return FALSE;
- /* check that we have a protocol param with the value: "application/pgp-signed" */
+ /* check that we have a protocol param with the value: "application/pkcs7-signature" */
param = header_content_type_param (type, "protocol");
if (!param || g_strcasecmp (param, "application/pkcs7-signature"))
return FALSE;
@@ -133,7 +133,7 @@ mail_crypto_is_pkcs7_mime (CamelMimePart *mime_part)
* #ex will be set and #part will remain untouched.
**/
void
-mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part, const char *userid, CamelPgpHashType hash, CamelException *ex)
+mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part, const char *userid, CamelCipherHash hash, CamelException *ex)
{
CamelPgpContext *context;
@@ -151,11 +151,11 @@ mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part, const char *userid, C
*
* Returns a PgpValidity on success or NULL on fail.
**/
-CamelPgpValidity *
+CamelCipherValidity *
mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
{
CamelPgpContext *context;
- CamelPgpValidity *valid;
+ CamelCipherValidity *valid;
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
mail_config_get_pgp_path ());
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index a96e856d5b..1f90665f3a 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -36,11 +36,11 @@ gboolean mail_crypto_is_pkcs7_mime (CamelMimePart *mime_part);
void mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part,
const char *userid,
- CamelPgpHashType hash,
+ CamelCipherHash hash,
CamelException *ex);
-CamelPgpValidity *mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part,
- CamelException *ex);
+CamelCipherValidity *mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part,
+ CamelException *ex);
void mail_crypto_pgp_mime_part_encrypt (CamelMimePart **mime_part,
GPtrArray *recipients,
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 05144611bc..3903c56fc9 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1101,7 +1101,7 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
{
CamelPgpContext *context;
CamelStream *ciphertext;
- CamelPgpValidity *valid;
+ CamelCipherValidity *valid;
CamelException *ex;
char *end;
@@ -1128,7 +1128,7 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
mail_text_write (md->html, md->stream, "%.*s", end - start, start);
/* Now display the "seal-of-authenticity" or something... */
- if (valid && camel_pgp_validity_get_valid (valid)) {
+ if (valid && camel_cipher_validity_get_valid (valid)) {
mail_html_write (md->html, md->stream,
"<hr>\n<table><tr valign=top>"
"<td><img src=\"%s\"></td>"
@@ -1146,16 +1146,16 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
"not be proven to be authentic."));
}
- if (valid && camel_pgp_validity_get_description (valid)) {
+ if (valid && camel_cipher_validity_get_description (valid)) {
mail_error_write (md->html, md->stream,
- camel_pgp_validity_get_description (valid));
+ camel_cipher_validity_get_description (valid));
mail_html_write (md->html, md->stream, "<br><br>");
}
mail_html_write (md->html, md->stream, "</font></td></table>");
-
+
camel_exception_free (ex);
- camel_pgp_validity_free (valid);
+ camel_cipher_validity_free (valid);
return end;
}
@@ -1489,7 +1489,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
CamelMultipart *mp;
CamelException *ex;
gboolean output = FALSE;
- CamelPgpValidity *valid;
+ CamelCipherValidity *valid;
int nparts, i;
wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
@@ -1517,7 +1517,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
}
/* Now display the "seal-of-authenticity" or something... */
- if (valid && camel_pgp_validity_get_valid (valid)) {
+ if (valid && camel_cipher_validity_get_valid (valid)) {
mail_html_write (md->html, md->stream,
"<hr>\n<table><tr valign=top>"
"<td><img src=\"%s\"></td>"
@@ -1535,16 +1535,16 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
"not be proven to be authentic."));
}
- if (valid && camel_pgp_validity_get_description (valid)) {
+ if (valid && camel_cipher_validity_get_description (valid)) {
mail_error_write (md->html, md->stream,
- camel_pgp_validity_get_description (valid));
+ camel_cipher_validity_get_description (valid));
mail_html_write (md->html, md->stream, "<br><br>");
}
mail_html_write (md->html, md->stream, "</font></td></table>");
camel_exception_free (ex);
- camel_pgp_validity_free (valid);
+ camel_cipher_validity_free (valid);
return TRUE;
}