2008-11-14 [colin] 3.6.1cvs26

[claws.git] / src / plugins / pgpcore / sgpgme.c

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 0fcce594308f1e717c4c998e10f87c3515624a59..6fc94d4677241a229e55e3bf14402616c401df76 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -36,7 +36,7 @@
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #endif
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
 #  include <sys/signal.h>
 #endif
 #ifndef G_OS_WIN32
@@ -72,7 +72,6 @@ gpgme_verify_result_t sgpgme_verify_signature(gpgme_ctx_t ctx, gpgme_data_t sig,
                debug_print("op_verify err %s\n", 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) {
@@ -121,8 +120,10 @@ SignatureStatus sgpgme_sigstat_gpgme_to_privacy(gpgme_ctx_t ctx, gpgme_verify_re
                        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:
@@ -199,6 +200,9 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                else
                        g_warning(_("PGP Core: Can't get key - no gpg-agent running."));
                warned = TRUE;
+       } else {
+               return g_strdup_printf(_("The signature can't be checked - %s"), 
+                       gpgme_strerror(err));
        }
        if (key)
                uname = extract_name(key->uids->uid);
@@ -256,11 +260,18 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
        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(
@@ -280,13 +291,13 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                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->validity));
                        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->validity));
                        break;
                case GPG_ERR_BAD_SIGNATURE:
                        g_string_append_printf(siginfo,
@@ -301,8 +312,9 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                        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;
                        }
@@ -330,7 +342,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                i++;
                sig = sig->next;
        }
-
+bail:
        ret = siginfo->str;
        g_string_free(siginfo, FALSE);
        return ret;
@@ -538,13 +550,15 @@ void sgpgme_init()
 #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) {