diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-06-15 04:15:04 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-06-15 04:15:04 +0800 |
| commit | 557afe41020d808811375ef02e4c1b822da5515e (patch) | |
| tree | 1c448df7f8b120aa7bd7bd6408cc4f5e6cc9e5d4 /camel/camel-multipart-signed.c | |
| parent | 46139c6d5d307b7391fe40d6ecc9d3ffb3c68c1b (diff) | |
| download | gsoc2013-evolution-557afe41020d808811375ef02e4c1b822da5515e.tar.gz gsoc2013-evolution-557afe41020d808811375ef02e4c1b822da5515e.tar.zst gsoc2013-evolution-557afe41020d808811375ef02e4c1b822da5515e.zip | |
Updated to use ctx->sign_protocol rather than ctx->protocol.
2002-06-14 Jeffrey Stedfast <fejj@ximian.com>
* 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
Diffstat (limited to 'camel/camel-multipart-signed.c')
| -rw-r--r-- | camel/camel-multipart-signed.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |