/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> and
+ * Copyright (C) 1999-2011 Colin Leroy <colin@colino.net> and
* the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
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)
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;
{
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)
{
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)
{
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)
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);
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);
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);
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';
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"),
fp = g_fopen(tmpfile, "wb");
if (fp == NULL) {
perror("get_tmp_file");
+ g_free(kset);
return FALSE;
}
procmime_decode_content(msgcontent);
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) {