/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2009 the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
static PrivacyDataPGP *pgpmime_new_privacydata()
{
PrivacyDataPGP *data;
+ gpgme_error_t err;
data = g_new0(PrivacyDataPGP, 1);
data->data.system = &pgpmime_system;
data->done_sigtest = FALSE;
data->is_signed = FALSE;
data->sigstatus = NULL;
- gpgme_new(&data->ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ g_warning(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return NULL;
+ }
return data;
}
const gchar *protocol;
PrivacyDataPGP *data = NULL;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
data = (PrivacyDataPGP *) mimeinfo->privacy;
if (data->done_sigtest)
gchar *textstr;
gpgme_data_t sigdata = NULL, textdata = NULL;
gpgme_error_t err;
- g_return_val_if_fail(mimeinfo != NULL, -1);
- g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, -1);
data = (PrivacyDataPGP *) mimeinfo->privacy;
- gpgme_new(&data->ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return 0;
+ }
+
debug_print("Checking PGP/MIME signature\n");
parent = procmime_mimeinfo_parent(mimeinfo);
fp = g_fopen(parent->data.filename, "rb");
- g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
if (!boundary) {
privacy_set_error(_("Signature boundary not found."));
+ fclose(fp);
return 0;
}
textstr = get_canonical_content(fp, boundary);
- err = gpgme_data_new_from_mem(&textdata, textstr, strlen(textstr), 0);
+ err = gpgme_data_new_from_mem(&textdata, textstr, (size_t)strlen(textstr), 0);
if (err) {
debug_print ("gpgme_data_new_from_mem failed: %s\n",
gpgme_strerror (err));
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
gpgme_error_t err;
if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
- privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
return NULL;
}
- g_return_val_if_fail(pgpmime_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(pgpmime_is_encrypted(mimeinfo), NULL);
encinfo = (MimeInfo *) g_node_nth_child(mimeinfo->node, 1)->data;
return NULL;
}
- fprintf(dstfp, "MIME-Version: 1.0\n");
+ if (fprintf(dstfp, "MIME-Version: 1.0\n") < 0) {
+ FILE_OP_ERROR(fname, "fprintf");
+ fclose(dstfp);
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ g_free(fname);
+ gpgme_data_release(plain);
+ gpgme_release(ctx);
+ debug_print("can't open!\n");
+ return NULL;
+ }
- chars = gpgme_data_release_and_get_mem(plain, &len);
- if (len > 0)
- fwrite(chars, len, 1, dstfp);
- fclose(dstfp);
+ chars = sgpgme_data_release_and_get_mem(plain, &len);
+ if (len > 0) {
+ if (fwrite(chars, 1, len, dstfp) < len) {
+ FILE_OP_ERROR(fname, "fwrite");
+ fclose(dstfp);
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ g_free(fname);
+ gpgme_data_release(plain);
+ gpgme_release(ctx);
+ debug_print("can't open!\n");
+ return NULL;
+ }
+ }
+ if (fclose(dstfp) == EOF) {
+ FILE_OP_ERROR(fname, "fclose");
+ privacy_set_error(_("Couldn't close decrypted file %s"), fname);
+ g_free(fname);
+ gpgme_data_release(plain);
+ gpgme_release(ctx);
+ debug_print("can't open!\n");
+ return NULL;
+ }
parseinfo = procmime_scan_file(fname);
g_free(fname);
return decinfo;
}
-gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
+gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from_addr)
{
MimeInfo *msgcontent, *sigmultipart, *newinfo;
gchar *textstr, *micalg;
fclose(fp);
- gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
+ gpgme_data_new_from_mem(&gpgtext, textstr, (size_t)strlen(textstr), 0);
gpgme_data_new(&gpgsig);
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
gpgme_signers_clear (ctx);
- if (!sgpgme_setup_signers(ctx, account)) {
+ if (!sgpgme_setup_signers(ctx, account, from_addr)) {
gpgme_release(ctx);
return FALSE;
}
- if (getenv("GPG_AGENT_INFO")) {
+ prefs_gpg_enable_agent(prefs_gpg_get_config()->use_gpg_agent);
+ if (getenv("GPG_AGENT_INFO") && prefs_gpg_get_config()->use_gpg_agent) {
debug_print("GPG_AGENT_INFO environment defined, running without passphrase callback\n");
} else {
info.c = ctx;
return FALSE;
}
- gpgme_release(ctx);
- sigcontent = gpgme_data_release_and_get_mem(gpgsig, &len);
+ sigcontent = sgpgme_data_release_and_get_mem(gpgsig, &len);
gpgme_data_release(gpgtext);
g_free(textstr);
if (sigcontent == NULL || len <= 0) {
- g_warning("gpgme_data_release_and_get_mem failed");
+ g_warning("sgpgme_data_release_and_get_mem failed");
privacy_set_error(_("Data signing failed, no contents."));
return FALSE;
}
g_node_append(sigmultipart->node, newinfo->node);
g_free(sigcontent);
+ gpgme_release(ctx);
return TRUE;
}
return sgpgme_get_encrypt_data(recp_names, GPGME_PROTOCOL_OpenPGP);
}
+static const gchar *pgpmime_get_encrypt_warning(void)
+{
+ if (prefs_gpg_should_skip_encryption_warning(pgpmime_system.id))
+ return NULL;
+ else
+ return _("Please note that email headers, like Subject, "
+ "are not encrypted by the PGP/Mime system.");
+}
+
+static void pgpmime_inhibit_encrypt_warning(gboolean inhibit)
+{
+ if (inhibit)
+ prefs_gpg_add_skip_encryption_warning(pgpmime_system.id);
+ else
+ prefs_gpg_remove_skip_encryption_warning(pgpmime_system.id);
+}
+
gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
{
MimeInfo *msgcontent, *encmultipart, *newinfo;
kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
i = 0;
while (fprs[i] && strlen(fprs[i])) {
gpgme_key_t key;
fclose(fp);
/* encrypt data */
- gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
+ gpgme_data_new_from_mem(&gpgtext, textstr, (size_t)strlen(textstr), 0);
gpgme_data_new(&gpgenc);
gpgme_set_armor(ctx, 1);
- gpgme_data_rewind(gpgtext);
+ cm_gpgme_data_rewind(gpgtext);
err = gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
- gpgme_release(ctx);
- enccontent = gpgme_data_release_and_get_mem(gpgenc, &len);
+ enccontent = sgpgme_data_release_and_get_mem(gpgenc, &len);
gpgme_data_release(gpgtext);
g_free(textstr);
if (enccontent == NULL || len <= 0) {
- g_warning("gpgme_data_release_and_get_mem failed");
+ g_warning("sgpgme_data_release_and_get_mem failed");
privacy_set_error(_("Encryption failed, %s"), gpgme_strerror(err));
+ gpgme_release(ctx);
return FALSE;
}
g_node_append(encmultipart->node, newinfo->node);
g_free(enccontent);
+ gpgme_release(ctx);
return TRUE;
}
TRUE,
pgpmime_get_encrypt_data,
pgpmime_encrypt,
+ pgpmime_get_encrypt_warning,
+ pgpmime_inhibit_encrypt_warning,
};
void pgpmime_init()
projects / claws.git / blobdiff