/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail 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
#include "privacy.h"
#include "procmime.h"
+#include "procmsg.h"
static GSList *systems = NULL;
static gchar *privacy_last_error = NULL;
{
PrivacySystem *system = NULL;
- g_return_if_fail(privacydata != NULL);
+ cm_return_if_fail(privacydata != NULL);
system = privacy_data_get_system(privacydata);
if (!system)
gboolean privacy_mimeinfo_is_signed(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
PrivacySystem *system =
{
struct SignedState sstate;
MimeInfo *mimeinfo = procmime_scan_message(msginfo);
-
+ if (!mimeinfo)
+ return;
sstate.msginfo = msginfo;
sstate.system = system;
g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_signed_flag, &sstate);
* If the MimeInfo is not signed an error code will be returned.
*
* \return Error code indicating the result of the check,
- * < 0 if an error occured
+ * < 0 if an error occurred
*/
gint privacy_mimeinfo_check_signature(MimeInfo *mimeinfo)
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
gboolean privacy_mimeinfo_is_encrypted(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
MimeInfo *decryptedinfo, *parentinfo;
gint childnumber;
- g_return_val_if_fail(system->decrypt != NULL, -1);
+ cm_return_val_if_fail(system->decrypt != NULL, -1);
decryptedinfo = system->decrypt(mimeinfo);
if (decryptedinfo == NULL)
parentinfo = procmime_mimeinfo_parent(mimeinfo);
childnumber = g_node_child_index(parentinfo->node, mimeinfo);
- procmime_mimeinfo_free_all(mimeinfo);
+ procmime_mimeinfo_free_all(&mimeinfo);
g_node_insert(parentinfo->node, childnumber, decryptedinfo->node);
gint privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+
+ procmime_decode_content(mimeinfo);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
{
GSList *cur;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
- g_return_val_if_fail(target != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(target != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
{
PrivacySystem *system;
+ gchar *ret = NULL;
+ GSList *uniq_names = NULL, *cur;
- g_return_val_if_fail(id != NULL, NULL);
- g_return_val_if_fail(recp_names != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(recp_names != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
if (system->get_encrypt_data == NULL)
return NULL;
- return system->get_encrypt_data(recp_names);
+ for (cur = recp_names; cur; cur = cur->next) {
+ if (!g_slist_find_custom(uniq_names, cur->data, (GCompareFunc)strcmp)) {
+ uniq_names = g_slist_prepend(uniq_names, cur->data);
+ }
+ }
+ ret = system->get_encrypt_data(uniq_names);
+
+ g_slist_free(uniq_names);
+ return ret;
}
const gchar *privacy_get_encrypt_warning(const gchar *id)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
{
PrivacySystem *system;
- g_return_if_fail(id != NULL);
+ cm_return_if_fail(id != NULL);
system = privacy_get_system(id);
if (system == NULL)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (encdata == NULL) {
privacy_set_error(_("No recipient keys defined."));
return FALSE;
return system->encrypt(mimeinfo, encdata);
}
+
+gboolean privacy_auto_check_signatures(MimeInfo *mimeinfo)
+{
+ PrivacySystem *system;
+
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+
+ if (mimeinfo->privacy == NULL)
+ privacy_mimeinfo_is_signed(mimeinfo);
+
+ if (mimeinfo->privacy == NULL)
+ return FALSE;
+
+ system = privacy_data_get_system(mimeinfo->privacy);
+ if (system == NULL)
+ return FALSE;
+ if (system->auto_check_signatures == NULL)
+ return FALSE;
+
+ return system->auto_check_signatures();
+}