From 557afe41020d808811375ef02e4c1b822da5515e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 14 Jun 2002 20:15:04 +0000 Subject: Updated to use ctx->sign_protocol rather than ctx->protocol. 2002-06-14 Jeffrey Stedfast * camel-multipart-signed.c: Updated to use ctx->sign_protocol rather than ctx->protocol. * camel-cipher-context.h: Add an ecnryption protocol member. * camel-pgp-context.c (camel_pgp_context_init): Set the encryption protocol. svn path=/trunk/; revision=17186 --- camel/camel-multipart-signed.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'camel/camel-multipart-signed.c') diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c index 841abd0d13..cda9e6d429 100644 --- a/camel/camel-multipart-signed.c +++ b/camel/camel-multipart-signed.c @@ -580,7 +580,7 @@ camel_multipart_signed_sign(CamelMultipartSigned *mps, CamelCipherContext *conte char *type; /* this needs to be set */ - g_return_val_if_fail(context->protocol != NULL, -1); + g_return_val_if_fail(context->sign_protocol != NULL, -1); prepare_sign(content); @@ -613,8 +613,8 @@ camel_multipart_signed_sign(CamelMultipartSigned *mps, CamelCipherContext *conte /* create the signature wrapper object */ signature = camel_mime_part_new(); dw = camel_data_wrapper_new(); - type = alloca(strlen(context->protocol) + 32); - sprintf(type, "%s; name=signature.asc", context->protocol); + type = alloca(strlen(context->sign_protocol) + 32); + sprintf(type, "%s; name=signature.asc", context->sign_protocol); camel_data_wrapper_set_mime_type(dw, type); camel_stream_reset(sigstream); camel_data_wrapper_construct_from_stream(dw, sigstream); @@ -626,7 +626,7 @@ camel_multipart_signed_sign(CamelMultipartSigned *mps, CamelCipherContext *conte /* setup our mime type and boundary */ mime_type = header_content_type_new("multipart", "signed"); header_content_type_set_param(mime_type, "micalg", camel_cipher_hash_to_id(context, hash)); - header_content_type_set_param(mime_type, "protocol", context->protocol); + header_content_type_set_param(mime_type, "protocol", context->sign_protocol); camel_data_wrapper_set_mime_type_field(CAMEL_DATA_WRAPPER (mps), mime_type); header_content_type_unref(mime_type); camel_multipart_set_boundary((CamelMultipart *)mps, NULL); -- cgit v1.2.3