2005-04-15 [colin] 1.9.6cvs36

[claws.git] / src / plugins / pgpmime / pgpmime.c

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 4a213de5f2299fab7dedd154305fcb7dfa973ecc..a2487fd6368001720dbd3083534f2850b8016304 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -70,7 +70,7 @@ static PrivacyDataPGP *pgpmime_new_privacydata()
 static void pgpmime_free_privacydata(PrivacyData *_data)
 {
        PrivacyDataPGP *data = (PrivacyDataPGP *) _data;
-       
+       gpgme_release(data->ctx);
        g_free(data);
 }
 
@@ -287,9 +287,11 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
        plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
 
        gpgme_data_release(cipher);
-       if (plain == NULL)
+       if (plain == NULL) {
+               gpgme_release(ctx);
                return NULL;
-       
+       }
+
        fname = g_strdup_printf("%s%cplaintext.%08x",
                get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
 
@@ -297,6 +299,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
                FILE_OP_ERROR(fname, "fopen");
                g_free(fname);
                gpgme_data_release(plain);
+               gpgme_release(ctx);
                return NULL;
        }
 
@@ -311,12 +314,16 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
 
        parseinfo = procmime_scan_file(fname);
        g_free(fname);
-       if (parseinfo == NULL)
+       if (parseinfo == NULL) {
+               gpgme_release(ctx);
                return NULL;
+       }
        decinfo = g_node_first_child(parseinfo->node) != NULL ?
                g_node_first_child(parseinfo->node)->data : NULL;
-       if (decinfo == NULL)
+       if (decinfo == NULL) {
+               gpgme_release(ctx);
                return NULL;
+       }
 
        g_node_unlink(decinfo->node);
        procmime_mimeinfo_free_all(parseinfo);
@@ -402,7 +409,7 @@ extract_micalg (char *xml)
     return NULL;
 }
 
-gboolean pgpmime_sign(MimeInfo *mimeinfo)
+gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
 {
        MimeInfo *msgcontent, *sigmultipart, *newinfo;
        gchar *textstr, *opinfo, *micalg;
@@ -410,9 +417,9 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo)
        gchar *boundary, *sigcontent;
        GpgmeCtx ctx;
        GpgmeData gpgtext, gpgsig;
-       guint len;
+       size_t len;
        struct passphrase_cb_info_s info;
-  
+
        memset (&info, 0, sizeof info);
 
        /* remove content node from message */
@@ -446,15 +453,21 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo)
        gpgme_new(&ctx);
        gpgme_set_textmode(ctx, 1);
        gpgme_set_armor(ctx, 1);
-       gpgme_signers_clear(ctx);
+
+       if (!sgpgme_setup_signers(ctx, account)) {
+               gpgme_release(ctx);
+               return FALSE;
+       }
 
        if (!getenv("GPG_AGENT_INFO")) {
                info.c = ctx;
                gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
        }
 
-       if (gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH) != GPGME_No_Error)
+       if (gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH) != GPGME_No_Error) {
+               gpgme_release(ctx);
                return FALSE;
+       }
        opinfo = gpgme_get_op_info(ctx, 0);
        micalg = extract_micalg(opinfo);
        g_free(opinfo);
@@ -472,7 +485,8 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo)
        newinfo->type = MIMETYPE_APPLICATION;
        newinfo->subtype = g_strdup("pgp-signature");
        newinfo->content = MIMECONTENT_MEM;
-       newinfo->data.mem = g_memdup(sigcontent, len + 1);
+       newinfo->data.mem = g_malloc(len + 1);
+       g_memmove(newinfo->data.mem, sigcontent, len);
        newinfo->data.mem[len] = '\0';
        g_node_append(sigmultipart->node, newinfo->node);
 
@@ -491,7 +505,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        MimeInfo *msgcontent, *encmultipart, *newinfo;
        FILE *fp;
        gchar *boundary, *enccontent;
-       guint len;
+       size_t len;
        gchar *textstr;
        GpgmeData gpgtext, gpgenc;
        gchar **recipients, **nextrecp;
@@ -502,7 +516,6 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        recipients = g_strsplit(encrypt_data, " ", 0);
        gpgme_recipients_new(&recp);
        for (nextrecp = recipients; *nextrecp != NULL; nextrecp++) {
-               printf("%s\n", *nextrecp);
                gpgme_recipients_add_name_with_validity(recp, *nextrecp,
                                                        GPGME_VALIDITY_FULL);
        }
@@ -565,7 +578,8 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        newinfo->type = MIMETYPE_APPLICATION;
        newinfo->subtype = g_strdup("octet-stream");
        newinfo->content = MIMECONTENT_MEM;
-       newinfo->data.mem = g_memdup(enccontent, len + 1);
+       newinfo->data.mem = g_malloc(len + 1);
+       g_memmove(newinfo->data.mem, enccontent, len);
        newinfo->data.mem[len] = '\0';
        g_node_append(encmultipart->node, newinfo->node);
 
@@ -576,7 +590,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 
 static PrivacySystem pgpmime_system = {
        "pgpmime",                      /* id */
-       "PGP Mime",                     /* name */
+       "PGP/MIME",                     /* name */
 
        pgpmime_free_privacydata,       /* free_privacydata */