debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-18 21:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: crypto: abstract gpg context creation for clarity

Browse source 
The code filled with #ifdef GMIME_ATLEAST_26 is difficult to
read. Abstract gpg context creation into a function, with separate
implementations for GMime 2.4 and 2.6, to clarify the code.

There should be no functional changes.
This commit is contained in:
Jani Nikula 2013-03-30 15:53:15 +02:00 • committed by David Bremner
parent c933e54227
commit 8c6fd79795
1 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
crypto.c
View file

@ -20,6 +20,48 @@
#include "notmuch-client.h" #include "notmuch-client.h"
#ifdef GMIME_ATLEAST_26
/* Create a GPG context (GMime 2.6) */
static notmuch_crypto_context_t *
create_gpg_context (void)
{
notmuch_crypto_context_t *gpgctx;
/* TODO: GMimePasswordRequestFunc */
gpgctx = g_mime_gpg_context_new (NULL, "gpg");
if (! gpgctx)
return NULL;
g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, TRUE);
g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE);
return gpgctx;
}
#else /* GMIME_ATLEAST_26 */
/* Create a GPG context (GMime 2.4) */
static notmuch_crypto_context_t *
create_gpg_context (void)
{
GMimeSession *session;
notmuch_crypto_context_t *gpgctx;
session = g_object_new (g_mime_session_get_type (), NULL);
gpgctx = g_mime_gpg_context_new (session, "gpg");
g_object_unref (session);
if (! gpgctx)
return NULL;
g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE);
return gpgctx;
}
#endif /* GMIME_ATLEAST_26 */
/* for the specified protocol return the context pointer (initializing /* for the specified protocol return the context pointer (initializing
* if needed) */ * if needed) */
notmuch_crypto_context_t * notmuch_crypto_context_t *
@ -33,28 +75,14 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
* parameter names as defined in this document are * parameter names as defined in this document are
* case-insensitive." Thus, we use strcasecmp for the protocol. * case-insensitive." Thus, we use strcasecmp for the protocol.
*/ */
if ((strcasecmp (protocol, "application/pgp-signature") == 0) if (strcasecmp (protocol, "application/pgp-signature") == 0 ||
|| (strcasecmp (protocol, "application/pgp-encrypted") == 0)) { strcasecmp (protocol, "application/pgp-encrypted") == 0) {
if (!crypto->gpgctx) { if (! crypto->gpgctx) {
#ifdef GMIME_ATLEAST_26 crypto->gpgctx = create_gpg_context ();
/* TODO: GMimePasswordRequestFunc */ if (! crypto->gpgctx)
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"); fprintf (stderr, "Failed to construct gpg context.\n");
} }
}
cryptoctx = crypto->gpgctx; cryptoctx = crypto->gpgctx;
} else { } else {
fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n"); fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");
} }