X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=crypto.c;h=a6eb27db7f630c131149377f7e51a190df86f613;hp=9736517f7f6d3ef633438f0c312e3b7d3873c668;hb=005c2f0df17de8afdf9f67b923d26f2358236171;hpb=8c6fd797952d38e03d46fd6b57bd6a1a63474de8

diff --git a/crypto.c b/crypto.c
index 9736517f..a6eb27db 100644
--- a/crypto.c
+++ b/crypto.c
@@ -20,16 +20,14 @@
 
 #include "notmuch-client.h"
 
-#ifdef GMIME_ATLEAST_26
-
 /* Create a GPG context (GMime 2.6) */
 static notmuch_crypto_context_t *
-create_gpg_context (void)
+create_gpg_context (const char *gpgpath)
 {
     notmuch_crypto_context_t *gpgctx;
 
     /* TODO: GMimePasswordRequestFunc */
-    gpgctx = g_mime_gpg_context_new (NULL, "gpg");
+    gpgctx = g_mime_gpg_context_new (NULL, gpgpath ? gpgpath : "gpg");
     if (! gpgctx)
 	return NULL;
 
@@ -39,29 +37,6 @@ create_gpg_context (void)
     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 *
@@ -69,6 +44,11 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
 {
     notmuch_crypto_context_t *cryptoctx = NULL;
 
+    if (! protocol) {
+	fprintf (stderr, "Cryptographic protocol is empty.\n");
+	return cryptoctx;
+    }
+
     /* 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
@@ -78,7 +58,7 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
     if (strcasecmp (protocol, "application/pgp-signature") == 0 ||
 	strcasecmp (protocol, "application/pgp-encrypted") == 0) {
 	if (! crypto->gpgctx) {
-	    crypto->gpgctx = create_gpg_context ();
+	    crypto->gpgctx = create_gpg_context (crypto->gpgpath);
 	    if (! crypto->gpgctx)
 		fprintf (stderr, "Failed to construct gpg context.\n");
 	}