From: Austin Clements Date: Fri, 25 May 2012 14:42:08 +0000 (+2000) Subject: Re: [PATCH v4 2/7] cli: new crypto structure to store crypto contexts and parameters... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3f0044b9a27e6497320fef6d846cfadad067e0fa;p=notmuch-archives.git Re: [PATCH v4 2/7] cli: new crypto structure to store crypto contexts and parameters, and functions to support it --- diff --git a/47/ebd1372cf28ee4a8e390e6e44841f497d6d422 b/47/ebd1372cf28ee4a8e390e6e44841f497d6d422 new file mode 100644 index 000000000..b2e3bbd1f --- /dev/null +++ b/47/ebd1372cf28ee4a8e390e6e44841f497d6d422 @@ -0,0 +1,220 @@ +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 A98E6431FBC + for ; Fri, 25 May 2012 07:42:11 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 C+MZ+7of9y2d for ; + Fri, 25 May 2012 07:42:11 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id E08C0431FB6 + for ; Fri, 25 May 2012 07:42:10 -0700 (PDT) +X-AuditID: 12074425-b7f966d0000008b6-22-4fbf9a4118af +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 7D.B5.02230.14A9FBF4; Fri, 25 May 2012 10:42:09 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q4PEg9un008373; + Fri, 25 May 2012 10:42:09 -0400 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4PEg8Ia007537 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 25 May 2012 10:42:09 -0400 (EDT) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SXviS-0000dh-91; Fri, 25 May 2012 10:42:08 -0400 +Date: Fri, 25 May 2012 10:42:08 -0400 +From: Austin Clements +To: Jameson Graef Rollins +Subject: Re: [PATCH v4 2/7] cli: new crypto structure to store crypto + contexts and parameters, and functions to support it +Message-ID: <20120525144208.GC11804@mit.edu> +References: <1337812843-14986-1-git-send-email-jrollins@finestructure.net> + <1337812843-14986-2-git-send-email-jrollins@finestructure.net> + <1337812843-14986-3-git-send-email-jrollins@finestructure.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=iso-8859-1 +Content-Disposition: inline +Content-Transfer-Encoding: 8bit +In-Reply-To: <1337812843-14986-3-git-send-email-jrollins@finestructure.net> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrGKsWRmVeSWpSXmKPExsUixCmqres4a7+/wZo7qhZ79nlZXL85k9mB + yePuaS6PZ6tuMQcwRXHZpKTmZJalFunbJXBlzFpzlrHguVrF5xt9rA2M6+S6GDk5JARMJBaf + +MoCYYtJXLi3nq2LkYtDSGAfo8SKJytZIZwNjBK9SxczQTgnmSRmPL7JDOEsYZRoP7GcHaSf + RUBV4sjSrWCz2AQ0JLbtX84IYosImEn0fPkDZjMLaEls3fgBzBYWqJFYefI9WD2vgI7E6ZY3 + UBvOMEqcXH6JHSIhKHFy5hMWiGYdiZ1b7wAdyAFkS0ss/8cBEZaXaN46mxkkzCngLbHqvjNI + WFRARWLKyW1sExiFZyEZNAvJoFkIg2YhGbSAkWUVo2xKbpVubmJmTnFqsm5xcmJeXmqRroVe + bmaJXmpK6SZGUBSwu6juYJxwSOkQowAHoxIPL1P0Pn8h1sSy4srcQ4ySHExKorwhM/f7C/El + 5adUZiQWZ8QXleakFh9ilOBgVhLhZUkDyvGmJFZWpRblw6SkOViUxHnXae72FxJITyxJzU5N + LUgtgsnKcHAoSfBOAhkqWJSanlqRlplTgpBm4uAEGc4DNHwqSA1vcUFibnFmOkT+FKMux/4f + E68zCrHk5eelSonzhoIUCYAUZZTmwc2BJa9XjOJAbwnzRoFU8QATH9ykV0BLmICWbHm8F2RJ + SSJCSqqB0W/F0tNJr8uiJ61mPvLz3dP3/l/b7e68+OrfKLLSv/nRXE8epvQVn1K03a/HRD10 + ncXFvJLnTd1XuZ8vGe/3W0lkxC/6aX6uUlZXf6PiJH+FNQs8D6+S41rGraircNT+rU7XdbXb + Ba5v9JmNNi1YZXLSXMDzF2/1HclZzIt50+2c9D6rXj/2W4mlOCPRUIu5qDgRAEM36KQ5AwAA +Cc: Notmuch Mail +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: Fri, 25 May 2012 14:42:11 -0000 + +Quoth Jameson Graef Rollins on May 23 at 3:40 pm: +> This new structure, notmuch_crypto_t, keeps all relevant crypto +> contexts and parameters together, and will make it easier to pass the +> stuff around and clean it up. The name of the crypto context inside +> this new struct will change, to reflect that it is actually a GPG +> context, which is a sub type of Crypto context. There are other types +> of Crypto contexts (Pkcs7 in particular, which we hope to support) so +> we want to be clear. +> +> The new crypto.c contains functions to return the proper context from +> the struct for a given protocol (and initialize it if needed), and to +> cleanup a struct by releasing the crypto contexts. +> --- +> Makefile.local | 1 + +> crypto.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ +> notmuch-client.h | 11 +++++++++ +> 3 files changed, 83 insertions(+) +> create mode 100644 crypto.c +> +> diff --git a/Makefile.local b/Makefile.local +> index 53b4a0d..a890df2 100644 +> --- a/Makefile.local +> +++ b/Makefile.local +> @@ -292,6 +292,7 @@ notmuch_client_srcs = \ +> notmuch-time.c \ +> query-string.c \ +> mime-node.c \ +> + crypto.c \ +> json.c +> +> notmuch_client_modules = $(notmuch_client_srcs:.c=.o) +> diff --git a/crypto.c b/crypto.c +> new file mode 100644 +> index 0000000..25c2d10 +> --- /dev/null +> +++ b/crypto.c +> @@ -0,0 +1,71 @@ +> +/* notmuch - Not much of an email program, (just index and search) +> + * +> + * Copyright © 2012 Jameson Rollins +> + * +> + * This program is free software: you can redistribute it and/or modify +> + * it under the terms of the GNU General Public License as published by +> + * the Free Software Foundation, either version 3 of the License, or +> + * (at your option) any later version. +> + * +> + * This program is distributed in the hope that it will be useful, +> + * but WITHOUT ANY WARRANTY; without even the implied warranty of +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. +> + * +> + * You should have received a copy of the GNU General Public License +> + * along with this program. If not, see http://www.gnu.org/licenses/ . +> + * +> + * Authors: Jameson Rollins +> + */ +> + +> +#include "notmuch-client.h" +> + +> +/* for the specified protocol return the context pointer (initializing +> + * if needed) */ +> +GMimeCryptoContext * +> +notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol) +> +{ +> + GMimeCryptoContext *cryptoctx = NULL; +> + +> + /* 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 +> + * 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) { +> + g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) crypto->gpgctx, FALSE); +> + } else { +> + fprintf (stderr, "Failed to construct gpg context.\n"); +> + } +> + } +> + cryptoctx = crypto->gpgctx; +> + +> + } else { +> + fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n"); +> + } +> + +> + return cryptoctx; +> +} +> + +> +int +> +notmuch_crypto_cleanup (notmuch_crypto_t *crypto) +> +{ +> + if (crypto->gpgctx) { +> + g_object_unref(crypto->gpgctx); + +Missing space. + +> + crypto->gpgctx = NULL; +> + } +> + +> + return 0; +> +} +> diff --git a/notmuch-client.h b/notmuch-client.h +> index 337409f..a8b00ab 100644 +> --- a/notmuch-client.h +> +++ b/notmuch-client.h +> @@ -76,6 +76,11 @@ typedef struct notmuch_show_format { +> const char *message_set_end; +> } notmuch_show_format_t; +> +> +typedef struct notmuch_crypto { +> + GMimeCryptoContext* gpgctx; +> + notmuch_bool_t decrypt; +> +} notmuch_crypto_t; +> + +> typedef struct notmuch_show_params { +> notmuch_bool_t entire_thread; +> notmuch_bool_t omit_excluded; +> @@ -111,6 +116,12 @@ chomp_newline (char *str) +> str[strlen(str)-1] = '\0'; +> } +> +> +GMimeCryptoContext * +> +notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol); +> + +> +int +> +notmuch_crypto_cleanup (notmuch_crypto_t *crypto); +> + +> int +> notmuch_count_command (void *ctx, int argc, char *argv[]); +>