/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws 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, 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
#include "utils.h"
#include "privacy.h"
#include "procmime.h"
+
#include "pgpmime.h"
-#include "sgpgme.h"
+#include <plugins/pgpcore/sgpgme.h>
+#include <plugins/pgpcore/prefs_gpg.h>
+#include <plugins/pgpcore/passphrase.h>
+
#include "prefs_common.h"
-#include "prefs_gpg.h"
-#include "passphrase.h"
typedef struct _PrivacyDataPGP PrivacyDataPGP;
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")))
return FALSE;
/* check if mimeinfo is the first child */
if (signature == NULL)
return FALSE;
if ((signature->type != MIMETYPE_APPLICATION) ||
- g_ascii_strcasecmp(signature->subtype, "pgp-signature"))
+ (g_ascii_strcasecmp(signature->subtype, "pgp-signature")))
return FALSE;
if (data == NULL) {
data = pgpmime_new_privacydata();
mimeinfo->privacy = (PrivacyData *) data;
}
+
data->done_sigtest = TRUE;
data->is_signed = TRUE;
gpgme_new(&data->ctx);
debug_print("Checking PGP/MIME signature\n");
+
+ 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 = fopen(parent->data.filename, "rb");
+ fp = g_fopen(parent->data.filename, "rb");
g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
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);
gpgme_data_t cipher = NULL, plain = NULL;
static gint id = 0;
FILE *dstfp;
- gint nread;
gchar *fname;
- gchar buf[BUFFSIZE];
gpgme_verify_result_t sigstat = NULL;
PrivacyDataPGP *data = NULL;
gpgme_ctx_t ctx;
+ gchar *chars;
+ size_t len;
if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
return NULL;
fname = g_strdup_printf("%s%cplaintext.%08x",
get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
- if ((dstfp = fopen(fname, "wb")) == NULL) {
+ if ((dstfp = g_fopen(fname, "wb")) == NULL) {
FILE_OP_ERROR(fname, "fopen");
g_free(fname);
gpgme_data_release(plain);
fprintf(dstfp, "MIME-Version: 1.0\n");
- while ((nread = gpgme_data_read(plain, buf, sizeof(buf))) > 0) {
- debug_print("read %d:%s\n", nread, buf);
- fwrite (buf, nread, 1, dstfp);
- }
- debug_print("nread %d!\n", nread);
+ chars = gpgme_data_release_and_get_mem(plain, &len);
+ if (len > 0)
+ fwrite(chars, len, 1, dstfp);
fclose(dstfp);
-
- gpgme_data_release(plain);
parseinfo = procmime_scan_file(fname);
g_free(fname);
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;
+ gpgme_error_t err;
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 */
sigmultipart = procmime_mimeinfo_new();
sigmultipart->type = MIMETYPE_MULTIPART;
sigmultipart->subtype = g_strdup("signed");
- boundary = generate_mime_boundary("Signature");
+
+ do {
+ 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"),
/* write message content to temporary file */
fp = my_tmpfile();
+ if (fp == NULL) {
+ perror("my_tmpfile");
+ return FALSE;
+ }
procmime_write_mimeinfo(sigmultipart, fp);
rewind(fp);
return FALSE;
}
- if (!getenv("GPG_AGENT_INFO")) {
- info.c = ctx;
+ if (getenv("GPG_AGENT_INFO")) {
+ debug_print("GPG_AGENT_INFO environment defined, running without passphrase callback\n");
+ } else {
+ info.c = ctx;
gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
}
- if (gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH) != GPG_ERR_NO_ERROR) {
+ err = gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH);
+ if (err != GPG_ERR_NO_ERROR) {
+ debug_print("gpgme_op_sign error : %x\n", err);
gpgme_release(ctx);
return FALSE;
}
}
} else {
/* can't get result (maybe no signing key?) */
+ debug_print("gpgme_op_sign_result error\n");
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->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';
}
gchar *pgpmime_get_encrypt_data(GSList *recp_names)
{
- return sgpgme_get_encrypt_data(recp_names);
+ return sgpgme_get_encrypt_data(recp_names, GPGME_PROTOCOL_OpenPGP);
}
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);
gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
gpgme_data_new(&gpgenc);
gpgme_set_armor(ctx, 1);
- gpgme_data_seek(gpgtext, 0, SEEK_SET);
+ gpgme_data_rewind(gpgtext);
gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
projects / claws.git / blobdiff