diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-05-02 09:19:36 -0400 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2019-05-03 06:55:04 -0300 |
commit | 096d45a878ba9606f1677f66d346b14c3c274fa5 (patch) | |
tree | 16a875121b5354ba37c5667d37ec06f4254085b4 /util | |
parent | 35e21bfb6f5fa4a0b61a71860e1f7f04d9e3e274 (diff) |
gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts
Note that we do keep ignoring the gpg_path configuration option,
though, to avoid breakage of existing installations. It is ignored
like any other unknown configuration option, but we at least document
that it is ignored so that people who find it in their legacy configs
can know that it's safe to drop.
signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'util')
-rw-r--r-- | util/crypto.c | 118 | ||||
-rw-r--r-- | util/crypto.h | 12 |
2 files changed, 0 insertions, 130 deletions
diff --git a/util/crypto.c b/util/crypto.c index 9d3b6dad..da9256f2 100644 --- a/util/crypto.c +++ b/util/crypto.c @@ -24,120 +24,9 @@ #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) -#if (GMIME_MAJOR_VERSION < 3) -/* Create or pass on a GPG context (GMime 2.6) */ -static notmuch_status_t -get_gpg_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx) -{ - if (ctx == NULL || crypto == NULL) - return NOTMUCH_STATUS_NULL_POINTER; - - if (crypto->gpgctx) { - *ctx = crypto->gpgctx; - return NOTMUCH_STATUS_SUCCESS; - } - - /* TODO: GMimePasswordRequestFunc */ - crypto->gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? crypto->gpgpath : "gpg"); - if (! crypto->gpgctx) { - return NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION; - } - - g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) crypto->gpgctx, true); - g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) crypto->gpgctx, false); - - *ctx = crypto->gpgctx; - return NOTMUCH_STATUS_SUCCESS; -} - -/* Create or pass on a PKCS7 context (GMime 2.6) */ -static notmuch_status_t -get_pkcs7_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx) -{ - if (ctx == NULL || crypto == NULL) - return NOTMUCH_STATUS_NULL_POINTER; - - if (crypto->pkcs7ctx) { - *ctx = crypto->pkcs7ctx; - return NOTMUCH_STATUS_SUCCESS; - } - - /* TODO: GMimePasswordRequestFunc */ - crypto->pkcs7ctx = g_mime_pkcs7_context_new (NULL); - if (! crypto->pkcs7ctx) { - return NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION; - } - - g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context *) crypto->pkcs7ctx, - false); - - *ctx = crypto->pkcs7ctx; - return NOTMUCH_STATUS_SUCCESS; -} -static const struct { - const char *protocol; - notmuch_status_t (*get_context) (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx); -} protocols[] = { - { - .protocol = "application/pgp-signature", - .get_context = get_gpg_context, - }, - { - .protocol = "application/pgp-encrypted", - .get_context = get_gpg_context, - }, - { - .protocol = "application/pkcs7-signature", - .get_context = get_pkcs7_context, - }, - { - .protocol = "application/x-pkcs7-signature", - .get_context = get_pkcs7_context, - }, -}; - -/* for the specified protocol return the context pointer (initializing - * if needed) */ -notmuch_status_t -_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto, - const char *protocol, - GMimeCryptoContext **ctx) -{ - if (! protocol) - return NOTMUCH_STATUS_MALFORMED_CRYPTO_PROTOCOL; - - /* 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. - */ - for (size_t i = 0; i < ARRAY_SIZE (protocols); i++) { - if (strcasecmp (protocol, protocols[i].protocol) == 0) - return protocols[i].get_context (crypto, ctx); - } - - return NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL; -} - -void -_notmuch_crypto_cleanup (_notmuch_crypto_t *crypto) -{ - if (crypto->gpgctx) { - g_object_unref (crypto->gpgctx); - crypto->gpgctx = NULL; - } - - if (crypto->pkcs7ctx) { - g_object_unref (crypto->pkcs7ctx); - crypto->pkcs7ctx = NULL; - } -} -#else void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto)) { } -#endif GMimeObject * _notmuch_crypto_decrypt (bool *attempted, @@ -165,17 +54,10 @@ _notmuch_crypto_decrypt (bool *attempted, } if (attempted) *attempted = true; -#if (GMIME_MAJOR_VERSION < 3) - ret = g_mime_multipart_encrypted_decrypt_session (part, - crypto_ctx, - notmuch_message_properties_value (list), - decrypt_result, err); -#else ret = g_mime_multipart_encrypted_decrypt (part, GMIME_DECRYPT_NONE, notmuch_message_properties_value (list), decrypt_result, err); -#endif if (ret) break; } diff --git a/util/crypto.h b/util/crypto.h index 1a90f0e0..dbb333eb 100644 --- a/util/crypto.h +++ b/util/crypto.h @@ -12,11 +12,6 @@ extern "C" { typedef struct _notmuch_crypto { bool verify; notmuch_decryption_policy_t decrypt; -#if (GMIME_MAJOR_VERSION < 3) - GMimeCryptoContext* gpgctx; - GMimeCryptoContext* pkcs7ctx; - const char *gpgpath; -#endif } _notmuch_crypto_t; GMimeObject * @@ -28,13 +23,6 @@ _notmuch_crypto_decrypt (bool *attempted, GMimeDecryptResult **decrypt_result, GError **err); -#if (GMIME_MAJOR_VERSION < 3) -notmuch_status_t -_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto, - const char *protocol, - GMimeCryptoContext **ctx); -#endif - void _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto); |