2011-01-06 [colin] 3.7.8cvs30
[claws.git] / src / plugins / pgpinline / pgpinline.c
index d81521d1dd4922eb40a134a939973ce2b1e57238..52df2610fbc673bcaac340c69c4184af1378f731 100644 (file)
@@ -1,11 +1,11 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
- * This file (C) 2004 Colin Leroy <colin@colino.net>
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> 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,
@@ -14,8 +14,8 @@
  * 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
@@ -26,6 +26,8 @@
 
 #include "defs.h"
 #include <glib.h>
+#include <glib/gi18n.h>
+#include <errno.h>
 #include <gpgme.h>
 
 #include "utils.h"
@@ -38,6 +40,7 @@
 #include "quoted-printable.h"
 #include "base64.h"
 #include "codeconv.h"
+#include "plugin.h"
 
 extern struct GPGConfig prefs_gpg;
 
@@ -60,13 +63,17 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo);
 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"), gpgme_strerror(err));
+               return NULL;
+       }
        
        return data;
 }
@@ -112,18 +119,29 @@ static gchar *fp_read_noconv(FILE *fp)
 static gchar *get_part_as_string(MimeInfo *mimeinfo)
 {
        gchar *textdata = NULL;
+       gchar *filename = NULL;
+       FILE *fp;
 
-       g_return_val_if_fail(mimeinfo != NULL, 0);
+       cm_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)
+               filename = procmime_get_tmp_file_name(mimeinfo);
+               if (procmime_get_part(filename, mimeinfo) < 0) {
+                       printf("error dumping file\n");
                        return NULL;
+               }
+               fp = g_fopen(filename,"rb");
+               if (!fp) {
+                       printf("error reading file\n");
+                       return NULL;
+               }
                textdata = fp_read_noconv(fp);
                fclose(fp);
+               g_unlink(filename);
+               g_free(filename);
        }
 
        if (!g_utf8_validate(textdata, -1, NULL)) {
@@ -160,7 +178,7 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo)
        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 */
@@ -215,22 +233,27 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
        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);
-       
+
        if (!textdata) {
                g_free(textdata);
+               privacy_set_error(_("Couldn't get text data."));
                return 0;
        }
 
@@ -247,20 +270,26 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
        }
        g_free(textdata);
 
-       if (!tmp)
+       if (!tmp) {
+               privacy_set_error(_("Couldn't convert text data to any sane charset."));
                return 0;
-
+       }
        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"), 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);
@@ -274,7 +303,7 @@ static SignatureStatus pgpinline_get_sig_status(MimeInfo *mimeinfo)
 {
        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)
@@ -287,7 +316,7 @@ static gchar *pgpinline_get_sig_info_short(MimeInfo *mimeinfo)
 {
        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)
@@ -300,7 +329,7 @@ static gchar *pgpinline_get_sig_info_full(MimeInfo *mimeinfo)
 {
        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);
 }
@@ -312,7 +341,7 @@ static gboolean pgpinline_is_encrypted(MimeInfo *mimeinfo)
        const gchar *enc_indicator = "-----BEGIN 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 */
@@ -340,6 +369,7 @@ static gboolean pgpinline_is_encrypted(MimeInfo *mimeinfo)
        }
 
        g_free(textdata);
+
        return TRUE;
 }
 
@@ -357,6 +387,9 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
        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;
@@ -364,23 +397,25 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
        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) {
                gpgme_release(ctx);
+               privacy_set_error(_("Couldn't parse mime part."));
                return NULL;
        }
 
        textdata = get_part_as_string(mimeinfo);
        if (!textdata) {
                gpgme_release(ctx);
+               privacy_set_error(_("Couldn't get text data."));
                return NULL;
        }
 
        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)
@@ -398,6 +433,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
 
        if ((dstfp = g_fopen(fname, "wb")) == NULL) {
                FILE_OP_ERROR(fname, "fopen");
+               privacy_set_error(_("Couldn't open decrypted file %s"), fname);
                g_free(fname);
                gpgme_data_release(plain);
                gpgme_release(ctx);
@@ -408,25 +444,76 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
        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;
+       }
 
-       fclose(dstfp);
+       /* Store any part before encrypted text */
+       pos = strstr(textdata, begin_indicator);
+       if (pos != NULL && (pos - textdata) > 0) {
+           if (fwrite(textdata, 1, pos - textdata, dstfp) < pos - textdata) {
+               FILE_OP_ERROR(fname, "fwrite");
+               privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+               goto FILE_ERROR;
+           }
+       }
        
-       gpgme_data_release(plain);
+       if (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, "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 (fwrite(chars, 1, len, dstfp) < len) {
+                       FILE_OP_ERROR(fname, "fwrite");
+                       privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+                       goto FILE_ERROR;
+               }
+       }
+       /* Store any part after encrypted text */
+       if (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, "fwrite");
+                       privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+                       goto FILE_ERROR;
+       }
+       if (pos != NULL) {
+           pos = strstr(pos, end_indicator);
+           if (pos != NULL && *pos != '\0') {
+               pos += strlen(end_indicator);
+               if (fwrite(pos, 1, strlen(pos), dstfp) < strlen(pos)) {
+                       FILE_OP_ERROR(fname, "fwrite");
+                       privacy_set_error(_("Couldn't write to decrypted file %s"), fname);
+                       goto FILE_ERROR;
+               }
+           }
+       }
 
+       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);
+               return NULL;
+       }
+       
        parseinfo = procmime_scan_file(fname);
        g_free(fname);
        
        if (parseinfo == NULL) {
                gpgme_release(ctx);
+               privacy_set_error(_("Couldn't scan decrypted file."));
                return NULL;
        }
        decinfo = g_node_first_child(parseinfo->node) != NULL ?
@@ -434,6 +521,7 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                
        if (decinfo == NULL) {
                gpgme_release(ctx);
+               privacy_set_error(_("Couldn't scan decrypted file parts."));
                return NULL;
        }
 
@@ -459,9 +547,16 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
                gpgme_release(ctx);
 
        return decinfo;
+
+FILE_ERROR:
+       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;
@@ -469,22 +564,30 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        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;
 
        memset (&info, 0, sizeof info);
 
        /* 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."));
                return FALSE;
        }
        procmime_write_mimeinfo(msgcontent, fp);
@@ -495,30 +598,79 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        
        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);
 
-       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) {
                info.c = ctx;
                gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
        }
 
-       if (gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_CLEAR) 
-           != GPG_ERR_NO_ERROR) {
-               gpgme_release(ctx);
+       err = gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_CLEAR);
+       if (err != GPG_ERR_NO_ERROR) {
+               if (err == GPG_ERR_CANCELED) {
+                       /* ignore cancelled signing */
+                       privacy_reset_error();
+                       debug_print("gpgme_op_sign cancelled\n");
+               } else {
+                       privacy_set_error(_("Data signing failed, %s"), gpgme_strerror(err));
+                       debug_print("gpgme_op_sign error : %x\n", err);
+               }
+               gpgme_release(ctx);
+               return FALSE;
+       }
+       result = gpgme_op_sign_result(ctx);
+       if (result && result->signatures) {
+               gpgme_new_signature_t sig = result->signatures;
+               while (sig) {
+                       debug_print("valid signature: %s\n", sig->fpr);
+                       sig = sig->next;
+               }
+       } else if (result && result->invalid_signers) {
+               gpgme_invalid_key_t invalid = result->invalid_signers;
+               while (invalid) {
+                       g_warning("invalid signer: %s (%s)", invalid->fpr, 
+                               gpgme_strerror(invalid->reason));
+                       privacy_set_error(_("Data signing failed due to invalid signer: %s"), 
+                               gpgme_strerror(invalid->reason));
+                       invalid = invalid->next;
+               }
+               gpgme_release(ctx);
+               return FALSE;
+       } else {
+               /* can't get result (maybe no signing key?) */
+               debug_print("gpgme_op_sign_result error\n");
+               privacy_set_error(_("Data signing failed, no results."));
+               gpgme_release(ctx);
+               return FALSE;
+       }
+
+
+       sigcontent = sgpgme_data_release_and_get_mem(gpgsig, &len);
+       
+       if (sigcontent == NULL || len <= 0) {
+               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;
        }
 
-       gpgme_release(ctx);
-       sigcontent = gpgme_data_release_and_get_mem(gpgsig, &len);
        tmp = g_malloc(len+1);
        g_memmove(tmp, sigcontent, len+1);
        tmp[len] = '\0';
@@ -528,7 +680,8 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
 
        if (msgcontent->content == MIMECONTENT_FILE &&
            msgcontent->data.filename != NULL) {
-               g_unlink(msgcontent->data.filename);
+               if (msgcontent->tmp == TRUE)
+                       claws_unlink(msgcontent->data.filename);
                g_free(msgcontent->data.filename);
        }
        msgcontent->data.mem = g_strdup(tmp);
@@ -539,13 +692,31 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
         * chars
         */
        procmime_encode_content(msgcontent, ENC_BASE64);
-                       
+       gpgme_release(ctx);
+
        return TRUE;
 }
 
 static gchar *pgpinline_get_encrypt_data(GSList *recp_names)
 {
-       return sgpgme_get_encrypt_data(recp_names);
+       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)
@@ -553,28 +724,36 @@ 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;
        gpgme_key_t *kset = NULL;
        gchar **fprs = g_strsplit(encrypt_data, " ", -1);
+       gpgme_error_t err;
        gint i = 0;
+
        while (fprs[i] && strlen(fprs[i])) {
                i++;
        }
        
        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));
+               g_free(kset);
+               return FALSE;
+       }
        i = 0;
        while (fprs[i] && strlen(fprs[i])) {
                gpgme_key_t key;
-               gpgme_error_t err;
                err = gpgme_get_key(ctx, fprs[i], &key, 0);
                if (err) {
                        debug_print("can't add key '%s'[%d] (%s)\n", fprs[i],i, gpgme_strerror(err));
-                       break;
+                       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);
                kset[i] = key;
@@ -586,15 +765,23 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 
        /* 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));
                perror("my_tmpfile");
+               g_free(kset);
                return FALSE;
        }
        procmime_write_mimeinfo(msgcontent, fp);
@@ -606,15 +793,29 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        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"), 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);
 
-       gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
+       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("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);
+               return FALSE;
+       }
 
        tmp = g_malloc(len+1);
        g_memmove(tmp, enccontent, len+1);
@@ -626,12 +827,14 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 
        if (msgcontent->content == MIMECONTENT_FILE &&
            msgcontent->data.filename != NULL) {
-               g_unlink(msgcontent->data.filename);
+               if (msgcontent->tmp == TRUE)
+                       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;
 }
@@ -657,6 +860,8 @@ static PrivacySystem pgpinline_system = {
        TRUE,
        pgpinline_get_encrypt_data,
        pgpinline_encrypt,
+       pgpinline_get_encrypt_warning,
+       pgpinline_inhibit_encrypt_warning,
 };
 
 void pgpinline_init()
@@ -669,4 +874,11 @@ void pgpinline_done()
        privacy_unregister_system(&pgpinline_system);
 }
 
+struct PluginFeature *plugin_provides(void)
+{
+       static struct PluginFeature features[] = 
+               { {PLUGIN_PRIVACY, N_("PGP/Inline")},
+                 {PLUGIN_NOTHING, NULL}};
+       return features;
+}
 #endif /* USE_GPGME */