/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws 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 <glib/gi18n.h>
#include <stdio.h>
#include <errno.h>
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
#include "sgpgme.h"
#include "privacy.h"
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));
return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
}
debug_print("err code %d\n", gpg_err_code(sig->status));
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- return SIGNATURE_OK;
+ switch (gpg_err_code(sig->validity)) {
+ case GPGME_VALIDITY_NEVER:
+ return SIGNATURE_INVALID;
+ case GPGME_VALIDITY_UNKNOWN:
+ case GPGME_VALIDITY_UNDEFINED:
+ case GPGME_VALIDITY_MARGINAL:
+ case GPGME_VALIDITY_FULL:
+ case GPGME_VALIDITY_ULTIMATE:
+ return SIGNATURE_OK;
+ default:
+ return SIGNATURE_CHECK_FAILED;
+ }
case GPG_ERR_SIG_EXPIRED:
case GPG_ERR_KEY_EXPIRED:
return SIGNATURE_WARN;
gchar *uname = NULL;
gpgme_key_t key;
gchar *result = NULL;
+ gpgme_error_t err = 0;
+ static gboolean warned = FALSE;
if (GPOINTER_TO_INT(status) == -GPG_ERR_SYSTEM_ERROR) {
- return g_strdup(_("The signature can't be checked - GPG error."));
+ return g_strdup_printf(_("The signature can't be checked - %s"), privacy_get_error());
}
if (status == NULL) {
return g_strdup(_("The signature has not been checked."));
}
- gpgme_get_key(ctx, sig->fpr, &key, 0);
+ err = gpgme_get_key(ctx, sig->fpr, &key, 0);
+ if (gpg_err_code(err) == GPG_ERR_NO_AGENT) {
+ if (!warned)
+ alertpanel_error(_("PGP Core: Can't get key - no gpg-agent running."));
+ else
+ g_warning(_("PGP Core: Can't get key - no gpg-agent running."));
+ warned = TRUE;
+ }
if (key)
uname = extract_name(key->uids->uid);
else
uname = g_strdup("<?>");
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- result = g_strdup_printf(_("Good signature from %s."),
- uname);
+ 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_UNKNOWN:
+ case GPGME_VALIDITY_UNDEFINED:
+ case GPGME_VALIDITY_NEVER:
+ default:
+ result = g_strdup_printf(_("Good signature (untrusted) from %s."), uname);
+ break;
+ }
break;
case GPG_ERR_SIG_EXPIRED:
result = g_strdup_printf(_("Expired signature from %s."), uname);
case GPG_ERR_BAD_SIGNATURE:
result = g_strdup_printf(_("Bad signature from %s."), uname);
break;
- case GPG_ERR_NO_PUBKEY:
- result = g_strdup(_("No key available to verify this signature."));
+ case GPG_ERR_NO_PUBKEY: {
+ gchar *id = g_strdup(sig->fpr + strlen(sig->fpr)-8);
+ result = g_strdup_printf(_("Key 0x%s not available to verify this signature."), id);
+ g_free(id);
break;
+ }
default:
result = g_strdup(_("The signature has not been checked."));
break;
g_string_append_printf(siginfo,
_("Primary key fingerprint: %s\n"),
sig ? sig->fpr: "?");
+#ifdef HAVE_GPGME_PKA_TRUST
+ if (sig->pka_trust == 1 && sig->pka_address) {
+ g_string_append_printf(siginfo,
+ _("WARNING: Signer's address \"%s\" "
+ "does not match DNS entry\n"),
+ sig->pka_address);
+ }
+ else if (sig->pka_trust == 2 && sig->pka_address) {
+ g_string_append_printf(siginfo,
+ _("Verified signer's address is \"%s\"\n"),
+ sig->pka_address);
+ /* FIXME: Compare the address to the
+ * From: address. */
+ }
+#endif /*HAVE_GPGME_PKA_TRUST*/
}
-
+
g_string_append(siginfo, "\n");
i++;
sig = sig->next;
if (err) {
debug_print ("gpgme_data_new_from_file failed: %s\n",
gpgme_strerror (err));
+ privacy_set_error(_("Couldn't get data from message, %s"), gpgme_strerror(err));
return NULL;
}
return data;
memset (&info, 0, sizeof info);
- if (gpgme_data_new(&plain) != GPG_ERR_NO_ERROR) {
+ if ((err = gpgme_data_new(&plain)) != GPG_ERR_NO_ERROR) {
gpgme_release(ctx);
+ privacy_set_error(_("Couldn't initialize data, %s"), gpgme_strerror(err));
return NULL;
}
- if (!getenv("GPG_AGENT_INFO")) {
+ if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
+ if (!getenv("GPG_AGENT_INFO")) {
+ info.c = ctx;
+ gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
+ }
+ } else {
info.c = ctx;
- gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
- }
-
- err = gpgme_op_decrypt_verify(ctx, cipher, plain);
- if (err != GPG_ERR_NO_ERROR) {
- debug_print("can't decrypt (%s)\n", gpgme_strerror(err));
- gpgmegtk_free_passphrase();
- gpgme_data_release(plain);
- return NULL;
+ gpgme_set_passphrase_cb (ctx, NULL, &info);
}
+
+
+ if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
+ err = gpgme_op_decrypt_verify(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);
- if (err) {
- debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
- }
+ err = gpgme_data_rewind(plain);
+ if (err) {
+ debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
+ }
+
+ debug_print("decrypted.\n");
+ *status = gpgme_op_verify_result (ctx);
+ } else {
+ err = gpgme_op_decrypt(ctx, cipher, plain);
+ if (err != GPG_ERR_NO_ERROR) {
+ debug_print("can't decrypt (%s)\n", gpgme_strerror(err));
+ gpgmegtk_free_passphrase();
+ gpgme_data_release(plain);
+ return NULL;
+ }
- debug_print("decrypted.\n");
- *status = gpgme_op_verify_result (ctx);
+ err = gpgme_data_rewind(plain);
+ if (err) {
+ debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
+ }
+ debug_print("decrypted.\n");
+ *status = gpgme_op_verify_result (ctx);
+ }
return plain;
}
-gchar *sgpgme_get_encrypt_data(GSList *recp_names)
+gchar *sgpgme_get_encrypt_data(GSList *recp_names, gpgme_protocol_t proto)
{
SelectionResult result = KEY_SELECTION_CANCEL;
- gpgme_key_t *keys = gpgmegtk_recipient_selection(recp_names, &result);
+ gpgme_key_t *keys = gpgmegtk_recipient_selection(recp_names, &result,
+ proto);
gchar *ret = NULL;
int i = 0;
config = prefs_gpg_account_get_config(account);
+ switch(config->sign_key) {
+ case SIGN_KEY_DEFAULT:
+ debug_print("using default gnupg key\n");
+ break;
+ case SIGN_KEY_BY_FROM:
+ debug_print("using key for %s\n", account->address);
+ break;
+ case SIGN_KEY_CUSTOM:
+ debug_print("using key for %s\n", config->sign_key_id);
+ break;
+ }
+
if (config->sign_key != SIGN_KEY_DEFAULT) {
gchar *keyid;
gpgme_key_t key;
+ gpgme_error_t err;
if (config->sign_key == SIGN_KEY_BY_FROM)
keyid = account->address;
else
return FALSE;
- gpgme_op_keylist_start(ctx, keyid, 1);
- while (!gpgme_op_keylist_next(ctx, &key)) {
+ err = gpgme_op_keylist_start(ctx, keyid, 1);
+ if (err) {
+ g_warning("setup_signers start: %s",
+ gpg_strerror(err));
+ return FALSE;
+ }
+ while (!(err = gpgme_op_keylist_next(ctx, &key))) {
gpgme_signers_add(ctx, key);
gpgme_key_release(key);
}
- gpgme_op_keylist_end(ctx);
+ if (err && gpg_err_code(err) != GPG_ERR_EOF) {
+ g_warning("setup_signers next: %s",
+ gpg_strerror(err));
+ return FALSE;
+ }
+ err = gpgme_op_keylist_end(ctx);
+ if (err) {
+ g_warning("setup_signers end: %s",
+ gpg_strerror(err));
+ return FALSE;
+ }
}
prefs_gpg_account_free_config(config);
void sgpgme_init()
{
gpgme_engine_info_t engineInfo;
- if (gpgme_check_version("0.4.5")) {
+ if (gpgme_check_version("1.0.0")) {
+#ifdef LC_CTYPE
gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL));
+#endif
+#ifdef LC_MESSAGES
gpgme_set_locale(NULL, LC_MESSAGES, setlocale(LC_MESSAGES, NULL));
+#endif
if (!gpgme_get_engine_info(&engineInfo)) {
while (engineInfo) {
debug_print("GpgME Protocol: %s\n Version: %s\n",
projects / claws.git / blobdiff