/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 the Claws Mail team
+ * Copyright (C) 1999-2015 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_GPGME
#include <plugins/pgpcore/sgpgme.h>
#include <plugins/pgpcore/prefs_gpg.h>
#include <plugins/pgpcore/passphrase.h>
+#include <plugins/pgpcore/pgp_utils.h>
#include "prefs_common.h"
data->is_signed = FALSE;
data->sigstatus = NULL;
if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
- g_warning(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ g_warning("Couldn't initialize GPG context: %s", gpgme_strerror(err));
return NULL;
}
data = pgpmime_new_privacydata();
mimeinfo->privacy = (PrivacyData *) data;
}
-
- data->done_sigtest = TRUE;
- data->is_signed = TRUE;
+ if (data != NULL) {
+ data->done_sigtest = TRUE;
+ data->is_signed = TRUE;
+ }
return TRUE;
}
cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
- if (data->sigstatus == NULL &&
- prefs_gpg_get_config()->auto_check_signatures)
- pgpmime_check_signature(mimeinfo);
-
return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus);
}
cm_return_val_if_fail(data != NULL, g_strdup("Error"));
- if (data->sigstatus == NULL &&
- prefs_gpg_get_config()->auto_check_signatures)
- pgpmime_check_signature(mimeinfo);
-
return sgpgme_sigstat_info_short(data->ctx, data->sigstatus);
}
static gchar *pgpmime_get_sig_info_full(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
-
+
cm_return_val_if_fail(data != NULL, g_strdup("Error"));
- if (data->sigstatus == NULL &&
- prefs_gpg_get_config()->auto_check_signatures)
- pgpmime_check_signature(mimeinfo);
-
return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
}
{
MimeInfo *tmpinfo;
const gchar *tmpstr;
-
+ const gchar *begin_indicator = "-----BEGIN PGP MESSAGE-----";
+ const gchar *end_indicator = "-----END PGP MESSAGE-----";
+ gchar *textdata;
+
if (mimeinfo->type != MIMETYPE_MULTIPART)
return FALSE;
if (g_ascii_strcasecmp(mimeinfo->subtype, "encrypted"))
if (g_ascii_strcasecmp(tmpinfo->subtype, "octet-stream"))
return FALSE;
+ textdata = get_part_as_string(tmpinfo);
+ if (!textdata)
+ return FALSE;
+
+ if (!pgp_locate_armor_header(textdata, begin_indicator)) {
+ g_free(textdata);
+ return FALSE;
+ }
+ if (!pgp_locate_armor_header(textdata, end_indicator)) {
+ g_free(textdata);
+ return FALSE;
+ }
+
+ g_free(textdata);
+
return TRUE;
}
if (len > 0) {
if (fwrite(chars, 1, len, dstfp) < len) {
FILE_OP_ERROR(fname, "fwrite");
+ g_free(chars);
fclose(dstfp);
privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
g_free(fname);
return NULL;
}
}
+ g_free(chars);
+
if (fclose(dstfp) == EOF) {
FILE_OP_ERROR(fname, "fclose");
privacy_set_error(_("Couldn't close decrypted file %s"), fname);
data = pgpmime_new_privacydata();
decinfo->privacy = (PrivacyData *) data;
}
- data->done_sigtest = TRUE;
- data->is_signed = TRUE;
- data->sigstatus = sigstat;
- if (data->ctx)
- gpgme_release(data->ctx);
- data->ctx = ctx;
+ if (data != NULL) {
+ data->done_sigtest = TRUE;
+ data->is_signed = TRUE;
+ data->sigstatus = sigstat;
+ if (data->ctx)
+ gpgme_release(data->ctx);
+ data->ctx = ctx;
+ }
} else
gpgme_release(ctx);
fp = my_tmpfile();
if (fp == NULL) {
- privacy_set_error(_("Couldn't create temporary file: %s"), strerror(errno));
+ privacy_set_error(_("Couldn't create temporary file: %s"), g_strerror(errno));
return FALSE;
}
procmime_write_mimeinfo(mimeinfo, fp);
fp = my_tmpfile();
if (fp == NULL) {
perror("my_tmpfile");
- privacy_set_error(_("Couldn't create temporary file: %s"), strerror(errno));
+ privacy_set_error(_("Couldn't create temporary file: %s"), g_strerror(errno));
return FALSE;
}
procmime_write_mimeinfo(sigmultipart, fp);
}
prefs_gpg_enable_agent(prefs_gpg_get_config()->use_gpg_agent);
- if (getenv("GPG_AGENT_INFO") && prefs_gpg_get_config()->use_gpg_agent) {
+ if (g_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;
if (result && result->signatures) {
gpgme_new_signature_t sig = result->signatures;
if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
- micalg = g_strdup_printf("PGP-%s", gpgme_hash_algo_name(
- result->signatures->hash_algo));
+ gchar *down_algo = g_ascii_strdown(gpgme_hash_algo_name(
+ result->signatures->hash_algo), -1);
+ micalg = g_strdup_printf("pgp-%s", down_algo);
+ g_free(down_algo);
} else {
micalg = g_strdup(gpgme_hash_algo_name(
result->signatures->hash_algo));
g_warning("sgpgme_data_release_and_get_mem failed");
privacy_set_error(_("Data signing failed, no contents."));
g_free(micalg);
+ g_free(sigcontent);
return FALSE;
}
newinfo = procmime_mimeinfo_new();
newinfo->type = MIMETYPE_APPLICATION;
newinfo->subtype = g_strdup("pgp-signature");
- g_hash_table_insert(newinfo->typeparameters, g_strdup("name"),
- g_strdup("signature.asc"));
+ newinfo->description = g_strdup(_("OpenPGP digital signature"));
newinfo->content = MIMECONTENT_MEM;
- newinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
- g_hash_table_insert(newinfo->dispositionparameters, g_strdup("filename"),
- g_strdup("signature.asc"));
newinfo->data.mem = g_malloc(len + 1);
g_memmove(newinfo->data.mem, sigcontent, len);
newinfo->data.mem[len] = '\0';
/* write message content to temporary file */
fp = my_tmpfile();
if (fp == NULL) {
- privacy_set_error(_("Couldn't create temporary file, %s"), strerror(errno));
+ privacy_set_error(_("Couldn't create temporary file, %s"), g_strerror(errno));
g_free(kset);
return FALSE;
}
g_warning("sgpgme_data_release_and_get_mem failed");
privacy_set_error(_("Encryption failed, %s"), gpgme_strerror(err));
gpgme_release(ctx);
+ g_free(enccontent);
return FALSE;
}
pgpmime_encrypt,
pgpmime_get_encrypt_warning,
pgpmime_inhibit_encrypt_warning,
+ prefs_gpg_auto_check_signatures,
};
void pgpmime_init()