callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for e-account smime info changes. Also enforce having a signing

Browse Source 
2003-10-31  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (build_message): fix for e-account smime info
        changes.  Also enforce having a signing certificate set in
        preferences before doing any signing.
        (from_changed_cb): handle smime sign/encrypt default for account
        (create_composer): force a from-changed when we start, to properly
        setup signing options.

svn path=/trunk/; revision=23146
This commit is contained in:
Not Zed
2003-10-31 05:04:11 +00:00
committed by Michael Zucci
parent bb9da6fb0c
commit 211e8e8b45
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
composer/ChangeLog
View File

@ -1,3 +1,12 @@
2003-10-31 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c (build_message): fix for e-account smime info
changes. Also enforce having a signing certificate set in
preferences before doing any signing.
(from_changed_cb): handle smime sign/encrypt default for account
(create_composer): force a from-changed when we start, to properly
setup signing options.
2003-10-30 Not Zed <NotZed@Ximian.com> 2003-10-30 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c: Turn on SMIME_SUPPORTED. * e-msg-composer.c: Turn on SMIME_SUPPORTED.

42
composer/e-msg-composer.c
View File

@ -647,7 +647,6 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED) #if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
if (composer->smime_sign || composer->smime_encrypt) { if (composer->smime_sign || composer->smime_encrypt) {
CamelInternetAddress *from = NULL; CamelInternetAddress *from = NULL;
const char *smime_userid;
CamelCipherContext *cipher; CamelCipherContext *cipher;
part = camel_mime_part_new(); part = camel_mime_part_new();
@ -656,11 +655,16 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
camel_mime_part_set_encoding(part, plain_encoding); camel_mime_part_set_encoding(part, plain_encoding);
camel_object_unref(current); camel_object_unref(current);
if (hdrs->account && hdrs->account->smime_key && *hdrs->account->smime_key) { if (composer->smime_sign
smime_userid = hdrs->account->smime_key; && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
} else { camel_exception_setv(&ex, 1, _("Cannot sign outgoing message: No signing certificate set for from account"));
from = e_msg_composer_hdrs_get_from(hdrs); goto exception;
camel_internet_address_get(from, 0, NULL, &smime_userid); }
if (composer->smime_encrypt
&& (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
camel_exception_setv(&ex, 1, _("Cannot encrypt outgoing message: No encryption certificate set for from account"));
goto exception;
} }
if (composer->smime_sign) { if (composer->smime_sign) {
@ -685,8 +689,10 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
cipher = camel_smime_context_new(session); cipher = camel_smime_context_new(session);
camel_smime_context_set_sign_mode((CamelSMIMEContext *)cipher, CAMEL_SMIME_SIGN_ENVELOPED); camel_smime_context_set_sign_mode((CamelSMIMEContext *)cipher, CAMEL_SMIME_SIGN_ENVELOPED);
camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
spart = camel_mime_part_new(); spart = camel_mime_part_new();
camel_cipher_sign(cipher, smime_userid, CAMEL_CIPHER_HASH_SHA1, mem, spart, &ex); camel_cipher_sign(cipher, hdrs->account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, mem, spart, &ex);
camel_object_unref(mem); camel_object_unref(mem);
camel_object_unref(cipher); camel_object_unref(cipher);
if (camel_exception_is_set(&ex)) { if (camel_exception_is_set(&ex)) {
@ -698,10 +704,13 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
} else { } else {
CamelMultipartSigned *mps; CamelMultipartSigned *mps;
/* FIXME: this should probably be part of the cipher::sign() api */
cipher = camel_smime_context_new(session); cipher = camel_smime_context_new(session);
if (hdrs->account && hdrs->account->smime_encrypt_key && *hdrs->account->smime_encrypt_key)
camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
/* FIXME: this should probably be part of the cipher::sign() api */
mps = camel_multipart_signed_new(); mps = camel_multipart_signed_new();
camel_multipart_signed_sign(mps, cipher, part, smime_userid, CAMEL_CIPHER_HASH_SHA1, &ex); camel_multipart_signed_sign(mps, cipher, part, hdrs->account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, &ex);
camel_object_unref(cipher); camel_object_unref(cipher);
if (camel_exception_is_set(&ex)) { if (camel_exception_is_set(&ex)) {
@ -720,17 +729,19 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
if (composer->smime_encrypt) { if (composer->smime_encrypt) {
/* check to see if we should encrypt to self, NB removed after use */ /* check to see if we should encrypt to self, NB removed after use */
if (hdrs->account && hdrs->account->smime_encrypt_to_self && smime_userid) if (hdrs->account->smime_encrypt_to_self)
g_ptr_array_add(recipients, (char *)smime_userid); g_ptr_array_add(recipients, hdrs->account->smime_encrypt_key);
cipher = camel_smime_context_new(session); cipher = camel_smime_context_new(session);
camel_cipher_encrypt(cipher, smime_userid, recipients, part, (CamelMimePart *)new, &ex); camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);
camel_cipher_encrypt(cipher, NULL, recipients, part, (CamelMimePart *)new, &ex);
camel_object_unref(cipher); camel_object_unref(cipher);
if (camel_exception_is_set(&ex)) if (camel_exception_is_set(&ex))
goto exception; goto exception;
if (hdrs->account && hdrs->account->smime_encrypt_to_self && smime_userid) if (hdrs->account->smime_encrypt_to_self)
g_ptr_array_set_size(recipients, recipients->len - 1); g_ptr_array_set_size(recipients, recipients->len - 1);
} }
@ -2384,7 +2395,8 @@ from_changed_cb (EMsgComposerHdrs *hdrs, void *data)
account->pgp_always_sign && account->pgp_always_sign &&
(!account->pgp_no_imip_sign || !composer->mime_type || (!account->pgp_no_imip_sign || !composer->mime_type ||
strncasecmp (composer->mime_type, "text/calendar", 13) != 0)); strncasecmp (composer->mime_type, "text/calendar", 13) != 0));
e_msg_composer_set_smime_sign (composer, account->smime_always_sign); e_msg_composer_set_smime_sign (composer, account->smime_sign_default);
e_msg_composer_set_smime_encrypt (composer, account->smime_encrypt_default);
update_auto_recipients (hdrs, UPDATE_AUTO_CC, account->always_cc ? account->cc_addrs : NULL); update_auto_recipients (hdrs, UPDATE_AUTO_CC, account->always_cc ? account->cc_addrs : NULL);
update_auto_recipients (hdrs, UPDATE_AUTO_BCC, account->always_bcc ? account->bcc_addrs : NULL); update_auto_recipients (hdrs, UPDATE_AUTO_BCC, account->always_bcc ? account->bcc_addrs : NULL);
} else { } else {
@ -3001,6 +3013,8 @@ create_composer (int visible_mask)
prepare_signatures_menu (composer); prepare_signatures_menu (composer);
setup_signatures_menu (composer); setup_signatures_menu (composer);
from_changed_cb(composer->hdrs, composer);
/* Editor component. */ /* Editor component. */
composer->editor = bonobo_widget_new_control ( composer->editor = bonobo_widget_new_control (
GNOME_GTKHTML_EDITOR_CONTROL_ID, GNOME_GTKHTML_EDITOR_CONTROL_ID,