/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 the Claws Mail team
+ * Copyright (C) 1999-2015 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
*
* You should have received a copy of the GNU General Public License
* 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 <time.h>
#include <sys/types.h>
#ifndef G_OS_WIN32
# include <sys/wait.h>
+#else
+# include <pthread.h>
+# include <windows.h>
#endif
#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
# include <sys/signal.h>
#include "prefs_gpg.h"
#include "account.h"
#include "select-keys.h"
+#include "claws.h"
static void sgpgme_disable_all(void)
{
}
}
+gchar *get_gpg_executable_name()
+{
+ gpgme_engine_info_t e;
+
+ if (!gpgme_get_engine_info(&e)) {
+ while (e != NULL) {
+ if (e->protocol == GPGME_PROTOCOL_OpenPGP
+ && e->file_name != NULL) {
+ debug_print("Found gpg executable: '%s'\n", e->file_name);
+ return e->file_name;
+ }
+ }
+ }
+
+ return NULL;
+}
+
static gchar *extract_name(const char *uid)
{
if (uid == NULL)
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."));
+ 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);
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 ((key && key->uids) ? key->uids->validity : GPGME_VALIDITY_UNKNOWN) {
+ case GPGME_VALIDITY_ULTIMATE:
+ result = g_strdup_printf(_("Good signature from \"%s\" [ultimate]"), uname);
+ break;
+ case GPGME_VALIDITY_FULL:
+ result = g_strdup_printf(_("Good signature from \"%s\" [full]"), uname);
+ break;
+ case GPGME_VALIDITY_MARGINAL:
+ result = g_strdup_printf(_("Good signature from \"%s\" [marginal]"), uname);
+ break;
+ case GPGME_VALIDITY_UNKNOWN:
+ case GPGME_VALIDITY_UNDEFINED:
+ case GPGME_VALIDITY_NEVER:
+ default:
+ if (key) {
+ result = g_strdup_printf(_("Good signature from \"%s\""), uname);
+ } else {
+ 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;
+ }
break;
case GPG_ERR_SIG_EXPIRED:
- result = g_strdup_printf(_("Expired signature from %s."), uname);
+ result = g_strdup_printf(_("Expired signature from \"%s\""), uname);
break;
case GPG_ERR_KEY_EXPIRED:
- result = g_strdup_printf(_("Good signature from %s, but the key has expired."), uname);
+ result = g_strdup_printf(_("Good signature from \"%s\", but the key has expired"), uname);
break;
case GPG_ERR_CERT_REVOKED:
- result = g_strdup_printf(_("Good signature from %s, but the key has been revoked."), uname);
+ result = g_strdup_printf(_("Good signature from \"%s\", but the key has been revoked"), uname);
break;
case GPG_ERR_BAD_SIGNATURE:
- result = g_strdup_printf(_("Bad signature from %s."), uname);
+ result = g_strdup_printf(_("Bad signature from \"%s\""), uname);
break;
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);
+ 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."));
+ result = g_strdup(_("The signature has not been checked"));
break;
}
if (result == NULL)
while (sig) {
char buf[100];
struct tm lt;
- gpgme_user_id_t user = NULL;
gpgme_key_t key;
gpgme_error_t err;
const gchar *keytype, *keyid, *uid;
goto bail;
}
if (key) {
- user = key->uids;
keytype = gpgme_pubkey_algo_name(
key->subkeys->pubkey_algo);
keyid = key->subkeys->keyid;
- uid = user->uid;
+ uid = key->uids->uid;
} else {
keytype = "?";
keyid = "?";
case GPG_ERR_NO_ERROR:
g_string_append_printf(siginfo,
_("Good signature from uid \"%s\" (Validity: %s)\n"),
- uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
+ uid, get_validity_str((key && key->uids) ? key->uids->validity:GPGME_VALIDITY_UNKNOWN));
break;
case GPG_ERR_KEY_EXPIRED:
g_string_append_printf(siginfo,
case GPG_ERR_SIG_EXPIRED:
g_string_append_printf(siginfo,
_("Expired signature from uid \"%s\" (Validity: %s)\n"),
- uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
+ uid, get_validity_str((key && key->uids) ? key->uids->validity:GPGME_VALIDITY_UNKNOWN));
break;
case GPG_ERR_CERT_REVOKED:
g_string_append_printf(siginfo,
}
if (sig->status != GPG_ERR_BAD_SIGNATURE) {
gint j = 1;
- user = user ? user->next : NULL;
- while (user != NULL) {
- g_string_append_printf(siginfo,
- _(" uid \"%s\" (Validity: %s)\n"),
- user->uid,
- user->revoked==TRUE?_("Revoked"):get_validity_str(user->validity));
- j++;
- user = user->next;
+ if (key) {
+ key->uids = key->uids ? key->uids->next : NULL;
+ while (key->uids != NULL) {
+ g_string_append_printf(siginfo,
+ g_strconcat(" ",
+ _("uid \"%s\" (Validity: %s)\n"), NULL),
+ key->uids->uid,
+ key->uids->revoked==TRUE?_("Revoked"):get_validity_str(key->uids->validity));
+ j++;
+ key->uids = key->uids->next;
+ }
}
g_string_append_printf(siginfo,_("Owner Trust: %s\n"),
- get_owner_trust_str(key->owner_trust));
+ key ? get_owner_trust_str(key->owner_trust) : _("No key!"));
g_string_append(siginfo,
_("Primary key fingerprint:"));
const char* primary_fpr = NULL;
return NULL;
err = gpgme_data_new_from_filepart(&data, NULL, fp, mimeinfo->offset, mimeinfo->length);
+ fclose(fp);
debug_print("data %p (%d %d)\n", (void *)&data, mimeinfo->offset, mimeinfo->length);
if (err) {
if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
prefs_gpg_enable_agent(prefs_gpg_get_config()->use_gpg_agent);
- if (!getenv("GPG_AGENT_INFO") || !prefs_gpg_get_config()->use_gpg_agent) {
+ if (!g_getenv("GPG_AGENT_INFO") || !prefs_gpg_get_config()->use_gpg_agent) {
info.c = ctx;
gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info);
}
err = cm_gpgme_data_rewind(plain);
if (err) {
- debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
+ debug_print("can't seek (%d %d %s)\n", err, errno, g_strerror(errno));
}
debug_print("decrypted.\n");
err = cm_gpgme_data_rewind(plain);
if (err) {
- debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
+ debug_print("can't seek (%d %d %s)\n", err, errno, g_strerror(errno));
}
debug_print("decrypted.\n");
if (found_key != NULL) {
gpgme_key_release(key);
gpgme_op_keylist_end(ctx);
- g_warning("ambiguous specification of secret key '%s'\n", keyid);
+ g_warning("ambiguous specification of secret key '%s'", keyid);
privacy_set_error(_("Secret key specification is ambiguous"));
goto bail;
}
gpgme_key_release(found_key);
if (err) {
- g_warning("error adding secret key: %s\n",
+ g_warning("error adding secret key: %s",
gpgme_strerror(err));
privacy_set_error(_("Error setting secret key: %s"),
gpgme_strerror(err));
{
gchar *ctype_locale = NULL, *messages_locale = NULL;
gchar *ctype_utf8_locale = NULL, *messages_utf8_locale = NULL;
+ gpgme_error_t err = 0;
gpgme_engine_info_t engineInfo;
+
+ if (strcmp(prefs_gpg_get_config()->gpg_path, "") != 0
+ && access(prefs_gpg_get_config()->gpg_path, X_OK) != -1) {
+ err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, prefs_gpg_get_config()->gpg_path, NULL);
+ if (err != GPG_ERR_NO_ERROR)
+ g_warning("failed to set crypto engine configuration: %s", gpgme_strerror(err));
+ }
+
if (gpgme_check_version("1.0.0")) {
#ifdef LC_CTYPE
debug_print("setting gpgme CTYPE locale\n");
gpgmegtk_free_passphrase();
}
+#ifdef G_OS_WIN32
+struct _ExportCtx {
+ gboolean done;
+ gchar *cmd;
+ DWORD exitcode;
+};
+
+static void *_export_threaded(void *arg)
+{
+ struct _ExportCtx *ctx = (struct _ExportCtx *)arg;
+ gboolean result;
+
+ PROCESS_INFORMATION pi = {0};
+ STARTUPINFO si = {0};
+
+ result = CreateProcess(NULL, ctx->cmd, NULL, NULL, FALSE,
+ NORMAL_PRIORITY_CLASS | CREATE_NO_WINDOW,
+ NULL, NULL, &si, &pi);
+
+ if (!result) {
+ debug_print("Couldn't execute '%s'\n", ctx->cmd);
+ } else {
+ WaitForSingleObject(pi.hProcess, 10000);
+ result = GetExitCodeProcess(pi.hProcess, &ctx->exitcode);
+ if (ctx->exitcode == STILL_ACTIVE) {
+ debug_print("Process still running, terminating it.\n");
+ TerminateProcess(pi.hProcess, 255);
+ }
+
+ CloseHandle(pi.hProcess);
+ CloseHandle(pi.hThread);
+
+ if (!result) {
+ debug_print("Process executed, but we couldn't get its exit code (huh?)\n");
+ }
+ }
+
+ ctx->done = TRUE;
+ return NULL;
+}
+#endif
+
void sgpgme_create_secret_key(PrefsAccount *account, gboolean ask_create)
{
AlertValue val = G_ALERTDEFAULT;
gpgme_ctx_t ctx;
GtkWidget *window = NULL;
gpgme_genkey_result_t key;
+ gboolean exported = FALSE;
if (account == NULL)
account = account_get_default();
"Do you want to create a new key pair now?"),
GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
if (val == G_ALERTDEFAULT) {
- prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
- prefs_gpg_save_config();
return;
}
}
GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
g_free(buf);
if (val == G_ALERTALTERNATE) {
+ gchar *gpgbin = get_gpg_executable_name();
+ gchar *cmd = g_strdup_printf("\"%s\" --batch --no-tty --send-keys %s",
+ (gpgbin ? gpgbin : "gpg"), key->fpr);
+ debug_print("Executing command: %s\n", cmd);
+
#ifndef G_OS_WIN32
- gchar *cmd = g_strdup_printf("gpg --no-tty --send-keys %s", key->fpr);
int res = 0;
pid_t pid = 0;
pid = fork();
}
} while(1);
}
- if (res == 0) {
+
+ if (res == 0)
+ exported = TRUE;
+#else
+ /* We need to call gpg in a separate thread, so that waiting for
+ * it to finish does not block the UI. */
+ pthread_t pt;
+ struct _ExportCtx *ectx = malloc(sizeof(struct _ExportCtx));
+
+ ectx->done = FALSE;
+ ectx->exitcode = STILL_ACTIVE;
+ ectx->cmd = cmd;
+
+ if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
+ _export_threaded, (void *)ectx) != 0) {
+ debug_print("Couldn't create thread, continuing unthreaded.\n");
+ _export_threaded(ctx);
+ } else {
+ debug_print("Thread created, waiting for it to finish...\n");
+ while (!ectx->done)
+ claws_do_idle();
+ }
+
+ debug_print("Thread finished.\n");
+ pthread_join(pt, NULL);
+
+ if (ectx->exitcode == 0)
+ exported = TRUE;
+
+ g_free(ectx);
+#endif
+ g_free(cmd);
+
+ if (exported) {
alertpanel_notice(_("Key exported."));
} else {
alertpanel_error(_("Couldn't export key."));
}
- g_free(cmd);
-#else
- alertpanel_error(_("Key export isn't implemented in Windows."));
-#endif
}
}
- prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
- prefs_gpg_save_config();
gpgme_release(ctx);
}
if (prefs_gpg_get_config()->gpg_ask_create_key &&
!sgpgme_has_secret_key()) {
sgpgme_create_secret_key(NULL, TRUE);
- } else {
- prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
- prefs_gpg_save_config();
- }
+ }
+
+ prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
+ prefs_gpg_save_config();
}
void *sgpgme_data_release_and_get_mem(gpgme_data_t data, size_t *len)
/* 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);
- if (result == NULL) {
- g_warning("can't allocate memory\n");
+ void *rresult = realloc(result, r + w);
+ if (rresult == NULL) {
+ g_warning("can't allocate memory");
+ if (result != NULL)
+ free(result);
return NULL;
}
+ result = rresult;
memcpy(result+w, buf, r);
w += r;
}
projects / claws.git / blobdiff