From: David Bremner Date: Sun, 16 Aug 2015 17:41:09 +0000 (+0200) Subject: [PATCH 1/8] crypto: refactor context creation to facilitate further work X-Git-Url: http://git.tremily.us/?p=notmuch-archives.git;a=commitdiff_plain;h=c5c78cb420a4eaac48228ca7baee0b66138d6914 [PATCH 1/8] crypto: refactor context creation to facilitate further work --- diff --git a/f1/2943391ecb2cef8fcc29e19e2b59eec8d0801e b/f1/2943391ecb2cef8fcc29e19e2b59eec8d0801e new file mode 100644 index 000000000..8146d6f60 --- /dev/null +++ b/f1/2943391ecb2cef8fcc29e19e2b59eec8d0801e @@ -0,0 +1,101 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 4C90B6DE17FE + for ; Sun, 16 Aug 2015 10:43:13 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.127 +X-Spam-Level: +X-Spam-Status: No, score=0.127 tagged_above=-999 required=5 tests=[AWL=0.117, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id EWjEn69vO-gy for ; + Sun, 16 Aug 2015 10:43:11 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 76C0E6DE17FA + for ; Sun, 16 Aug 2015 10:43:11 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZR1wB-0003bp-LC; Sun, 16 Aug 2015 17:41:39 +0000 +Received: (nullmailer pid 26307 invoked by uid 1000); Sun, 16 Aug 2015 + 17:41:28 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 1/8] crypto: refactor context creation to facilitate further + work +Date: Sun, 16 Aug 2015 19:41:09 +0200 +Message-Id: <1439746876-23654-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.5.0 +In-Reply-To: <1439746876-23654-1-git-send-email-david@tethera.net> +References: <54CA467B.30408@gnome.org> + <1439746876-23654-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Sun, 16 Aug 2015 17:43:13 -0000 + +From: Jani Nikula + +Let the context creation functions decide how to handle multiple calls +and cache the crypto context. No functional changes. +--- + crypto.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/crypto.c b/crypto.c +index a6eb27d..1187ad7 100644 +--- a/crypto.c ++++ b/crypto.c +@@ -22,14 +22,20 @@ + + /* Create a GPG context (GMime 2.6) */ + static notmuch_crypto_context_t * +-create_gpg_context (const char *gpgpath) ++create_gpg_context (notmuch_crypto_t *crypto) + { + notmuch_crypto_context_t *gpgctx; + ++ if (crypto->gpgctx) ++ return crypto->gpgctx; ++ + /* TODO: GMimePasswordRequestFunc */ +- gpgctx = g_mime_gpg_context_new (NULL, gpgpath ? gpgpath : "gpg"); +- if (! gpgctx) ++ gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? crypto->gpgpath : "gpg"); ++ if (! gpgctx) { ++ fprintf (stderr, "Failed to construct gpg context.\n"); + return NULL; ++ } ++ crypto->gpgctx = gpgctx; + + g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, TRUE); + g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE); +@@ -57,12 +63,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->gpgpath); +- if (! crypto->gpgctx) +- fprintf (stderr, "Failed to construct gpg context.\n"); +- } +- cryptoctx = crypto->gpgctx; ++ cryptoctx = create_gpg_context (crypto); + } else { + fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n"); + } +-- +2.5.0 +