/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and
+ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and
* the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_GPGME
#include "smime.h"
#include <plugins/pgpcore/sgpgme.h>
#include <plugins/pgpcore/prefs_gpg.h>
+#include <plugins/pgpcore/pgp_utils.h>
#include <plugins/pgpcore/passphrase.h>
#include "alertpanel.h"
const gchar *protocol, *tmpstr;
PrivacyDataPGP *data = NULL;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
data = (PrivacyDataPGP *) mimeinfo->privacy;
if (data->done_sigtest)
const gchar *tmpstr;
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);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, -1);
data = (PrivacyDataPGP *) mimeinfo->privacy;
gpgme_new(&data->ctx);
EncodingType oldenc = ENC_BINARY;
parent = procmime_mimeinfo_parent(mimeinfo);
fp = g_fopen(parent->data.filename, "rb");
- g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
if (!boundary) {
} else {
textstr = get_canonical_content(fp, boundary);
}
- err = gpgme_data_new_from_mem(&textdata, textstr, strlen(textstr), 0);
+ err = gpgme_data_new_from_mem(&textdata, textstr, textstr?strlen(textstr):0, 0);
if (err) {
debug_print ("gpgme_data_new_from_mem failed: %s\n",
sgpgme_verify_signature (data->ctx, textdata, NULL, cipher);
gpgme_data_release(textdata);
g_free(textstr);
- gpgme_data_rewind(cipher);
+ cm_gpgme_data_rewind(cipher);
textstr = sgpgme_data_release_and_get_mem(cipher, &len);
fclose(fp);
if (textstr && len > 0)
if (textstr && len) {
gchar *tmp_file = get_tmp_file();
MimeInfo *newinfo = NULL, *decinfo = NULL, *parentinfo = NULL;
- gint childnumber = 0;
-
+
str_write_to_file(textstr, tmp_file);
newinfo = procmime_scan_file(tmp_file);
decinfo = g_node_first_child(newinfo->node) != NULL ?
g_node_first_child(newinfo->node)->data : NULL;
+
+ if (decinfo == NULL)
+ return -1;
+
g_node_unlink(decinfo->node);
procmime_mimeinfo_free_all(newinfo);
decinfo->tmp = TRUE;
parentinfo = procmime_mimeinfo_parent(mimeinfo);
- childnumber = g_node_child_index(parentinfo->node, mimeinfo);
+
if (parentinfo->type == MIMETYPE_MESSAGE &&
!strcmp(parentinfo->subtype, "rfc822")) {
procmime_decode_content(parentinfo);
{
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)
- smime_check_signature(mimeinfo);
-
return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus);
}
{
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)
- smime_check_signature(mimeinfo);
-
return sgpgme_sigstat_info_short(data->ctx, data->sigstatus);
}
{
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)
- smime_check_signature(mimeinfo);
-
return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
}
gchar *chars;
size_t len;
- g_return_val_if_fail(smime_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(smime_is_encrypted(mimeinfo), NULL);
if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
encinfo = mimeinfo;
cipher = sgpgme_data_from_mimeinfo(encinfo);
- gpgme_data_set_encoding(cipher, GPGME_DATA_ENCODING_BASE64);
+
plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
gpgme_data_release(cipher);
get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
if ((dstfp = g_fopen(fname, "wb")) == NULL) {
- FILE_OP_ERROR(fname, "fopen");
+ FILE_OP_ERROR(fname, "g_fopen");
g_free(fname);
gpgme_data_release(plain);
gpgme_release(ctx);
if (fprintf(dstfp, "MIME-Version: 1.0\n") < 0) {
FILE_OP_ERROR(fname, "fprintf");
g_free(fname);
+ fclose(dstfp);
gpgme_data_release(plain);
gpgme_release(ctx);
debug_print("can't close!\n");
if (len > 0) {
if (fwrite(chars, 1, len, dstfp) < len) {
FILE_OP_ERROR(fname, "fwrite");
+ fclose(dstfp);
g_free(fname);
g_free(chars);
gpgme_data_release(plain);
return decinfo;
}
-gboolean smime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
+gboolean smime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from_addr)
{
MimeInfo *msgcontent, *sigmultipart, *newinfo;
- gchar *textstr, *micalg;
+ gchar *textstr, *micalg = NULL;
FILE *fp;
gchar *boundary = NULL;
gchar *sigcontent;
fclose(fp);
- gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
+ gpgme_data_new_from_mem(&gpgtext, textstr, textstr?strlen(textstr):0, 0);
gpgme_data_new(&gpgsig);
gpgme_new(&ctx);
gpgme_set_armor(ctx, TRUE);
return FALSE;
}
- if (!sgpgme_setup_signers(ctx, account)) {
+ if (!sgpgme_setup_signers(ctx, account, from_addr)) {
debug_print("setup_signers failed\n");
gpgme_data_release(gpgtext);
gpgme_release(ctx);
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));
+ micalg = g_strdup_printf("pgp-%s", g_ascii_strdown(gpgme_hash_algo_name(
+ result->signatures->hash_algo),-1));
} else {
micalg = g_strdup(gpgme_hash_algo_name(
result->signatures->hash_algo));
if (!sigcontent) {
gpgme_release(ctx);
+ g_free(micalg);
return FALSE;
}
real_content = sigcontent+strlen("-----BEGIN SIGNED MESSAGE-----\n");
if (!strstr(real_content, "-----END SIGNED MESSAGE-----")) {
debug_print("missing end\n");
gpgme_release(ctx);
+ g_free(micalg);
return FALSE;
}
*strstr(real_content, "-----END SIGNED MESSAGE-----") = '\0';
prefs_gpg_remove_skip_encryption_warning(smime_system.id);
}
-static gchar *fp_read_noconv(FILE *fp)
-{
- GByteArray *array;
- guchar buf[BUFSIZ];
- gint n_read;
- gchar *result = NULL;
-
- if (!fp)
- return NULL;
- array = g_byte_array_new();
-
- while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
- if (n_read < sizeof(buf) && ferror(fp))
- break;
- g_byte_array_append(array, buf, n_read);
- }
-
- if (ferror(fp)) {
- FILE_OP_ERROR("file stream", "fread");
- g_byte_array_free(array, TRUE);
- return NULL;
- }
-
- buf[0] = '\0';
- g_byte_array_append(array, buf, 1);
- result = (gchar *)array->data;
- g_byte_array_free(array, FALSE);
-
- return result;
-}
-
gboolean smime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
{
MimeInfo *msgcontent, *encmultipart;
encmultipart->subtype = g_strdup("x-pkcs7-mime");
g_hash_table_insert(encmultipart->typeparameters, g_strdup("name"),
g_strdup("smime.p7m"));
+ g_hash_table_insert(encmultipart->typeparameters,
+ g_strdup("smime-type"),
+ g_strdup("enveloped-data"));
encmultipart->disposition = DISPOSITIONTYPE_ATTACHMENT;
g_hash_table_insert(encmultipart->dispositionparameters, g_strdup("filename"),
/* write message content to temporary file */
tmpfile = get_tmp_file();
- fp = fopen(tmpfile, "wb");
+ fp = g_fopen(tmpfile, "wb");
if (fp == NULL) {
perror("get_tmp_file");
+ g_free(kset);
return FALSE;
}
procmime_decode_content(msgcontent);
procmime_write_mimeinfo(msgcontent, fp);
fclose(fp);
canonicalize_file_replace(tmpfile);
- fp = fopen(tmpfile, "rb");
+ fp = g_fopen(tmpfile, "rb");
if (fp == NULL) {
perror("get_tmp_file");
+ g_free(kset);
return FALSE;
}
g_free(tmpfile);
fclose(fp);
/* encrypt data */
- gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
+ gpgme_data_new_from_mem(&gpgtext, textstr, textstr?strlen(textstr):0, 0);
gpgme_data_new(&gpgenc);
- gpgme_data_rewind(gpgtext);
+ cm_gpgme_data_rewind(gpgtext);
- gpgme_data_set_encoding(gpgenc, GPGME_DATA_ENCODING_BASE64);
gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
gpgme_release(ctx);
+ g_free(kset);
enccontent = sgpgme_data_release_and_get_mem(gpgenc, &len);
if (!enccontent) {
}
tmpfile = get_tmp_file();
- fp = fopen(tmpfile, "wb");
+ fp = g_fopen(tmpfile, "wb");
if (fp) {
if (fwrite(enccontent, 1, len, fp) < len) {
FILE_OP_ERROR(tmpfile, "fwrite");
smime_encrypt,
smime_get_encrypt_warning,
smime_inhibit_encrypt_warning,
+ prefs_gpg_auto_check_signatures,
};
void smime_init()
projects / claws.git / blobdiff