mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 17:34:54 +01:00
c5c5770b22
For decryption, we expect there to be a functioning gpg-agent, and we
want gpg to talk to it for any needed credentials. There's a gmime
function to declare that: g_mime_gpg_context_set_use_agent() [1], [2].
Start using it.
I had gpg-agent running, but gpg "use-agent" configuration option
disabled. This resulted in an error message from 'notmuch show':
Failed to decrypt part: Canceled.
and json had this:
"encstatus" : [ { "status" : "bad" } ]
One could argue the "use-agent" option should be enabled, but I'd like
to use the agent only as a last resort. I think that's irrelevant
though. There's a gmime function to declare what we expect, so we
should use it. Conveniently it also fixes the problem in a user
friendly way.
[1] http://git.gnome.org/browse/gmime/commit/?id=ed985397843a9da3745a8b5de3d1d652acd24724
[2] https://bugzilla.gnome.org/show_bug.cgi?id=651826
74 lines
2.4 KiB
C
74 lines
2.4 KiB
C
/* notmuch - Not much of an email program, (just index and search)
|
|
*
|
|
* Copyright © 2012 Jameson Rollins
|
|
*
|
|
* 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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, see http://www.gnu.org/licenses/ .
|
|
*
|
|
* Authors: Jameson Rollins <jrollins@finestructure.net>
|
|
*/
|
|
|
|
#include "notmuch-client.h"
|
|
|
|
/* for the specified protocol return the context pointer (initializing
|
|
* if needed) */
|
|
notmuch_crypto_context_t *
|
|
notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
|
|
{
|
|
notmuch_crypto_context_t *cryptoctx = NULL;
|
|
|
|
/* As per RFC 1847 section 2.1: "the [protocol] value token is
|
|
* comprised of the type and sub-type tokens of the Content-Type".
|
|
* As per RFC 1521 section 2: "Content-Type values, subtypes, and
|
|
* parameter names as defined in this document are
|
|
* case-insensitive." Thus, we use strcasecmp for the protocol.
|
|
*/
|
|
if ((strcasecmp (protocol, "application/pgp-signature") == 0)
|
|
|| (strcasecmp (protocol, "application/pgp-encrypted") == 0)) {
|
|
if (!crypto->gpgctx) {
|
|
#ifdef GMIME_ATLEAST_26
|
|
/* TODO: GMimePasswordRequestFunc */
|
|
crypto->gpgctx = g_mime_gpg_context_new (NULL, "gpg");
|
|
#else
|
|
GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
|
|
crypto->gpgctx = g_mime_gpg_context_new (session, "gpg");
|
|
g_object_unref (session);
|
|
#endif
|
|
if (crypto->gpgctx) {
|
|
#ifdef GMIME_ATLEAST_26
|
|
g_mime_gpg_context_set_use_agent ((GMimeGpgContext*) crypto->gpgctx, TRUE);
|
|
#endif
|
|
g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) crypto->gpgctx, FALSE);
|
|
} else {
|
|
fprintf (stderr, "Failed to construct gpg context.\n");
|
|
}
|
|
}
|
|
cryptoctx = crypto->gpgctx;
|
|
|
|
} else {
|
|
fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");
|
|
}
|
|
|
|
return cryptoctx;
|
|
}
|
|
|
|
int
|
|
notmuch_crypto_cleanup (notmuch_crypto_t *crypto)
|
|
{
|
|
if (crypto->gpgctx) {
|
|
g_object_unref (crypto->gpgctx);
|
|
crypto->gpgctx = NULL;
|
|
}
|
|
|
|
return 0;
|
|
}
|