diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-10-17 15:09:55 -0400 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2017-10-20 07:58:10 -0300 |
commit | 197d67959bf459fc0f1f63a202d162a569535bf3 (patch) | |
tree | 734955a02f99221191537ade2b14de8f0e1834c4 /notmuch-client.h | |
parent | 6499fce3911df2646db67c0f1ff65672324904f0 (diff) |
crypto: move into libnotmuch_util
This prepares us for using the crypto object in both libnotmuch and
the client.
Diffstat (limited to 'notmuch-client.h')
-rw-r--r-- | notmuch-client.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index bdcfd893..d17cdf01 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -32,9 +32,6 @@ #include "gmime-extra.h" -/* This is automatically included only since gmime 2.6.10 */ -#include <gmime/gmime-pkcs7-context.h> - #include "notmuch.h" /* This is separate from notmuch-private.h because we're trying to @@ -54,6 +51,7 @@ #include <ctype.h> #include "talloc-extra.h" +#include "crypto.h" #define unused(x) x __attribute__ ((unused)) @@ -71,16 +69,6 @@ typedef struct notmuch_show_format { const struct notmuch_show_params *params); } notmuch_show_format_t; -typedef struct _notmuch_crypto { - bool verify; - bool decrypt; -#if (GMIME_MAJOR_VERSION < 3) - GMimeCryptoContext* gpgctx; - GMimeCryptoContext* pkcs7ctx; - const char *gpgpath; -#endif -} _notmuch_crypto_t; - typedef struct notmuch_show_params { bool entire_thread; bool omit_excluded; @@ -180,14 +168,6 @@ typedef struct _notmuch_config notmuch_config_t; void notmuch_exit_if_unsupported_format (void); -#if (GMIME_MAJOR_VERSION <3) -GMimeCryptoContext * -_notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protocol); -#endif - -void -_notmuch_crypto_cleanup (_notmuch_crypto_t *crypto); - int notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]); |