From: Jameson Graef Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH v5 2/7] cli: new crypto structure to store crypto contexts and parameters, and functions to support it
Date: Sat, 26 May 2012 11:45:41 -0700 [thread overview]
Message-ID: <1338057946-29209-3-git-send-email-jrollins@finestructure.net> (raw)
In-Reply-To: <1338057946-29209-2-git-send-email-jrollins@finestructure.net>
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..fbe5aeb
--- /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 <jrollins@finestructure.net>
+ */
+
+#include "notmuch-client.h"
+
+/* for the specified protocol return the context pointer (initializing
+ * if needed) */
+notmuch_crypto_context_t *
+notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
+{
+ notmuch_crypto_context_t *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);
+ crypto->gpgctx = NULL;
+ }
+
+ return 0;
+}
diff --git a/notmuch-client.h b/notmuch-client.h
index d377b04..6664075 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -77,6 +77,11 @@ typedef struct notmuch_show_format {
const char *message_set_end;
} notmuch_show_format_t;
+typedef struct notmuch_crypto {
+ notmuch_crypto_context_t* gpgctx;
+ notmuch_bool_t decrypt;
+} notmuch_crypto_t;
+
typedef struct notmuch_show_params {
notmuch_bool_t entire_thread;
notmuch_bool_t omit_excluded;
@@ -112,6 +117,12 @@ chomp_newline (char *str)
str[strlen(str)-1] = '\0';
}
+notmuch_crypto_context_t *
+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[]);
--
1.7.10
next prev parent reply other threads:[~2012-05-26 18:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-26 18:45 [PATCH v5 0/7] cli: improved crypto internals Jameson Graef Rollins
2012-05-26 18:45 ` [PATCH v5 1/7] cli: use new typedef to deal with gmime 2.4/2.6 context incompatibility Jameson Graef Rollins
2012-05-26 18:45 ` Jameson Graef Rollins [this message]
2012-05-26 18:45 ` [PATCH v5 3/7] cli: modify show and reply to use new crypto struct Jameson Graef Rollins
2012-05-26 18:45 ` [PATCH v5 4/7] cli: modify mime_node_open to take new crypto struct as argument Jameson Graef Rollins
2012-05-26 18:45 ` [PATCH v5 5/7] cli: modify mime_node_context to use the new crypto struct Jameson Graef Rollins
2012-05-26 18:45 ` [PATCH v5 6/7] cli: new crypto verify flag to handle verification Jameson Graef Rollins
2012-05-26 18:45 ` [PATCH v5 7/7] cli: use new notmuch_crypto_get_context in mime-node.c Jameson Graef Rollins
2012-06-08 18:05 ` [PATCH v5 0/7] cli: improved crypto internals Jameson Graef Rollins
2012-06-10 2:17 ` Austin Clements
2012-06-10 19:34 ` Jani Nikula
2012-06-11 5:41 ` Jameson Graef Rollins
2012-06-10 23:20 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338057946-29209-3-git-send-email-jrollins@finestructure.net \
--to=jrollins@finestructure.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).