From: David Bremner Date: Tue, 9 Dec 2014 20:01:10 +0000 (+0100) Subject: [PATCH 1/2] CLI: set up infrastructure to make path to gpg configurable. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b4991ad75b1518d23898d6f43abbdd08f119e37;p=notmuch-archives.git [PATCH 1/2] CLI: set up infrastructure to make path to gpg configurable. --- diff --git a/ef/a03a12d5c05ea497dbdf1256464ad573a2c2a6 b/ef/a03a12d5c05ea497dbdf1256464ad573a2c2a6 new file mode 100644 index 000000000..cc88a76a8 --- /dev/null +++ b/ef/a03a12d5c05ea497dbdf1256464ad573a2c2a6 @@ -0,0 +1,144 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 20AF0431FD8 + for ; Tue, 9 Dec 2014 12:01:28 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id lwLR+m5I1t2K for ; + Tue, 9 Dec 2014 12:01:24 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4D0D1431FCB + for ; Tue, 9 Dec 2014 12:01:24 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1XyQyI-0003HC-5n; Tue, 09 Dec 2014 16:01:22 -0400 +Received: (nullmailer pid 23746 invoked by uid 1000); Tue, 09 Dec 2014 + 20:01:16 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] CLI: set up infrastructure to make path to gpg + configurable. +Date: Tue, 9 Dec 2014 21:01:10 +0100 +Message-Id: <1418155271-23704-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.3 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 09 Dec 2014 20:01:28 -0000 + +GMIME takes a path to gpg, but we hardcode that path. In this commit +we push hardcoding all the way up to the top level of a notmuch +command, where we can later make it configurable. +--- + crypto.c | 10 +++++----- + notmuch-client.h | 1 + + notmuch-reply.c | 3 ++- + notmuch-show.c | 3 ++- + 4 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/crypto.c b/crypto.c +index 6f4a6db..026640f 100644 +--- a/crypto.c ++++ b/crypto.c +@@ -24,12 +24,12 @@ + + /* 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; + +@@ -43,13 +43,13 @@ create_gpg_context (void) + + /* Create a GPG context (GMime 2.4) */ + static notmuch_crypto_context_t * +-create_gpg_context (void) ++create_gpg_context (const char* gpgpath) + { + 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"); ++ gpgctx = g_mime_gpg_context_new (session, gpgpath ? gpgpath : "gpg"); + g_object_unref (session); + + if (! gpgctx) +@@ -83,7 +83,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"); + } +diff --git a/notmuch-client.h b/notmuch-client.h +index 5e0d475..c25c4ea 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -80,6 +80,7 @@ typedef struct notmuch_crypto { + notmuch_crypto_context_t* gpgctx; + notmuch_bool_t verify; + notmuch_bool_t decrypt; ++ const char *gpgpath; + } notmuch_crypto_t; + + typedef struct notmuch_show_params { +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 7c1c809..e18370f 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -769,7 +769,8 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + .part = -1, + .crypto = { + .verify = FALSE, +- .decrypt = FALSE ++ .decrypt = FALSE, ++ .gpgpath = NULL + } + }; + int format = FORMAT_DEFAULT; +diff --git a/notmuch-show.c b/notmuch-show.c +index d416fbd..d292f29 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1082,7 +1082,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) + .output_body = TRUE, + .crypto = { + .verify = FALSE, +- .decrypt = FALSE ++ .decrypt = FALSE, ++ .gpgpath = NULL + }, + .include_html = FALSE + }; +-- +2.1.3 +