gmime-cleanup: always support session keys

[notmuch] / mime-node.c

diff --git a/mime-node.c b/mime-node.c
index 053f044a7e72ab79695a5a0ff581be3f49fee5db..95dc5132eddda44091eebdd0a622f7ca8368fad3 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -228,7 +228,6 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
            set_signature_list_destructor (node);
        }
 
-#if HAVE_GMIME_SESSION_KEYS
        if (node->ctx->crypto->decrypt == NOTMUCH_DECRYPT_TRUE && message) {
            notmuch_database_t *db = notmuch_message_get_database (message);
            const char *session_key = g_mime_decrypt_result_get_session_key (decrypt_result);
@@ -238,7 +237,6 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
                                      notmuch_message_add_property (message, "session-key",
                                                                    session_key));
        }
-#endif
        g_object_unref (decrypt_result);
     }
 
@@ -284,22 +282,6 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
        return NULL;
     }
 
-#if (GMIME_MAJOR_VERSION < 3)
-    if ((GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE))
-       || (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify)) {
-       GMimeContentType *content_type = g_mime_object_get_content_type (part);
-       const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol");
-       notmuch_status_t status;
-       status = _notmuch_crypto_get_gmime_ctx_for_protocol (node->ctx->crypto,
-                                                            protocol, &cryptoctx);
-       if (status) /* this is a warning, not an error */
-           fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
-                    protocol ? protocol : "NULL");
-       if (!cryptoctx)
-           return node;
-    }
-#endif
-
     /* Handle PGP/MIME parts */
     if (GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) {
        if (node->nchildren != 2) {