/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2012 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_GPGME
#include <glib.h>
#include <glib/gi18n.h>
#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/wait.h>
+#ifndef G_OS_WIN32
+# include <sys/wait.h>
+#endif
+#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+# include <sys/signal.h>
+#endif
#ifndef G_OS_WIN32
#include <sys/mman.h>
#endif
if ((err = gpgme_op_verify(ctx, sig, plain, dummy)) != GPG_ERR_NO_ERROR) {
debug_print("op_verify err %s\n", gpgme_strerror(err));
- privacy_set_error(gpgme_strerror(err));
+ privacy_set_error("%s", gpgme_strerror(err));
return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
-
}
status = gpgme_op_verify_result(ctx);
-
+ if (status && status->signatures == NULL) {
+ debug_print("no signature found\n");
+ privacy_set_error(_("No signature found"));
+ return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
+ }
return status;
}
return SIGNATURE_CHECK_FAILED;
}
case GPG_ERR_SIG_EXPIRED:
- case GPG_ERR_KEY_EXPIRED:
+ case GPG_ERR_CERT_REVOKED:
return SIGNATURE_WARN;
+ case GPG_ERR_KEY_EXPIRED:
+ return SIGNATURE_KEY_EXPIRED;
case GPG_ERR_BAD_SIGNATURE:
return SIGNATURE_INVALID;
case GPG_ERR_NO_PUBKEY:
else
g_warning(_("PGP Core: Can't get key - no gpg-agent running."));
warned = TRUE;
+ } else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) != GPG_ERR_EOF) {
+ return g_strdup_printf(_("The signature can't be checked - %s"),
+ gpgme_strerror(err));
}
if (key)
uname = extract_name(key->uids->uid);
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
switch (gpg_err_code(sig->validity)) {
- case GPGME_VALIDITY_MARGINAL:
case GPGME_VALIDITY_FULL:
case GPGME_VALIDITY_ULTIMATE:
result = g_strdup_printf(_("Good signature from %s."), uname);
break;
+ case GPGME_VALIDITY_MARGINAL:
case GPGME_VALIDITY_UNKNOWN:
case GPGME_VALIDITY_UNDEFINED:
case GPGME_VALIDITY_NEVER:
gint i = 0;
gchar *ret;
GString *siginfo;
- gpgme_signature_t sig = status->signatures;
-
+ gpgme_signature_t sig = NULL;
+
siginfo = g_string_sized_new(64);
+ if (status == NULL) {
+ g_string_append_printf(siginfo,
+ _("Error checking signature: no status\n"));
+ goto bail;
+ }
+
+ sig = status->signatures;
+
while (sig) {
gpgme_user_id_t user = NULL;
gpgme_key_t key;
-
+ gpgme_error_t err;
const gchar *keytype, *keyid, *uid;
- gpgme_get_key(ctx, sig->fpr, &key, 0);
+ err = gpgme_get_key(ctx, sig->fpr, &key, 0);
+ if (err != GPG_ERR_NO_ERROR) {
+ key = NULL;
+ g_string_append_printf(siginfo,
+ _("Error checking signature: %s\n"),
+ gpgme_strerror(err));
+ goto bail;
+ }
if (key) {
user = key->uids;
keytype = gpgme_pubkey_algo_name(
case GPG_ERR_NO_ERROR:
case GPG_ERR_KEY_EXPIRED:
g_string_append_printf(siginfo,
- _("Good signature from \"%s\" (Trust: %s)\n"),
- uid, get_validity_str(sig->validity));
+ _("Good signature from uid \"%s\" (Validity: %s)\n"),
+ uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
break;
case GPG_ERR_SIG_EXPIRED:
g_string_append_printf(siginfo,
- _("Expired signature from \"%s\"\n"),
- uid);
+ _("Expired signature from uid \"%s\" (Validity: %s)\n"),
+ uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
break;
case GPG_ERR_BAD_SIGNATURE:
g_string_append_printf(siginfo,
user = user ? user->next : NULL;
while (user != NULL) {
g_string_append_printf(siginfo,
- _(" aka \"%s\"\n"),
- user->uid);
+ _(" uid \"%s\" (Validity: %s)\n"),
+ user->uid,
+ get_validity_str(user->validity));
j++;
user = user->next;
}
- g_string_append_printf(siginfo,
- _("Primary key fingerprint: %s\n"),
- sig ? sig->fpr: "?");
+ g_string_append(siginfo,
+ _("Primary key fingerprint:"));
+ const char* primary_fpr = NULL;
+ if (key && key->subkeys && key->subkeys->fpr)
+ primary_fpr = key->subkeys->fpr;
+ else
+ g_string_append(siginfo, " ?");
+ int idx; /* now pretty-print the fingerprint */
+ for (idx=0; primary_fpr && *primary_fpr!='\0'; idx++, primary_fpr++) {
+ if (idx%4==0)
+ g_string_append_c(siginfo, ' ');
+ if (idx%20==0)
+ g_string_append_c(siginfo, ' ');
+ g_string_append_c(siginfo, (gchar)*primary_fpr);
+ }
+ g_string_append_c(siginfo, '\n');
#ifdef HAVE_GPGME_PKA_TRUST
if (sig->pka_trust == 1 && sig->pka_address) {
g_string_append_printf(siginfo,
i++;
sig = sig->next;
}
-
+bail:
ret = siginfo->str;
g_string_free(siginfo, FALSE);
return ret;
debug_print("tmp file %s\n", tmp_file);
err = gpgme_data_new_from_file(&data, tmp_file, 1);
- g_unlink(tmp_file);
+ claws_unlink(tmp_file);
g_free(tmp_file);
debug_print("data %p (%d %d)\n", (void *)&data, mimeinfo->offset, mimeinfo->length);
}
if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
- if (!getenv("GPG_AGENT_INFO")) {
+ prefs_gpg_enable_agent(prefs_gpg_get_config()->use_gpg_agent);
+ if (!getenv("GPG_AGENT_INFO") || !prefs_gpg_get_config()->use_gpg_agent) {
info.c = ctx;
gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
}
} else {
+ prefs_gpg_enable_agent(TRUE);
info.c = ctx;
gpgme_set_passphrase_cb (ctx, NULL, &info);
}
return NULL;
}
- err = gpgme_data_rewind(plain);
+ err = cm_gpgme_data_rewind(plain);
if (err) {
debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
}
err = gpgme_op_decrypt(ctx, cipher, plain);
if (err != GPG_ERR_NO_ERROR) {
debug_print("can't decrypt (%s)\n", gpgme_strerror(err));
+ privacy_set_error("%s", gpgme_strerror(err));
gpgmegtk_free_passphrase();
gpgme_data_release(plain);
return NULL;
}
- err = gpgme_data_rewind(plain);
+ err = cm_gpgme_data_rewind(plain);
if (err) {
debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
}
return ret;
}
-gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account)
+gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account,
+ const gchar *from_addr)
{
GPGAccountConfig *config;
+ const gchar *signer_addr = account->address;
gpgme_signers_clear(ctx);
+ if (from_addr)
+ signer_addr = from_addr;
config = prefs_gpg_account_get_config(account);
switch(config->sign_key) {
debug_print("using default gnupg key\n");
break;
case SIGN_KEY_BY_FROM:
- debug_print("using key for %s\n", account->address);
+ debug_print("using key for %s\n", signer_addr);
break;
case SIGN_KEY_CUSTOM:
debug_print("using key for %s\n", config->sign_key_id);
}
if (config->sign_key != SIGN_KEY_DEFAULT) {
- gchar *keyid;
+ const gchar *keyid;
gpgme_key_t key, key2;
gpgme_error_t err;
if (config->sign_key == SIGN_KEY_BY_FROM)
- keyid = account->address;
+ keyid = signer_addr;
else if (config->sign_key == SIGN_KEY_CUSTOM)
keyid = config->sign_key_id;
else
goto bail;
err = gpgme_op_keylist_start(ctx, keyid, 1);
- if (!err)
- err = gpgme_op_keylist_next(ctx, &key);
+ if (!err) {
+ do {
+ err = gpgme_op_keylist_next(ctx, &key);
+ if (!err && key && key->protocol == gpgme_get_protocol(ctx) &&
+ !key->expired && !key->revoked && !key->disabled)
+ break;
+ if (!err && key && key->protocol != gpgme_get_protocol(ctx)) {
+ debug_print("skipping a key (wrong protocol %d)\n", key->protocol);
+ gpgme_key_release(key);
+ }
+ if (!err && key && (key->expired || key->revoked || key->disabled)) {
+
+ debug_print("skipping a key");
+ if (key->expired)
+ debug_print(" expired");
+ if (key->revoked)
+ debug_print(" revoked");
+ if (key->disabled)
+ debug_print(" disabled");
+ debug_print("\n");
+ gpgme_key_release(key);
+ }
+ } while (!err);
+ }
if (err) {
g_warning("setup_signers start: %s", gpgme_strerror(err));
privacy_set_error(_("Secret key not found (%s)"), gpgme_strerror(err));
goto bail;
}
- err = gpgme_op_keylist_next(ctx, &key2);
+ do {
+ err = gpgme_op_keylist_next(ctx, &key2);
+ if (!err && key2 && key2->protocol == gpgme_get_protocol(ctx) &&
+ !key2->expired && !key2->revoked && !key2->disabled)
+ break;
+ if (!err && key2 && key2->protocol != gpgme_get_protocol(ctx)) {
+ debug_print("skipping a key (wrong protocol %d)\n", key2->protocol);
+ gpgme_key_release(key2);
+ }
+ if (!err && key2 && (key2->expired || key2->revoked || key2->disabled)) {
+ debug_print("skipping a key");
+ if (key2->expired)
+ debug_print(" expired");
+ if (key2->revoked)
+ debug_print(" revoked");
+ if (key2->disabled)
+ debug_print(" disabled");
+ debug_print("\n");
+ gpgme_key_release(key2);
+ }
+ } while (!err);
if (!err) {
+ gpgme_key_release(key2);
g_warning("ambiguous specification of secret key '%s'\n",
keyid);
privacy_set_error(_("Secret key specification is ambiguous"));
gpgme_op_keylist_end(ctx);
err = gpgme_signers_add(ctx, key);
+ debug_print("got key (proto %d (pgp %d, smime %d).\n", key->protocol,
+ GPGME_PROTOCOL_OpenPGP, GPGME_PROTOCOL_CMS);
gpgme_key_release(key);
if (err) {
#endif
if (!gpgme_get_engine_info(&engineInfo)) {
while (engineInfo) {
+#ifndef G_OS_WIN32
debug_print("GpgME Protocol: %s\n"
"Version: %s (req %s)\n"
"Executable: %s\n",
- gpgme_get_protocol_name(engineInfo->protocol),
+ gpgme_get_protocol_name(engineInfo->protocol) ? gpgme_get_protocol_name(engineInfo->protocol):"???",
engineInfo->version ? engineInfo->version:"???",
engineInfo->req_version ? engineInfo->req_version:"???",
engineInfo->file_name ? engineInfo->file_name:"???");
+#endif
if (engineInfo->protocol == GPGME_PROTOCOL_OpenPGP
&& gpgme_engine_check_version(engineInfo->protocol) !=
GPG_ERR_NO_ERROR) {
}
if (ask_create) {
val = alertpanel(_("No PGP key found"),
- _("Sylpheed-Claws did not find a secret PGP key, "
+ _("Claws Mail did not find a secret PGP key, "
"which means that you won't be able to sign "
"emails or receive encrypted emails.\n"
"Do you want to create a new key pair now?"),
err = gpgme_op_genkey(ctx, key_parms, NULL, NULL);
g_free(key_parms);
- gtk_widget_destroy(window);
+ label_window_destroy(window);
if (err) {
alertpanel_error(_("Couldn't generate a new key pair: %s"), gpgme_strerror(err));
g_free(buf);
if (val == G_ALERTALTERNATE) {
#ifndef G_OS_WIN32
- gchar *cmd = g_strdup_printf("gpg --send-keys %s", key->fpr);
+ gchar *cmd = g_strdup_printf("gpg --no-tty --send-keys %s", key->fpr);
int res = 0;
pid_t pid = 0;
pid = fork();
} else if (pid == 0) {
/* son */
res = system(cmd);
+ res = WEXITSTATUS(res);
_exit(res);
} else {
int status = 0;
debug_print("err : %s\n", gpgme_strerror(err));
return TRUE;
}
+check_again:
err = gpgme_op_keylist_start(ctx, NULL, TRUE);
if (!err)
err = gpgme_op_keylist_next(ctx, &key);
gpgme_op_keylist_end(ctx);
- gpgme_release(ctx);
- if (gpg_err_code(err) == GPG_ERR_EOF)
+ if (gpg_err_code(err) == GPG_ERR_EOF) {
+ if (gpgme_get_protocol(ctx) != GPGME_PROTOCOL_CMS) {
+ gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
+ goto check_again;
+ }
+ gpgme_release(ctx);
return FALSE;
- else
+ } else {
+ gpgme_release(ctx);
return TRUE;
+ }
}
void sgpgme_check_create_key(void)
prefs_gpg_save_config();
}
}
+
+void *sgpgme_data_release_and_get_mem(gpgme_data_t data, size_t *len)
+{
+ char buf[BUFSIZ];
+ void *result = NULL;
+ ssize_t r = 0;
+ size_t w = 0;
+
+ if (data == NULL)
+ return NULL;
+ if (len == NULL)
+ return NULL;
+
+ /* I know it's deprecated, but we don't compile with _LARGEFILE */
+ cm_gpgme_data_rewind(data);
+ while ((r = gpgme_data_read(data, buf, BUFSIZ)) > 0) {
+ result = realloc(result, r + w);
+ memcpy(result+w, buf, r);
+ w += r;
+ }
+
+ *len = w;
+
+ gpgme_data_release(data);
+ if (r < 0) {
+ free(result);
+ *len = 0;
+ return NULL;
+ }
+ return result;
+}
+
+gpgme_error_t cm_gpgme_data_rewind(gpgme_data_t dh)
+{
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+ if (gpgme_data_seek(dh, (off_t)0, SEEK_SET) == -1)
+ return gpg_error_from_errno(errno);
+ else
+ return 0;
+#else
+ return gpgme_data_rewind(dh);
+#endif
+}
+
#endif /* USE_GPGME */
projects / claws.git / blobdiff