From 774edd59ce42c8f6f1df6bc8233ef1b4f18a49ec Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 12 Dec 2015 09:54:40 +2000 Subject: [PATCH] [Patch v2 1/8] crypto: refactor context creation to facilitate further work --- cc/06c94b7a5ee493acdae1dfd107b93ad20838a6 | 100 ++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 cc/06c94b7a5ee493acdae1dfd107b93ad20838a6 diff --git a/cc/06c94b7a5ee493acdae1dfd107b93ad20838a6 b/cc/06c94b7a5ee493acdae1dfd107b93ad20838a6 new file mode 100644 index 000000000..4202b3e1d --- /dev/null +++ b/cc/06c94b7a5ee493acdae1dfd107b93ad20838a6 @@ -0,0 +1,100 @@ +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 4EA9B6DE1A78 + for ; Fri, 11 Dec 2015 05:55:18 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.319 +X-Spam-Level: +X-Spam-Status: No, score=-0.319 tagged_above=-999 required=5 tests=[AWL=0.232, + RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 YyhuTDVk0hiB for ; + Fri, 11 Dec 2015 05:55:16 -0800 (PST) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id B45896DE0B4F + for ; Fri, 11 Dec 2015 05:55:01 -0800 (PST) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1a7O9x-0000SP-IR; Fri, 11 Dec 2015 08:54:57 -0500 +Received: (nullmailer pid 11202 invoked by uid 1000); + Fri, 11 Dec 2015 13:54:52 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v2 1/8] crypto: refactor context creation to facilitate + further work +Date: Fri, 11 Dec 2015 09:54:40 -0400 +Message-Id: <1449842087-10972-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.6.2 +In-Reply-To: <1449842087-10972-1-git-send-email-david@tethera.net> +References: <1449842087-10972-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Fri, 11 Dec 2015 13:55:18 -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.6.2 + -- 2.26.2