*
* 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;
gboolean done_sigtest;
gboolean is_signed;
- GpgmeSigStat sigstatus;
- GpgmeCtx ctx;
+ gpgme_verify_result_t sigstatus;
+ gpgme_ctx_t ctx;
+ gboolean is_pkcs7;
};
static PrivacySystem pgpmime_system;
data->data.system = &pgpmime_system;
data->done_sigtest = FALSE;
data->is_signed = FALSE;
- data->sigstatus = GPGME_SIG_STAT_NONE;
+ data->sigstatus = NULL;
gpgme_new(&data->ctx);
return data;
static void pgpmime_free_privacydata(PrivacyData *_data)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) _data;
-
+ gpgme_release(data->ctx);
g_free(data);
}
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 */
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;
FILE *fp;
gchar *boundary;
gchar *textstr;
- GpgmeData sigdata, textdata;
-
+ gpgme_data_t sigdata = NULL, textdata = NULL;
+ gpgme_error_t err;
g_return_val_if_fail(mimeinfo != NULL, -1);
g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
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 = 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");
textstr = get_canonical_content(fp, boundary);
- gpgme_data_new_from_mem(&textdata, textstr, strlen(textstr), 0);
+ err = gpgme_data_new_from_mem(&textdata, textstr, strlen(textstr), 0);
+ if (err) {
+ debug_print ("gpgme_data_new_from_mem failed: %s\n",
+ gpgme_strerror (err));
+ }
signature = (MimeInfo *) mimeinfo->node->next->data;
sigdata = sgpgme_data_from_mimeinfo(signature);
- data->sigstatus =
- sgpgme_verify_signature (data->ctx, sigdata, textdata);
+ 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_release(sigdata);
gpgme_data_release(textdata);
g_free(textstr);
g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
- if (data->sigstatus == GPGME_SIG_STAT_NONE &&
+ if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
pgpmime_check_signature(mimeinfo);
g_return_val_if_fail(data != NULL, g_strdup("Error"));
- if (data->sigstatus == GPGME_SIG_STAT_NONE &&
+ if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
pgpmime_check_signature(mimeinfo);
g_return_val_if_fail(data != NULL, g_strdup("Error"));
- if (data->sigstatus == GPGME_SIG_STAT_NONE &&
+ if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
pgpmime_check_signature(mimeinfo);
static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
{
MimeInfo *encinfo, *decinfo, *parseinfo;
- GpgmeData cipher, plain;
+ gpgme_data_t cipher = NULL, plain = NULL;
static gint id = 0;
FILE *dstfp;
- gint nread;
gchar *fname;
- gchar buf[BUFFSIZE];
- GpgmeSigStat sigstat = 0;
+ gpgme_verify_result_t sigstat = NULL;
PrivacyDataPGP *data = NULL;
- GpgmeCtx ctx;
-
- if (gpgme_new(&ctx) != GPGME_No_Error)
+ gpgme_ctx_t ctx;
+ gchar *chars;
+ size_t len;
+
+ if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
return NULL;
plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
gpgme_data_release(cipher);
- if (plain == NULL)
+ if (plain == NULL) {
+ debug_print("plain is null!\n");
+ gpgme_release(ctx);
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);
+ gpgme_release(ctx);
+ debug_print("can't open!\n");
return NULL;
}
fprintf(dstfp, "MIME-Version: 1.0\n");
- gpgme_data_rewind (plain);
- while (gpgme_data_read(plain, buf, sizeof(buf), &nread) == GPGME_No_Error) {
- fwrite (buf, nread, 1, dstfp);
- }
+
+ 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);
- 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);
decinfo->tmp = TRUE;
- if (sigstat != GPGME_SIG_STAT_NONE) {
+ if (sigstat != NULL && sigstat->signatures != NULL) {
if (decinfo->privacy != NULL) {
data = (PrivacyDataPGP *) decinfo->privacy;
} else {
return decinfo;
}
-/*
- * Find TAG in XML and return a pointer into xml set just behind the
- * closing angle. Return NULL if not found.
- */
-static const char *
-find_xml_tag (const char *xml, const char *tag)
-{
- int taglen = strlen (tag);
- const char *s = xml;
-
- while ( (s = strchr (s, '<')) ) {
- s++;
- if (!strncmp (s, tag, taglen)) {
- const char *s2 = s + taglen;
- if (*s2 == '>' || isspace (*(const unsigned char*)s2) ) {
- /* found */
- while (*s2 && *s2 != '>') /* skip attributes */
- s2++;
- /* fixme: do need to handle angles inside attribute vallues? */
- return *s2? (s2+1):NULL;
- }
- }
- while (*s && *s != '>') /* skip to end of tag */
- s++;
- }
- return NULL;
-}
-
-
-/*
- * Extract the micalg from an GnupgOperationInfo XML container.
- */
-static char *
-extract_micalg (char *xml)
-{
- const char *s;
-
- s = find_xml_tag (xml, "GnupgOperationInfo");
- if (s) {
- const char *s_end = find_xml_tag (s, "/GnupgOperationInfo");
- s = find_xml_tag (s, "signature");
- if (s && s_end && s < s_end) {
- const char *s_end2 = find_xml_tag (s, "/signature");
- if (s_end2 && s_end2 < s_end) {
- s = find_xml_tag (s, "micalg");
- if (s && s < s_end2) {
- s_end = strchr (s, '<');
- if (s_end) {
- char *p = g_malloc (s_end - s + 1);
- memcpy (p, s, s_end - s);
- p[s_end-s] = 0;
- return p;
- }
- }
- }
- }
- }
- return NULL;
-}
-
-gboolean pgpmime_sign(MimeInfo *mimeinfo)
+gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
{
MimeInfo *msgcontent, *sigmultipart, *newinfo;
- gchar *textstr, *opinfo, *micalg;
+ gchar *textstr, *micalg;
FILE *fp;
- gchar *boundary, *sigcontent;
- GpgmeCtx ctx;
- GpgmeData gpgtext, gpgsig;
- guint len;
+ 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 */
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"),
/* write message content to temporary file */
fp = my_tmpfile();
+ if (fp == NULL) {
+ perror("my_tmpfile");
+ return FALSE;
+ }
procmime_write_mimeinfo(sigmultipart, fp);
rewind(fp);
gpgme_new(&ctx);
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
- gpgme_signers_clear(ctx);
+ 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) != GPG_ERR_NO_ERROR) {
+ gpgme_release(ctx);
return FALSE;
- opinfo = gpgme_get_op_info(ctx, 0);
- micalg = extract_micalg(opinfo);
- g_free(opinfo);
+ }
+ result = gpgme_op_sign_result(ctx);
+ if (result && result->signatures) {
+ if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
+ micalg = g_strdup_printf("PGP-%s", gpgme_hash_algo_name(
+ result->signatures->hash_algo));
+ } else {
+ micalg = g_strdup(gpgme_hash_algo_name(
+ result->signatures->hash_algo));
+ }
+ } else {
+ /* can't get result (maybe no signing key?) */
+ return FALSE;
+ }
gpgme_release(ctx);
sigcontent = gpgme_data_release_and_get_mem(gpgsig, &len);
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->data.mem = g_memdup(sigcontent, len + 1);
+ 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';
g_node_append(sigmultipart->node, newinfo->node);
return TRUE;
}
-
gchar *pgpmime_get_encrypt_data(GSList *recp_names)
{
return sgpgme_get_encrypt_data(recp_names);
MimeInfo *msgcontent, *encmultipart, *newinfo;
FILE *fp;
gchar *boundary, *enccontent;
- guint len;
+ size_t len;
gchar *textstr;
- GpgmeData gpgtext, gpgenc;
- gchar **recipients, **nextrecp;
- GpgmeRecipients recp;
- GpgmeCtx ctx;
-
- /* build GpgmeRecipients from 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);
+ gpgme_data_t gpgtext = NULL, gpgenc = NULL;
+ gpgme_ctx_t ctx = NULL;
+ gpgme_key_t *kset = NULL;
+ gchar **fprs = g_strsplit(encrypt_data, " ", -1);
+ gint i = 0;
+ while (fprs[i] && strlen(fprs[i])) {
+ i++;
}
- g_strfreev(recipients);
-
+
+ kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
+ memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
+ gpgme_new(&ctx);
+ 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;
+ }
+ debug_print("found %s at %d\n", fprs[i], i);
+ kset[i] = key;
+ i++;
+ }
+
debug_print("Encrypting message content\n");
/* remove content node from message */
/* write message content to temporary file */
fp = my_tmpfile();
+ if (fp == NULL) {
+ perror("my_tmpfile");
+ return FALSE;
+ }
procmime_write_mimeinfo(encmultipart, fp);
rewind(fp);
/* encrypt data */
gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
gpgme_data_new(&gpgenc);
- gpgme_new(&ctx);
gpgme_set_armor(ctx, 1);
-
- gpgme_op_encrypt(ctx, recp, gpgtext, gpgenc);
+ gpgme_data_rewind(gpgtext);
+
+ gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
gpgme_release(ctx);
enccontent = gpgme_data_release_and_get_mem(gpgenc, &len);
- gpgme_recipients_release(recp);
gpgme_data_release(gpgtext);
g_free(textstr);
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);
static PrivacySystem pgpmime_system = {
"pgpmime", /* id */
- "PGP Mime", /* name */
+ "PGP MIME", /* name */
pgpmime_free_privacydata, /* free_privacydata */
projects / claws.git / blobdiff