2005-12-06 [paul] 1.9.100cvs69

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

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 49e480bf61c1d2e5fefa7d7b923998ac5763c8d8..2784e53bccd4a59788aab7e384915ff4c4b3e0b2 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -49,6 +49,7 @@ struct _PrivacyDataPGP
        gboolean        is_signed;
        gpgme_verify_result_t   sigstatus;
        gpgme_ctx_t     ctx;
+       gboolean        is_pkcs7;
 };
 
 static PrivacySystem pgpmime_system;
@@ -98,7 +99,10 @@ static gboolean pgpmime_is_signed(MimeInfo *mimeinfo)
            g_ascii_strcasecmp(parent->subtype, "signed"))
                return FALSE;
        protocol = procmime_mimeinfo_get_parameter(parent, "protocol");
-       if ((protocol == NULL) || g_ascii_strcasecmp(protocol, "application/pgp-signature"))
+       if ((protocol == NULL) || 
+           (g_ascii_strcasecmp(protocol, "application/pgp-signature") &&
+            g_ascii_strcasecmp(protocol, "application/pkcs7-signature") &&
+            g_ascii_strcasecmp(protocol, "application/x-pkcs7-signature")))
                return FALSE;
 
        /* check if mimeinfo is the first child */
@@ -111,13 +115,22 @@ static gboolean pgpmime_is_signed(MimeInfo *mimeinfo)
        if (signature == NULL)
                return FALSE;
        if ((signature->type != MIMETYPE_APPLICATION) ||
-           g_ascii_strcasecmp(signature->subtype, "pgp-signature"))
+           (g_ascii_strcasecmp(signature->subtype, "pgp-signature") &&
+            g_ascii_strcasecmp(signature->subtype, "pkcs7-signature") &&
+            g_ascii_strcasecmp(signature->subtype, "x-pkcs7-signature")))
                return FALSE;
 
        if (data == NULL) {
                data = pgpmime_new_privacydata();
                mimeinfo->privacy = (PrivacyData *) data;
        }
+       
+       if (!g_ascii_strcasecmp(signature->subtype, "pkcs7-signature") ||
+           !g_ascii_strcasecmp(signature->subtype, "x-pkcs7-signature"))
+               data->is_pkcs7 = TRUE;
+       else
+               data->is_pkcs7 = FALSE;
+
        data->done_sigtest = TRUE;
        data->is_signed = TRUE;
 
@@ -169,7 +182,17 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
        data = (PrivacyDataPGP *) mimeinfo->privacy;
        gpgme_new(&data->ctx);
        
-       debug_print("Checking PGP/MIME signature\n");
+       debug_print("Checking %s/MIME signature\n", data->is_pkcs7?"S":"PGP");
+
+       if (data->is_pkcs7) {
+               err = gpgme_set_protocol(data->ctx, GPGME_PROTOCOL_CMS);
+       } else
+               err = gpgme_set_protocol(data->ctx, GPGME_PROTOCOL_OpenPGP);
+
+       if (err) {
+               debug_print ("gpgme_set_protocol failed: %s\n",
+                   gpgme_strerror (err));
+       }
        parent = procmime_mimeinfo_parent(mimeinfo);
 
        fp = g_fopen(parent->data.filename, "rb");
@@ -189,6 +212,16 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
        signature = (MimeInfo *) mimeinfo->node->next->data;
        sigdata = sgpgme_data_from_mimeinfo(signature);
 
+       err = 0;
+       if (signature->encoding_type == ENC_BASE64) {
+               err = gpgme_data_set_encoding (sigdata, GPGME_DATA_ENCODING_BASE64);
+       }
+       
+       if (err) {
+               debug_print ("gpgme_data_set_encoding failed: %s\n",
+                       gpgme_strerror (err));
+       }
+
        data->sigstatus =
                sgpgme_verify_signature (data->ctx, sigdata, textdata, NULL);
 
@@ -280,7 +313,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
        PrivacyDataPGP *data = NULL;
        gpgme_ctx_t ctx;
        gchar *chars;
-       int len;
+       size_t len;
 
        if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
                return NULL;
@@ -361,13 +394,27 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        MimeInfo *msgcontent, *sigmultipart, *newinfo;
        gchar *textstr, *micalg;
        FILE *fp;
-       gchar *boundary, *sigcontent;
+       gchar *boundary = NULL;
+       gchar *sigcontent;
        gpgme_ctx_t ctx;
        gpgme_data_t gpgtext, gpgsig;
        size_t len;
        struct passphrase_cb_info_s info;
        gpgme_sign_result_t result = NULL;
+       gchar *test_msg;
+       
+       fp = my_tmpfile();
+       if (fp == NULL) {
+               perror("my_tmpfile");
+               return FALSE;
+       }
+       procmime_write_mimeinfo(mimeinfo, fp);
+       rewind(fp);
 
+       /* read temporary file into memory */
+       test_msg = file_read_stream_to_str(fp);
+       fclose(fp);
+       
        memset (&info, 0, sizeof info);
 
        /* remove content node from message */
@@ -378,7 +425,15 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        sigmultipart = procmime_mimeinfo_new();
        sigmultipart->type = MIMETYPE_MULTIPART;
        sigmultipart->subtype = g_strdup("signed");
-       boundary = generate_mime_boundary("Signature");
+       
+       do {
+               if (boundary)
+                       g_free(boundary);
+               boundary = generate_mime_boundary("Sig");
+       } while (strstr(test_msg, boundary) != NULL);
+       
+       g_free(test_msg);
+
        g_hash_table_insert(sigmultipart->typeparameters, g_strdup("boundary"),
                             g_strdup(boundary));
        g_hash_table_insert(sigmultipart->typeparameters, g_strdup("protocol"),
@@ -388,6 +443,10 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
 
        /* write message content to temporary file */
        fp = my_tmpfile();
+       if (fp == NULL) {
+               perror("my_tmpfile");
+               return FALSE;
+       }
        procmime_write_mimeinfo(sigmultipart, fp);
        rewind(fp);
 
@@ -443,7 +502,12 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        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->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';
@@ -510,6 +574,10 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 
        /* write message content to temporary file */
        fp = my_tmpfile();
+       if (fp == NULL) {
+               perror("my_tmpfile");
+               return FALSE;
+       }
        procmime_write_mimeinfo(encmultipart, fp);
        rewind(fp);