aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-pgp-mime.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-05-15 05:14:34 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-05-15 05:14:34 +0800
commit9d1641a5734ec763a34e90882340d79f6eb5e374 (patch)
treeaea53aa6d951b161ab8ee68c4d38382d1634b533 /camel/camel-pgp-mime.c
parent05817ac1224ed1fc9853095b312dfface4fd3479 (diff)
downloadgsoc2013-evolution-9d1641a5734ec763a34e90882340d79f6eb5e374.tar.gz
gsoc2013-evolution-9d1641a5734ec763a34e90882340d79f6eb5e374.tar.zst
gsoc2013-evolution-9d1641a5734ec763a34e90882340d79f6eb5e374.zip
Add camel-smime-context.[c,h] and camel-smime.[c,h] to the build.
2001-05-14 Jeffrey Stedfast <fejj@ximian.com> * Makefile.am: Add camel-smime-context.[c,h] and camel-smime.[c,h] to the build. * camel-smime.[c,h]: New source files for manipulating S/MIME message parts. svn path=/trunk/; revision=9799
Diffstat (limited to 'camel/camel-pgp-mime.c')
-rw-r--r--camel/camel-pgp-mime.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index a9eef4e7cc..ba91804579 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -244,6 +244,20 @@ camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, c
/* construct the signature stream */
sigstream = camel_stream_mem_new ();
+ switch (hash) {
+ case CAMEL_CIPHER_HASH_MD5:
+ hash_type = "pgp-md5";
+ break;
+ case CAMEL_CIPHER_HASH_SHA1:
+ hash_type = "pgp-sha1";
+ break;
+ default:
+ /* set a reasonable default */
+ hash = CAMEL_CIPHER_HASH_SHA1;
+ hash_type = "pgp-sha1";
+ break;
+ }
+
/* get the signature */
if (camel_pgp_sign (context, userid, hash, stream, sigstream, ex) == -1) {
camel_object_unref (CAMEL_OBJECT (stream));
@@ -269,20 +283,6 @@ camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, c
camel_object_unref (CAMEL_OBJECT (sigstream));
/* construct the container multipart/signed */
- switch (hash) {
- case CAMEL_CIPHER_HASH_MD5:
- hash_type = "pgp-md5";
- break;
- case CAMEL_CIPHER_HASH_SHA1:
- hash_type = "pgp-sha1";
- break;
- default:
- /* set a reasonable default */
- hash = CAMEL_CIPHER_HASH_SHA1;
- hash_type = "pgp-sha1";
- break;
- }
-
multipart = camel_multipart_new ();
mime_type = header_content_type_new ("multipart", "signed");