From a125cbdcb54527ce541b10f28ca543807aee419a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 12 Apr 2001 21:25:52 +0000 Subject: Use the CamelCipherHash enum. (mail_crypto_pgp_mime_part_verify): Use a 2001-04-12 Jeffrey Stedfast * 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 --- mail/mail-crypto.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail-crypto.c') 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 ()); -- cgit v1.2.3