diff options
author | Jani Nikula <jani@nikula.org> | 2013-03-30 15:53:15 +0200 |
---|---|---|
committer | David Bremner <bremner@unb.ca> | 2013-04-01 15:39:22 -0400 |
commit | 8c6fd797952d38e03d46fd6b57bd6a1a63474de8 (patch) | |
tree | 8bc8b67eed59941e0a76de4709839b4d6551eb6e /crypto.c | |
parent | c933e54227ccd9d73bac814cc0cd9c2bbc13e91c (diff) |
cli: crypto: abstract gpg context creation for clarity
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.
Diffstat (limited to 'crypto.c')
-rw-r--r-- | crypto.c | 66 |
1 files changed, 47 insertions, 19 deletions
@@ -20,6 +20,48 @@ #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 * if needed) */ 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 * 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 { + if (strcasecmp (protocol, "application/pgp-signature") == 0 || + strcasecmp (protocol, "application/pgp-encrypted") == 0) { + if (! crypto->gpgctx) { + crypto->gpgctx = create_gpg_context (); + if (! crypto->gpgctx) fprintf (stderr, "Failed to construct gpg context.\n"); - } } cryptoctx = crypto->gpgctx; - } else { fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n"); } |