/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
- * This file (C) 2004 Colin Leroy <colin@colino.net>
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Colin Leroy and 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
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_GPGME
#include <glib/gi18n.h>
#include <errno.h>
#include <gpgme.h>
+#include <file-utils.h>
#include "utils.h"
#include "privacy.h"
#include <plugins/pgpcore/sgpgme.h>
#include <plugins/pgpcore/prefs_gpg.h>
#include <plugins/pgpcore/passphrase.h>
+#include <plugins/pgpcore/pgp_utils.h>
#include "quoted-printable.h"
-#include "base64.h"
#include "codeconv.h"
#include "plugin.h"
static PrivacyDataPGP *pgpinline_new_privacydata()
{
PrivacyDataPGP *data;
+ gpgme_error_t err;
data = g_new0(PrivacyDataPGP, 1);
data->data.system = &pgpinline_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) {
+ debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
+ return NULL;
+ }
return data;
}
g_free(data);
}
-static gchar *fp_read_noconv(FILE *fp)
-{
- GByteArray *array;
- guchar buf[BUFSIZ];
- gint n_read;
- gchar *result = NULL;
-
- if (!fp)
- return NULL;
- array = g_byte_array_new();
-
- while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
- if (n_read < sizeof(buf) && ferror(fp))
- break;
- g_byte_array_append(array, buf, n_read);
- }
-
- if (ferror(fp)) {
- FILE_OP_ERROR("file stream", "fread");
- g_byte_array_free(array, TRUE);
- return NULL;
- }
-
- buf[0] = '\0';
- g_byte_array_append(array, buf, 1);
- result = (gchar *)array->data;
- g_byte_array_free(array, FALSE);
-
- return result;
-}
-
-static gchar *get_part_as_string(MimeInfo *mimeinfo)
-{
- gchar *textdata = NULL;
-
- g_return_val_if_fail(mimeinfo != NULL, 0);
- procmime_decode_content(mimeinfo);
- if (mimeinfo->content == MIMECONTENT_MEM)
- textdata = g_strdup(mimeinfo->data.mem);
- else {
- /* equals file_read_to_str but without conversion */
- FILE *fp = fopen(mimeinfo->data.filename, "r");
- if (!fp)
- return NULL;
- textdata = fp_read_noconv(fp);
- fclose(fp);
- }
-
- if (!g_utf8_validate(textdata, -1, NULL)) {
- gchar *tmp = NULL;
- codeconv_set_strict(TRUE);
- if (procmime_mimeinfo_get_parameter(mimeinfo, "charset")) {
- tmp = conv_codeset_strdup(textdata,
- procmime_mimeinfo_get_parameter(mimeinfo, "charset"),
- CS_UTF_8);
- }
- if (!tmp) {
- tmp = conv_codeset_strdup(textdata,
- conv_get_locale_charset_str_no_utf8(),
- CS_UTF_8);
- }
- codeconv_set_strict(FALSE);
- if (!tmp) {
- tmp = conv_codeset_strdup(textdata,
- conv_get_locale_charset_str_no_utf8(),
- CS_UTF_8);
- }
- if (tmp) {
- g_free(textdata);
- textdata = tmp;
- }
- }
-
- return textdata;
-}
-
static gboolean pgpinline_is_signed(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = NULL;
const gchar *sig_indicator = "-----BEGIN PGP SIGNED MESSAGE-----";
gchar *textdata, *sigpos;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (procmime_mimeinfo_parent(mimeinfo) == NULL)
return FALSE; /* not parent */
return data->is_signed;
}
- textdata = get_part_as_string(mimeinfo);
+ textdata = procmime_get_part_as_string(mimeinfo, TRUE);
if (!textdata)
return FALSE;
data = pgpinline_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;
}
PrivacyDataPGP *data = NULL;
gchar *textdata = NULL, *tmp = NULL;
gpgme_data_t plain = NULL, cipher = NULL;
- gpgme_ctx_t ctx;
-
- g_return_val_if_fail(mimeinfo != NULL, 0);
+ gpgme_error_t err;
- if (procmime_mimeinfo_parent(mimeinfo) == NULL)
+ cm_return_val_if_fail(mimeinfo != NULL, 0);
+
+ if (procmime_mimeinfo_parent(mimeinfo) == NULL) {
+ privacy_set_error(_("Incorrect part"));
return 0; /* not parent */
- if (mimeinfo->type != MIMETYPE_TEXT)
+ }
+ if (mimeinfo->type != MIMETYPE_TEXT) {
+ privacy_set_error(_("Not a text part"));
+ debug_print("type %d\n", mimeinfo->type);
return 0;
-
- g_return_val_if_fail(mimeinfo->privacy != NULL, 0);
+ }
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, 0);
data = (PrivacyDataPGP *) mimeinfo->privacy;
- textdata = get_part_as_string(mimeinfo);
-
+ textdata = procmime_get_part_as_string(mimeinfo, TRUE);
+
if (!textdata) {
g_free(textdata);
privacy_set_error(_("Couldn't get text data."));
conv_get_locale_charset_str_no_utf8());
}
if (!tmp) {
- g_warning("Can't convert charset to anything sane\n");
+ g_warning("Can't convert charset to anything sane");
tmp = conv_codeset_strdup(textdata, CS_UTF_8, CS_US_ASCII);
}
g_free(textdata);
textdata = g_strdup(tmp);
g_free(tmp);
- gpgme_new(&ctx);
- gpgme_set_textmode(ctx, 1);
- gpgme_set_armor(ctx, 1);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ g_free(textdata);
+ return 0;
+ }
+ gpgme_set_textmode(data->ctx, 1);
+ gpgme_set_armor(data->ctx, 1);
- gpgme_data_new_from_mem(&plain, textdata, strlen(textdata), 1);
+ gpgme_data_new_from_mem(&plain, textdata, (size_t)strlen(textdata), 1);
gpgme_data_new(&cipher);
- data->sigstatus = sgpgme_verify_signature(ctx, plain, NULL, cipher);
+ data->sigstatus = sgpgme_verify_signature(data->ctx, plain, NULL, cipher);
gpgme_data_release(plain);
gpgme_data_release(cipher);
static SignatureStatus pgpinline_get_sig_status(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
-
- g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
- if (data->sigstatus == NULL &&
- prefs_gpg_get_config()->auto_check_signatures)
- pgpinline_check_signature(mimeinfo);
+ cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus);
}
static gchar *pgpinline_get_sig_info_short(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
-
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
- if (data->sigstatus == NULL &&
- prefs_gpg_get_config()->auto_check_signatures)
- pgpinline_check_signature(mimeinfo);
-
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
+
return sgpgme_sigstat_info_short(data->ctx, data->sigstatus);
}
{
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"));
return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
}
-
-
static gboolean pgpinline_is_encrypted(MimeInfo *mimeinfo)
{
- const gchar *enc_indicator = "-----BEGIN PGP MESSAGE-----";
+ const gchar *begin_indicator = "-----BEGIN PGP MESSAGE-----";
+ const gchar *end_indicator = "-----END PGP MESSAGE-----";
gchar *textdata;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (procmime_mimeinfo_parent(mimeinfo) == NULL)
return FALSE; /* not parent */
g_free(mimeinfo->subtype);
mimeinfo->subtype = g_strdup("plain");
}
-
- textdata = get_part_as_string(mimeinfo);
+
+ textdata = procmime_get_part_as_string(mimeinfo, TRUE);
if (!textdata)
return FALSE;
-
- if (!strstr(textdata, enc_indicator)) {
+
+ 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;
}
gpgme_ctx_t ctx;
gchar *chars;
size_t len;
+ const gchar *begin_indicator = "-----BEGIN PGP MESSAGE-----";
+ const gchar *end_indicator = "-----END PGP MESSAGE-----";
+ gchar *pos;
if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
return NULL;
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
if (procmime_mimeinfo_parent(mimeinfo) == NULL ||
mimeinfo->type != MIMETYPE_TEXT) {
return NULL;
}
- textdata = get_part_as_string(mimeinfo);
+ textdata = procmime_get_part_as_string(mimeinfo, TRUE);
if (!textdata) {
gpgme_release(ctx);
privacy_set_error(_("Couldn't get text data."));
}
debug_print("decrypting '%s'\n", textdata);
- gpgme_data_new_from_mem(&cipher, textdata, strlen(textdata), 1);
+ gpgme_data_new_from_mem(&cipher, textdata, (size_t)strlen(textdata), 1);
plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
if (sigstat && !sigstat->signatures)
fname = g_strdup_printf("%s%cplaintext.%08x",
get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
- if ((dstfp = g_fopen(fname, "wb")) == NULL) {
- FILE_OP_ERROR(fname, "fopen");
+ if ((dstfp = claws_fopen(fname, "wb")) == NULL) {
+ FILE_OP_ERROR(fname, "claws_fopen");
privacy_set_error(_("Couldn't open decrypted file %s"), fname);
g_free(fname);
gpgme_data_release(plain);
if (src_codeset == NULL)
src_codeset = CS_ISO_8859_1;
- fprintf(dstfp, "MIME-Version: 1.0\r\n"
+ if (fprintf(dstfp, "MIME-Version: 1.0\r\n"
"Content-Type: text/plain; charset=%s\r\n"
"Content-Transfer-Encoding: 8bit\r\n"
"\r\n",
- src_codeset);
-
- chars = gpgme_data_release_and_get_mem(plain, &len);
- if (len > 0)
- fwrite(chars, len, 1, dstfp);
+ src_codeset) < 0) {
+ FILE_OP_ERROR(fname, "fprintf");
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+
+ /* Store any part before encrypted text */
+ pos = pgp_locate_armor_header(textdata, begin_indicator);
+ if (pos != NULL && (pos - textdata) > 0) {
+ if (claws_fwrite(textdata, 1, pos - textdata, dstfp) < pos - textdata) {
+ FILE_OP_ERROR(fname, "claws_fwrite");
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+ }
+
+ if (claws_fwrite(_("\n--- Start of PGP/Inline encrypted data ---\n"), 1,
+ strlen(_("\n--- Start of PGP/Inline encrypted data ---\n")),
+ dstfp) < strlen(_("\n--- Start of PGP/Inline encrypted data ---\n"))) {
+ FILE_OP_ERROR(fname, "claws_fwrite");
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+ chars = sgpgme_data_release_and_get_mem(plain, &len);
+ if (len > 0) {
+ if (claws_fwrite(chars, 1, len, dstfp) < len) {
+ FILE_OP_ERROR(fname, "claws_fwrite");
+ g_free(chars);
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+ }
+ g_free(chars);
+ /* Store any part after encrypted text */
+ if (claws_fwrite(_("--- End of PGP/Inline encrypted data ---\n"), 1,
+ strlen(_("--- End of PGP/Inline encrypted data ---\n")),
+ dstfp) < strlen(_("--- End of PGP/Inline encrypted data ---\n"))) {
+ FILE_OP_ERROR(fname, "claws_fwrite");
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+ if (pos != NULL) {
+ pos = pgp_locate_armor_header(pos, end_indicator);
+ if (pos != NULL && *pos != '\0') {
+ pos += strlen(end_indicator);
+ if (claws_fwrite(pos, 1, strlen(pos), dstfp) < strlen(pos)) {
+ FILE_OP_ERROR(fname, "claws_fwrite");
+ privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+ goto FILE_ERROR;
+ }
+ }
+ }
- fclose(dstfp);
+ if (claws_safe_fclose(dstfp) == EOF) {
+ FILE_OP_ERROR(fname, "claws_fclose");
+ privacy_set_error(_("Couldn't close decrypted file %s"), fname);
+ g_free(fname);
+ gpgme_data_release(plain);
+ gpgme_release(ctx);
+ return NULL;
+ }
- gpgme_data_release(plain);
-
parseinfo = procmime_scan_file(fname);
g_free(fname);
}
g_node_unlink(decinfo->node);
- procmime_mimeinfo_free_all(parseinfo);
+ procmime_mimeinfo_free_all(&parseinfo);
decinfo->tmp = TRUE;
data = pgpinline_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);
return decinfo;
+
+FILE_ERROR:
+ claws_fclose(dstfp);
+ g_free(fname);
+ gpgme_data_release(plain);
+ gpgme_release(ctx);
+ return NULL;
}
-static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
+static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from_addr)
{
MimeInfo *msgcontent;
gchar *textstr, *tmp;
gchar *sigcontent;
gpgme_ctx_t ctx;
gpgme_data_t gpgtext, gpgsig;
- guint len;
+ size_t len;
gpgme_error_t err;
struct passphrase_cb_info_s info;
gpgme_sign_result_t result = NULL;
/* get content node from message */
msgcontent = (MimeInfo *) mimeinfo->node->children->data;
- if (msgcontent->type == MIMETYPE_MULTIPART)
+ if (msgcontent->type == MIMETYPE_MULTIPART) {
+ if (!msgcontent->node->children) {
+ debug_print("msgcontent->node->children NULL, bailing\n");
+ privacy_set_error(_("Malformed message"));
+ return FALSE;
+ }
msgcontent = (MimeInfo *) msgcontent->node->children->data;
-
+ }
/* get rid of quoted-printable or anything */
procmime_decode_content(msgcontent);
fp = my_tmpfile();
if (fp == NULL) {
perror("my_tmpfile");
- privacy_set_error(_("Couldn't create temporary file."));
+ privacy_set_error(_("Couldn't create temporary file, %s"), g_strerror(errno));
return FALSE;
}
procmime_write_mimeinfo(msgcontent, fp);
rewind(fp);
/* read temporary file into memory */
- textstr = fp_read_noconv(fp);
+ textstr = file_read_stream_to_str_no_recode(fp);
- fclose(fp);
+ claws_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\n"), 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);
- 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 (!g_getenv("GPG_AGENT_INFO") || !prefs_gpg_get_config()->use_gpg_agent) {
info.c = ctx;
gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
}
}
- sigcontent = gpgme_data_release_and_get_mem(gpgsig, &len);
-
- gpgme_release(ctx);
+ sigcontent = sgpgme_data_release_and_get_mem(gpgsig, &len);
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."));
gpgme_data_release(gpgtext);
g_free(textstr);
g_free(sigcontent);
+ gpgme_release(ctx);
return FALSE;
}
tmp = g_malloc(len+1);
- g_memmove(tmp, sigcontent, len+1);
+ memmove(tmp, sigcontent, len+1);
tmp[len] = '\0';
gpgme_data_release(gpgtext);
g_free(textstr);
if (msgcontent->content == MIMECONTENT_FILE &&
msgcontent->data.filename != NULL) {
if (msgcontent->tmp == TRUE)
- g_unlink(msgcontent->data.filename);
+ claws_unlink(msgcontent->data.filename);
g_free(msgcontent->data.filename);
}
msgcontent->data.mem = g_strdup(tmp);
* chars
*/
procmime_encode_content(msgcontent, ENC_BASE64);
-
+ gpgme_release(ctx);
+
return TRUE;
}
return sgpgme_get_encrypt_data(recp_names, GPGME_PROTOCOL_OpenPGP);
}
+static const gchar *pgpinline_get_encrypt_warning(void)
+{
+ if (prefs_gpg_should_skip_encryption_warning(pgpinline_system.id))
+ return NULL;
+ else
+ return _("Please note that attachments are not encrypted by "
+ "the PGP/Inline system, nor are email headers, like Subject.");
+}
+
+static void pgpinline_inhibit_encrypt_warning(gboolean inhibit)
+{
+ if (inhibit)
+ prefs_gpg_add_skip_encryption_warning(pgpinline_system.id);
+ else
+ prefs_gpg_remove_skip_encryption_warning(pgpinline_system.id);
+}
+
static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
{
MimeInfo *msgcontent;
FILE *fp;
gchar *enccontent;
- guint len;
+ size_t len;
gchar *textstr, *tmp;
gpgme_data_t gpgtext, gpgenc;
gpgme_ctx_t ctx;
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\n"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ g_free(kset);
+ return FALSE;
+ }
i = 0;
while (fprs[i] && strlen(fprs[i])) {
gpgme_key_t key;
if (err) {
debug_print("can't add key '%s'[%d] (%s)\n", fprs[i],i, gpgme_strerror(err));
privacy_set_error(_("Couldn't add GPG key %s, %s"), fprs[i], gpgme_strerror(err));
+ g_free(kset);
return FALSE;
}
debug_print("found %s at %d\n", fprs[i], i);
/* get content node from message */
msgcontent = (MimeInfo *) mimeinfo->node->children->data;
- if (msgcontent->type == MIMETYPE_MULTIPART)
+ if (msgcontent->type == MIMETYPE_MULTIPART) {
+ if (!msgcontent->node->children) {
+ debug_print("msgcontent->node->children NULL, bailing\n");
+ privacy_set_error(_("Malformed message"));
+ g_free(kset);
+ return FALSE;
+ }
msgcontent = (MimeInfo *) msgcontent->node->children->data;
-
+ }
/* get rid of quoted-printable or anything */
procmime_decode_content(msgcontent);
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));
perror("my_tmpfile");
+ g_free(kset);
return FALSE;
}
procmime_write_mimeinfo(msgcontent, fp);
rewind(fp);
/* read temporary file into memory */
- textstr = fp_read_noconv(fp);
+ textstr = file_read_stream_to_str_no_recode(fp);
- fclose(fp);
+ claws_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_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ g_free(kset);
+ return FALSE;
+ }
gpgme_set_armor(ctx, 1);
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);
+ g_free(kset);
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_data_release(gpgtext);
g_free(textstr);
+ gpgme_release(ctx);
+ g_free(enccontent);
return FALSE;
}
tmp = g_malloc(len+1);
- g_memmove(tmp, enccontent, len+1);
+ memmove(tmp, enccontent, len+1);
tmp[len] = '\0';
g_free(enccontent);
if (msgcontent->content == MIMECONTENT_FILE &&
msgcontent->data.filename != NULL) {
if (msgcontent->tmp == TRUE)
- g_unlink(msgcontent->data.filename);
+ claws_unlink(msgcontent->data.filename);
g_free(msgcontent->data.filename);
}
msgcontent->data.mem = g_strdup(tmp);
msgcontent->content = MIMECONTENT_MEM;
g_free(tmp);
+ gpgme_release(ctx);
return TRUE;
}
TRUE,
pgpinline_get_encrypt_data,
pgpinline_encrypt,
+ pgpinline_get_encrypt_warning,
+ pgpinline_inhibit_encrypt_warning,
+ prefs_gpg_auto_check_signatures,
};
void pgpinline_init()
projects / claws.git / blobdiff